summaryrefslogtreecommitdiff
path: root/plugin/vdrvps-1.7.20.diff
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/vdrvps-1.7.20.diff
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/vdrvps-1.7.20.diff')
-rw-r--r--plugin/vdrvps-1.7.20.diff61
1 files changed, 0 insertions, 61 deletions
diff --git a/plugin/vdrvps-1.7.20.diff b/plugin/vdrvps-1.7.20.diff
deleted file mode 100644
index 8f93683..0000000
--- a/plugin/vdrvps-1.7.20.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-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 @@
- UseSubtitle = 1;
- UseVps = 0;
- VpsMargin = 120;
-+ VpsFallback = 0;
- RecordingDirs = 1;
- FoldersInTimerMenu = 1;
- NumberKeysForChars = 1;
-@@ -545,6 +546,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);
-@@ -641,6 +643,7 @@
- Store("UseSubtitle", UseSubtitle);
- Store("UseVps", UseVps);
- Store("VpsMargin", VpsMargin);
-+ Store("VpsFallback", VpsFallback);
- 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 @@
- int UseSubtitle;
- int UseVps;
- int VpsMargin;
-+ int VpsFallback;
- 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 @@
- 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 -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
-@@ -430,7 +430,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();