Sophie

Sophie

distrib > Mandriva > 2007.1 > x86_64 > by-pkgid > fdddaca718fdaac56c6bff726f3554dd > files > 17

vdr-1.4.7-9mdv2007.1.src.rpm

diff -Nurp -x '*~' vdr-1.4.6/config.c vdr-1.4.6-rsvps/config.c
--- vdr-1.4.6/config.c	2007-01-26 15:32:19.000000000 +0200
+++ vdr-1.4.6-rsvps/config.c	2007-05-01 03:28:57.000000000 +0300
@@ -250,6 +250,7 @@ cSetup::cSetup(void)
   UseSubtitle = 1;
   UseVps = 0;
   VpsMargin = 120;
+  RsVpsFallback = 0;
   RecordingDirs = 1;
   VideoDisplayFormat = 1;
   VideoFormat = 0;
diff -Nurp -x '*~' vdr-1.4.6/config.h vdr-1.4.6-rsvps/config.h
--- vdr-1.4.6/config.h	2007-02-25 14:09:29.000000000 +0200
+++ vdr-1.4.6-rsvps/config.h	2007-05-01 03:28:47.000000000 +0300
@@ -231,6 +231,7 @@ public:
   int UseSubtitle;
   int UseVps;
   int VpsMargin;
+  int RsVpsFallback;
   int RecordingDirs;
   int VideoDisplayFormat;
   int VideoFormat;
diff -Nurp -x '*~' vdr-1.4.6/i18n.c vdr-1.4.6-rsvps/i18n.c
--- vdr-1.4.6/i18n.c	2007-02-25 14:08:26.000000000 +0200
+++ vdr-1.4.6-rsvps/i18n.c	2007-05-01 03:28:51.000000000 +0300
@@ -6126,6 +6126,28 @@ const tI18nPhrase Phrases[] = {
     "Ingen titel",
     "Bez názvu",
   },
+  { "Use running status as VPS fallback",
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+    "",// TODO
+  },
   { NULL }
   };
 
diff -Nurp -x '*~' vdr-1.4.6/menu.c vdr-1.4.6-rsvps/menu.c
--- vdr-1.4.6/menu.c	2006-12-02 13:12:02.000000000 +0200
+++ vdr-1.4.6-rsvps/menu.c	2007-05-01 03:28:45.000000000 +0300
@@ -2567,6 +2567,7 @@ cMenuSetupRecord::cMenuSetupRecord(void)
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"),          &data.UseSubtitle));
   Add(new cMenuEditBoolItem(tr("Setup.Recording$Use VPS"),                   &data.UseVps));
   Add(new cMenuEditIntItem( tr("Setup.Recording$VPS margin (s)"),            &data.VpsMargin, 0));
+  Add(new cMenuEditBoolItem(tr("Setup.Recording$Use running status as VPS fallback"), &data.RsVpsFallback));
   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));
diff -Nurp -x '*~' vdr-1.4.6/timers.c vdr-1.4.6-rsvps/timers.c
--- vdr-1.4.6/timers.c	2006-09-15 17:15:53.000000000 +0300
+++ vdr-1.4.6-rsvps/timers.c	2007-05-01 03:24:15.000000000 +0300
@@ -388,7 +388,7 @@ bool cTimer::Matches(time_t t, bool Dire
      }
 
   if (HasFlags(tfActive)) {
-     if (HasFlags(tfVps) && event && event->Vps()) {
+     if (HasFlags(tfVps) && event && (Setup.RsVpsFallback || event->Vps())) {
         if (Margin || !Directly) {
            startTime = event->StartTime();
            stopTime = event->EndTime();