summaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-02-17 14:29:13 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2002-02-17 14:29:13 +0100
commite18b303818ee1ac918176ce07eb64d3d02ae122a (patch)
tree2b909d7e684acced6883166f9fcdbf2bacdaa3dd /menu.c
parenta87e7625ddf38cd2e653a256899e9119505e92ac (diff)
downloadvdr-e18b303818ee1ac918176ce07eb64d3d02ae122a.tar.gz
vdr-e18b303818ee1ac918176ce07eb64d3d02ae122a.tar.bz2
Terminating timer when deleting recording
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c52
1 files changed, 34 insertions, 18 deletions
diff --git a/menu.c b/menu.c
index a48a1968..e12e0157 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.153 2002/02/17 13:00:13 kls Exp $
+ * $Id: menu.c 1.154 2002/02/17 14:00:54 kls Exp $
*/
#include "menu.h"
@@ -1749,26 +1749,33 @@ eOSState cMenuRecordings::Del(void)
{
cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
if (ri && !ri->IsDirectory()) {
-//XXX what if this recording's file is currently in use???
-//XXX if (!ti->recording) {
- if (Interface->Confirm(tr("Delete recording?"))) {
- cRecording *recording = GetRecording(ri);
- if (recording) {
- if (recording->Delete()) {
- cReplayControl::ClearLastReplayed(ri->FileName());
- cOsdMenu::Del(Current());
- Recordings.Del(recording);
- Display();
- if (!Count())
- return osBack;
+ if (Interface->Confirm(tr("Delete recording?"))) {
+ cRecordControl *rc = cRecordControls::GetRecordControl(ri->FileName());
+ if (rc) {
+ if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
+ cTimer *timer = rc->Timer();
+ if (timer) {
+ timer->SkipToday();
+ cRecordControls::Process(time(NULL));
}
- else
- Interface->Error(tr("Error while deleting recording!"));
}
+ else
+ return osContinue;
}
-//XXX }
-//XXX else
-//XXX Interface->Error(tr("Timer is recording!"));
+ cRecording *recording = GetRecording(ri);
+ if (recording) {
+ if (recording->Delete()) {
+ cReplayControl::ClearLastReplayed(ri->FileName());
+ cOsdMenu::Del(Current());
+ Recordings.Del(recording);
+ Display();
+ if (!Count())
+ return osBack;
+ }
+ else
+ Interface->Error(tr("Error while deleting recording!"));
+ }
+ }
}
return osContinue;
}
@@ -2560,6 +2567,15 @@ const char *cRecordControls::GetInstantId(const char *LastInstantId)
return NULL;
}
+cRecordControl *cRecordControls::GetRecordControl(const char *FileName)
+{
+ for (int i = 0; i < MAXDVBAPI; i++) {
+ if (RecordControls[i] && strcmp(RecordControls[i]->FileName(), FileName) == 0)
+ return RecordControls[i];
+ }
+ return NULL;
+}
+
void cRecordControls::Process(time_t t)
{
for (int i = 0; i < MAXDVBAPI; i++) {