summaryrefslogtreecommitdiff
path: root/vdr-1.7.22-rsvps.patch
diff options
context:
space:
mode:
Diffstat (limited to 'vdr-1.7.22-rsvps.patch')
-rw-r--r--vdr-1.7.22-rsvps.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/vdr-1.7.22-rsvps.patch b/vdr-1.7.22-rsvps.patch
deleted file mode 100644
index c851995..0000000
--- a/vdr-1.7.22-rsvps.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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;
-+ VpsFallback = 0;
- RecordingDirs = 1;
- FoldersInTimerMenu = 1;
- NumberKeysForChars = 1;
-@@ -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);
-+ 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);
-@@ -707,6 +709,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.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;
-+ int VpsFallback;
- int RecordingDirs;
- int FoldersInTimerMenu;
- int NumberKeysForChars;
-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));
-+ 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.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;
-
- 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();