summaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2000-04-30 11:15:16 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2000-04-30 11:15:16 +0200
commitf7ac74ede445b099e8fa97a15674f2b4ecde279a (patch)
tree508f111a8996e2d0fddab37bbe5251f69f39b2eb /menu.c
parent49ce70fdb39d1505d593da179f52c8f1f0bdcfb1 (diff)
downloadvdr-f7ac74ede445b099e8fa97a15674f2b4ecde279a.tar.gz
vdr-f7ac74ede445b099e8fa97a15674f2b4ecde279a.tar.bz2
Instant recording can now be stopped via the menu
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c33
1 files changed, 23 insertions, 10 deletions
diff --git a/menu.c b/menu.c
index f5d1aa7a..f6bd4a40 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.11 2000/04/30 10:10:19 kls Exp $
+ * $Id: menu.c 1.12 2000/04/30 11:10:49 kls Exp $
*/
#include "menu.h"
@@ -991,12 +991,14 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
// --- cMenuMain -------------------------------------------------------------
-cMenuMain::cMenuMain(void)
+cMenuMain::cMenuMain(bool Recording)
:cOsdMenu("Main")
{
Add(new cOsdItem("Channels", osChannels));
Add(new cOsdItem("Timer", osTimer));
Add(new cOsdItem("Recordings", osRecordings));
+ if (Recording)
+ Add(new cOsdItem("Stop Recording", osStopRecord));
Display();
}
@@ -1008,6 +1010,8 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
case osChannels: return AddSubMenu(new cMenuChannels);
case osTimer: return AddSubMenu(new cMenuTimers);
case osRecordings: return AddSubMenu(new cMenuRecordings);
+ case osStopRecord: if (!Interface.Confirm("Stop Recording?"))
+ return osContinue;
default: if (Key == kMenu)
state = osEnd;
}
@@ -1019,6 +1023,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
cRecordControl::cRecordControl(cTimer *Timer)
{
timer = Timer;
+ isInstant = !timer;
if (!timer) {
timer = new cTimer(true);
Timers.Add(timer);
@@ -1032,14 +1037,22 @@ cRecordControl::cRecordControl(cTimer *Timer)
cRecordControl::~cRecordControl()
{
- DvbApi.StopRecord();
- timer->SetRecording(false);
- if (timer->IsSingleEvent() && !timer->Matches()) {
- // checking timer->Matches() to make sure we don't delete the timer
- // if the program was cancelled before the timer's stop time!
- isyslog(LOG_INFO, "deleting timer %d", timer->Index() + 1);
- Timers.Del(timer);
- Timers.Save();
+ Stop(true);
+}
+
+void cRecordControl::Stop(bool KeepInstant)
+{
+ if (timer) {
+ DvbApi.StopRecord();
+ timer->SetRecording(false);
+ if ((isInstant && !KeepInstant) || (timer->IsSingleEvent() && !timer->Matches())) {
+ // checking timer->Matches() to make sure we don't delete the timer
+ // if the program was cancelled before the timer's stop time!
+ isyslog(LOG_INFO, "deleting timer %d", timer->Index() + 1);
+ Timers.Del(timer);
+ Timers.Save();
+ }
+ timer = NULL;
}
}