Preserve the dvr entry when the program is terminated..

... it may help to continue with the recording after new start

diff --git a/src/channels.c b/src/channels.c
index 5105a5225d65ab910b993adb31c4205b329d0648..8035f668ae750142f6365be96f67e1a62bbab63d 100644 (file)
--- a/src/channels.c
+++ b/src/channels.c
@@ -563,7 +563,7 @@ channel_delete ( channel_t *ch, int delconf )
 
   /* DVR */
   autorec_destroy_by_channel(ch, delconf);
-  dvr_destroy_by_channel(ch);
+  dvr_destroy_by_channel(ch, delconf);
 
   /* Services */
   while((csm = LIST_FIRST(&ch->ch_services)) != NULL)

diff --git a/src/dvr/dvr.h b/src/dvr/dvr.h
index f1d67a64842708758c702cf84a1c427762245b6b..492ce19a10f84dbd39b65dc751ebc35d2c98d6e8 100644 (file)
--- a/src/dvr/dvr.h
+++ b/src/dvr/dvr.h
@@ -304,7 +304,7 @@ void dvr_autorec_done(void);
 
 void dvr_autorec_update(void);
 
-void dvr_destroy_by_channel(channel_t *ch);
+void dvr_destroy_by_channel(channel_t *ch, int delconf);
 
 void dvr_rec_subscribe(dvr_entry_t *de);
 

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index e80dae062cad387872df90769f51f95591afd42e..ea5bb433486eb936678b486b982d5d02e311eb31 100644 (file)
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -913,7 +913,7 @@ void dvr_event_updated ( epg_broadcast_t *e )
  *
  */
 static void
-dvr_stop_recording(dvr_entry_t *de, int stopcode)
+dvr_stop_recording(dvr_entry_t *de, int stopcode, int delconf)
 {
   dvr_config_t *cfg = dvr_config_find_by_name_default(de->de_config_name);
 
@@ -929,7 +929,8 @@ dvr_stop_recording(dvr_entry_t *de, int stopcode)
         lang_str_get(de->de_title, NULL), DVR_CH_NAME(de),
         dvr_entry_status(de));
 
-  dvr_entry_save(de);
+  if (delconf)
+    dvr_entry_save(de);
   htsp_dvr_entry_update(de);
   dvr_entry_notify(de);
 
@@ -944,7 +945,7 @@ dvr_stop_recording(dvr_entry_t *de, int stopcode)
 static void
 dvr_timer_stop_recording(void *aux)
 {
-  dvr_stop_recording(aux, 0);
+  dvr_stop_recording(aux, 0, 1);
 }
 
 
@@ -1033,7 +1034,7 @@ dvr_entry_cancel(dvr_entry_t *de)
 
   case DVR_RECORDING:
     de->de_dont_reschedule = 1;
-    dvr_stop_recording(de, SM_CODE_ABORTED);
+    dvr_stop_recording(de, SM_CODE_ABORTED, 1);
     return de;
 
   case DVR_COMPLETED:
@@ -1054,17 +1055,17 @@ dvr_entry_cancel(dvr_entry_t *de)
  * Unconditionally remove an entry
  */
 static void
-dvr_entry_purge(dvr_entry_t *de)
+dvr_entry_purge(dvr_entry_t *de, int delconf)
 {
   if(de->de_sched_state == DVR_RECORDING)
-    dvr_stop_recording(de, SM_CODE_SOURCE_DELETED);
+    dvr_stop_recording(de, SM_CODE_SOURCE_DELETED, delconf);
 }
 
 /**
  *
  */
 void
-dvr_destroy_by_channel(channel_t *ch)
+dvr_destroy_by_channel(channel_t *ch, int delconf)
 {
   dvr_entry_t *de;
 
@@ -1072,7 +1073,7 @@ dvr_destroy_by_channel(channel_t *ch)
     LIST_REMOVE(de, de_channel_link);
     de->de_channel = NULL;
     de->de_channel_name = strdup(channel_get_name(ch));
-    dvr_entry_purge(de);
+    dvr_entry_purge(de, delconf);
   }
 }
 
@@ -1692,7 +1693,7 @@ dvr_entry_cancel_delete(dvr_entry_t *de)
 
   case DVR_RECORDING:
     de->de_dont_reschedule = 1;
-    dvr_stop_recording(de, SM_CODE_ABORTED);
+    dvr_stop_recording(de, SM_CODE_ABORTED, 1);
   case DVR_COMPLETED:
     dvr_entry_delete(de);
     break;