DVR: Timer Based Recording - create "next day" entries, fix regular updates

diff --git a/src/dvr/dvr_timerec.c b/src/dvr/dvr_timerec.c
index 3a9e9d030b7bb494b0420b3b07d5a99d865e4881..3e9cda4281792d159165abd69b3b783f3c4437cc 100644 (file)
--- a/src/dvr/dvr_timerec.c
+++ b/src/dvr/dvr_timerec.c
@@ -124,18 +124,23 @@ dvr_timerec_check(dvr_timerec_entry_t *dte)
       goto fail;
   }
 
-  start = dvr_timerec_timecorrection(dispatch_clock, dte->dte_start, &tm_start);
   stop  = dvr_timerec_timecorrection(dispatch_clock, dte->dte_stop,  &tm_stop);
-
+  if (stop < dispatch_clock - 600) {
+    /* next day */
+    start = dvr_timerec_timecorrection(dispatch_clock + 24*60*60,
+                                       dte->dte_start,
+                                       &tm_start);
+    stop  = dvr_timerec_timecorrection(dispatch_clock + 24*60*60,
+                                       dte->dte_stop,
+                                       &tm_stop);
+  } else {
+    start = dvr_timerec_timecorrection(dispatch_clock, dte->dte_start, &tm_start);
+  }
   /* day boundary correction */
   if (start > stop)
     stop += 24 * 60 * 60;
   assert(start < stop);
 
-  /* if it's really in past, don't queue */
-  if (stop < dispatch_clock - 3600)
-    goto fail;
-
   /* purge the old entry */
   de = dte->dte_spawn;
   if (de) {
@@ -558,8 +563,6 @@ static void
 dvr_timerec_timer_cb(void *aux)
 {
   dvr_timerec_entry_t *dte;
-  time_t next;
-  struct tm tm;
 
   tvhtrace("dvr", "timerec update");
 
@@ -568,10 +571,7 @@ dvr_timerec_timer_cb(void *aux)
     dvr_timerec_check(dte);
 
   /* load the timer */
-  next = dispatch_clock + 60 * 60 * 24;     /* next day */
-  next = dvr_timerec_timecorrection(next, 0 /* midnight */, &tm);
-  tvhtrace("dvr", "next timerec check scheduled in %li seconds", (long)(next - dispatch_clock));
-  gtimer_arm(&dvr_timerec_timer, dvr_timerec_timer_cb, NULL, next);
+  gtimer_arm(&dvr_timerec_timer, dvr_timerec_timer_cb, NULL, 3550);
 }
 
 void