summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorDave <vdr@pickles.me.uk>2011-12-14 17:50:19 +0000
committerDave <vdr@pickles.me.uk>2011-12-14 17:50:19 +0000
commitf7e145c7689250cae1136475b1b7373bb6717644 (patch)
treea9eb4190fe305524f7a2331e9cec370a0bf7c7b1 /plugin
parent8390e0faa174c34339dd9d43342fdae33379eec6 (diff)
downloadvdrtva-f7e145c7689250cae1136475b1b7373bb6717644.tar.gz
vdrtva-f7e145c7689250cae1136475b1b7373bb6717644.tar.bz2
Patch version moved (and deprecated). Update for VDR 1.7.22.
Diffstat (limited to 'plugin')
-rw-r--r--plugin/vdrvps-1.7.22.diff (renamed from plugin/vdrvps-1.7.20.diff)34
1 files changed, 17 insertions, 17 deletions
diff --git a/plugin/vdrvps-1.7.20.diff b/plugin/vdrvps-1.7.22.diff
index 8f93683..c851995 100644
--- a/plugin/vdrvps-1.7.20.diff
+++ b/plugin/vdrvps-1.7.22.diff
@@ -1,7 +1,7 @@
-diff -ur vdr-1.7.20/config.c vdr-1.7.20.new/config.c
---- vdr-1.7.20/config.c 2011-06-13 15:41:01.000000000 +0100
-+++ vdr-1.7.20.new/config.c 2011-08-16 18:08:26.000000000 +0100
-@@ -353,6 +353,7 @@
+diff -u vdr-1.7.22/config.c vdr-1.7/config.c
+--- vdr-1.7.22/config.c 2011-12-03 15:21:30.000000000 +0000
++++ vdr-1.7/config.c 2011-12-14 15:19:34.000000000 +0000
+@@ -416,6 +416,7 @@
UseSubtitle = 1;
UseVps = 0;
VpsMargin = 120;
@@ -9,7 +9,7 @@ diff -ur vdr-1.7.20/config.c vdr-1.7.20.new/config.c
RecordingDirs = 1;
FoldersInTimerMenu = 1;
NumberKeysForChars = 1;
-@@ -545,6 +546,7 @@
+@@ -610,6 +611,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);
@@ -17,7 +17,7 @@ diff -ur vdr-1.7.20/config.c vdr-1.7.20.new/config.c
else if (!strcasecmp(Name, "RecordingDirs")) RecordingDirs = atoi(Value);
else if (!strcasecmp(Name, "FoldersInTimerMenu")) FoldersInTimerMenu = atoi(Value);
else if (!strcasecmp(Name, "NumberKeysForChars")) NumberKeysForChars = atoi(Value);
-@@ -641,6 +643,7 @@
+@@ -707,6 +709,7 @@
Store("UseSubtitle", UseSubtitle);
Store("UseVps", UseVps);
Store("VpsMargin", VpsMargin);
@@ -25,10 +25,10 @@ diff -ur vdr-1.7.20/config.c vdr-1.7.20.new/config.c
Store("RecordingDirs", RecordingDirs);
Store("FoldersInTimerMenu", FoldersInTimerMenu);
Store("NumberKeysForChars", NumberKeysForChars);
-diff -ur vdr-1.7.20/config.h vdr-1.7.20.new/config.h
---- vdr-1.7.20/config.h 2011-06-21 22:43:01.000000000 +0100
-+++ vdr-1.7.20.new/config.h 2011-08-16 18:08:26.000000000 +0100
-@@ -252,6 +252,7 @@
+diff -u vdr-1.7.22/config.h vdr-1.7/config.h
+--- vdr-1.7.22/config.h 2011-12-03 14:19:52.000000000 +0000
++++ vdr-1.7/config.h 2011-12-14 15:19:34.000000000 +0000
+@@ -271,6 +271,7 @@
int UseSubtitle;
int UseVps;
int VpsMargin;
@@ -36,10 +36,10 @@ diff -ur vdr-1.7.20/config.h vdr-1.7.20.new/config.h
int RecordingDirs;
int FoldersInTimerMenu;
int NumberKeysForChars;
-diff -ur vdr-1.7.20/menu.c vdr-1.7.20.new/menu.c
---- vdr-1.7.20/menu.c 2011-08-06 14:13:34.000000000 +0100
-+++ vdr-1.7.20.new/menu.c 2011-08-16 18:08:26.000000000 +0100
-@@ -3058,6 +3058,7 @@
+diff -u vdr-1.7.22/menu.c vdr-1.7/menu.c
+--- vdr-1.7.22/menu.c 2011-12-04 14:52:38.000000000 +0000
++++ vdr-1.7/menu.c 2011-12-14 15:19:34.000000000 +0000
+@@ -3092,6 +3092,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));
@@ -47,9 +47,9 @@ diff -ur vdr-1.7.20/menu.c vdr-1.7.20.new/menu.c
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 -ur vdr-1.7.20/timers.c vdr-1.7.20.new/timers.c
---- vdr-1.7.20/timers.c 2011-08-06 14:13:54.000000000 +0100
-+++ vdr-1.7.20.new/timers.c 2011-08-16 18:08:26.000000000 +0100
+diff -u vdr-1.7.22/timers.c vdr-1.7/timers.c
+--- vdr-1.7.22/timers.c 2011-08-06 14:13:54.000000000 +0100
++++ vdr-1.7/timers.c 2011-12-14 15:19:34.000000000 +0000
@@ -430,7 +430,7 @@
deferred = 0;