Default duration of instant recording is 3 hours (and configurable)

6 files changed, 33 insertions, 5 deletions

diff --git a/HISTORY b/HISTORY
index 17adc8e3..1748f436 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1223,3 +1223,5 @@ Video Disk Recorder Revision History
 
 - Now taking an active video cutting process into account when doing shutdown or
   housekeeping (thanks to Stefan Huelswitt).
+- The default duration of an instant recording has been increased to 3 hours and
+  is now configurable in the "Setup/Recording" menu.
diff --git a/MANUAL b/MANUAL
index 58d78ae1..97871318 100644
--- a/MANUAL
+++ b/MANUAL
@@ -518,6 +518,12 @@ Video Disk Recorder User's Manual
                          If this parameter is empty, the channel name will be used
                          by default.
 
+  Instant rec. time = 180
+                         Defines the duration of an instant recording in minutes.
+                         Default is 180 minutes (3 hours). The stop time of an
+                         instant recording can be modified at any time by editing
+                         the respective timer in the "Timers" menu.
+
   Record Dolby Digital = yes
                          Turns recording of the Dolby Digital audio channels on
                          or off. This may be useful if you don't have the equipment
diff --git a/config.c b/config.c
index 66007379..be0defe2 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.97 2002/04/06 09:58:36 kls Exp $
+ * $Id: config.c 1.98 2002/04/26 12:30:00 kls Exp $
  */
 
 #include "config.h"
@@ -332,7 +332,8 @@ cTimer::cTimer(bool Instant)
   struct tm *now = localtime_r(&t, &tm_r);
   day = now->tm_mday;
   start = now->tm_hour * 100 + now->tm_min;
-  stop = start + 200; // "instant recording" records 2 hours by default
+  stop = now->tm_hour * 60 + now->tm_min + Setup.InstantRecordTime;
+  stop = (stop / 60) * 100 + (stop % 60);
   if (stop >= 2400)
      stop -= 2400;
 //TODO VPS???
@@ -930,6 +931,7 @@ cSetup::cSetup(void)
   MenuScrollPage = 1;
   MarkInstantRecord = 1;
   strcpy(NameInstantRecord, "TITLE EPISODE");
+  InstantRecordTime = 180;
   LnbSLOF    = 11700;
   LnbFrequLo =  9750;
   LnbFrequHi = 10600;
@@ -1017,6 +1019,7 @@ bool cSetup::Parse(char *s)
         else if (!strcasecmp(Name, "MenuScrollPage"))      MenuScrollPage     = atoi(Value);
         else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
         else if (!strcasecmp(Name, "NameInstantRecord"))   strn0cpy(NameInstantRecord, Value, MaxFileName);
+        else if (!strcasecmp(Name, "InstantRecordTime"))   InstantRecordTime  = atoi(Value);
         else if (!strcasecmp(Name, "LnbSLOF"))             LnbSLOF            = atoi(Value);
         else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
         else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
@@ -1099,6 +1102,7 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "MenuScrollPage     = %d\n", MenuScrollPage);
         fprintf(f, "MarkInstantRecord  = %d\n", MarkInstantRecord);
         fprintf(f, "NameInstantRecord  = %s\n", NameInstantRecord);
+        fprintf(f, "InstantRecordTime  = %d\n", InstantRecordTime);
         fprintf(f, "LnbSLOF            = %d\n", LnbSLOF);
         fprintf(f, "LnbFrequLo         = %d\n", LnbFrequLo);
         fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
diff --git a/config.h b/config.h
index 67ae92c0..dc62853f 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.110 2002/04/21 10:09:56 kls Exp $
+ * $Id: config.h 1.111 2002/04/26 12:36:00 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -337,6 +337,7 @@ public:
   int MenuScrollPage;
   int MarkInstantRecord;
   char NameInstantRecord[MaxFileName];
+  int InstantRecordTime;
   int LnbSLOF;
   int LnbFrequLo;
   int LnbFrequHi;
diff --git a/i18n.c b/i18n.c
index eb37100a..5127f2c1 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.82 2002/04/20 09:40:37 kls Exp $
+ * $Id: i18n.c 1.83 2002/04/26 12:30:30 kls Exp $
  *
  * Slovenian  translations provided by Miha Setina <mihasetina@softhome.net> and Matjaz Thaler <matjaz.thaler@guest.arnes.si>
  * Italian    translations provided by Alberto Carraro <bertocar@tin.it>
@@ -1517,6 +1517,18 @@ const tPhrase Phrases[] = {
     "Nazwac natychm. nagranie",
     "Nombrar grabaciones instantáneas",
   },
+  { "Setup.Recording$Instant rec. time (min)",
+    "Dauer der Direktaufzeichnung (min)",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Setup.Recording$Record Dolby Digital",
     "Dolby Digital Ton aufzeichnen",
     "Posnemi dolby digital",
diff --git a/menu.c b/menu.c
index ed219cdd..2364ff47 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.187 2002/04/20 09:17:08 kls Exp $
+ * $Id: menu.c 1.188 2002/04/26 12:43:32 kls Exp $
  */
 
 #include "menu.h"
@@ -22,6 +22,8 @@
 #define MAXWAIT4EPGINFO  10 // seconds
 #define MODETIMEOUT       3 // seconds
 
+#define MAXINSTANTRECTIME (24 * 60 - 1) // 23:59 hours
+
 #define CHNUMWIDTH  (Channels.Count() > 999 ? 5 : 4) // there are people with more than 999 channels...
 
 const char *FileNameChars = " abcdefghijklmnopqrstuvwxyz0123456789-.#~";
@@ -2202,6 +2204,7 @@ void cMenuSetupRecord::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"),          &data.UseSubtitle));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"),    &data.MarkInstantRecord));
   Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord), tr(FileNameChars)));
+  Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Record Dolby Digital"),      &data.RecordDolbyDigital));
   Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"),        &data.SplitEditedFiles));