Add VPS patch for latest VDR. Fix another compiler warning.

2 files changed, 62 insertions, 2 deletions

diff --git a/vdr-1.7.27-rsvps.patch b/vdr-1.7.27-rsvps.patch
new file mode 100644
index 0000000..3fff769
--- /dev/null
+++ b/vdr-1.7.27-rsvps.patch
@@ -0,0 +1,61 @@
+diff -u vdr-1.7.27/config.c vdr-1.7.27.new/config.c
+--- vdr-1.7.27/config.c	2012-02-29 10:15:54.000000000 +0000
++++ vdr-1.7.27.new/config.c	2012-05-14 13:40:00.961364837 +0100
+@@ -414,6 +414,7 @@
+   UseSubtitle = 1;
+   UseVps = 0;
+   VpsMargin = 120;
++  VpsFallback = 0;
+   RecordingDirs = 1;
+   FoldersInTimerMenu = 1;
+   NumberKeysForChars = 1;
+@@ -608,6 +609,7 @@
+   else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
+   else if (!strcasecmp(Name, "UseVps"))              UseVps             = atoi(Value);
+   else if (!strcasecmp(Name, "VpsMargin"))           VpsMargin          = atoi(Value);
++  else if (!strcasecmp(Name, "VpsFallback"))         VpsFallback      = atoi(Value);
+   else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
+   else if (!strcasecmp(Name, "FoldersInTimerMenu"))  FoldersInTimerMenu = atoi(Value);
+   else if (!strcasecmp(Name, "NumberKeysForChars"))  NumberKeysForChars = atoi(Value);
+@@ -705,6 +707,7 @@
+   Store("UseSubtitle",        UseSubtitle);
+   Store("UseVps",             UseVps);
+   Store("VpsMargin",          VpsMargin);
++  Store("VpsFallback",        VpsFallback);
+   Store("RecordingDirs",      RecordingDirs);
+   Store("FoldersInTimerMenu", FoldersInTimerMenu);
+   Store("NumberKeysForChars", NumberKeysForChars);
+diff -u vdr-1.7.27/config.h vdr-1.7.27.new/config.h
+--- vdr-1.7.27/config.h	2012-03-11 10:41:44.000000000 +0000
++++ vdr-1.7.27.new/config.h	2012-05-14 13:40:00.962364776 +0100
+@@ -274,6 +274,7 @@
+   int UseSubtitle;
+   int UseVps;
+   int VpsMargin;
++  int VpsFallback;
+   int RecordingDirs;
+   int FoldersInTimerMenu;
+   int NumberKeysForChars;
+diff -u vdr-1.7.27/menu.c vdr-1.7.27.new/menu.c
+--- vdr-1.7.27/menu.c	2012-03-13 13:14:38.000000000 +0000
++++ vdr-1.7.27.new/menu.c	2012-05-14 13:40:00.966364532 +0100
+@@ -3112,6 +3112,7 @@
+   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.VpsFallback));
+   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)));
+   Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
+diff -u vdr-1.7.27/timers.c vdr-1.7.27.new/timers.c
+--- vdr-1.7.27/timers.c	2012-02-27 09:38:41.000000000 +0000
++++ vdr-1.7.27.new/timers.c	2012-05-14 13:40:00.967364471 +0100
+@@ -431,7 +431,7 @@
+   deferred = 0;
+ 
+   if (HasFlags(tfActive)) {
+-     if (HasFlags(tfVps) && event && event->Vps()) {
++     if (HasFlags(tfVps) && event && (Setup.VpsFallback || event->Vps())) {
+         if (Margin || !Directly) {
+            startTime = event->StartTime();
+            stopTime = event->EndTime();
diff --git a/vdrtva.c b/vdrtva.c
index 93bc54b..619dfd3 100644
--- a/vdrtva.c
+++ b/vdrtva.c
@@ -553,7 +553,6 @@ void cPluginvdrTva::LoadLinksFile()
     char *s;
     char *strtok_next;
     cReadLine ReadLine;
-    cLinkItem *LinkItem;
     int modtime;
     while ((s = ReadLine.Read(f)) != NULL) {
       char *scrid = strtok_r(s, ",", &strtok_next);
@@ -561,7 +560,7 @@ void cPluginvdrTva::LoadLinksFile()
       char *icrids = strtok_r(NULL, ";", &strtok_next);
       char *path = strtok_r(NULL, ";", &strtok_next);
       modtime = atoi(mtime);
-      LinkItem = Links->NewLinkItem(scrid, modtime, icrids, path);
+      Links->NewLinkItem(scrid, modtime, icrids, path);
     }
     fclose (f);
     isyslog("vdrtva: loaded %d series links", Links->MaxNumber());