[SCM] vdr packaging repository branch, master, updated. vdr-1.7.16-362-g027d60d
etobi
git at e-tobi.net
Sat Mar 19 22:51:03 UTC 2011
The following commit has been merged in the master branch:
commit 027d60d8b0a1fd14bd314c6495d66076280ee287
Author: etobi <git at e-tobi.net>
Date: Sat Mar 19 22:44:57 2011 +0100
Updated patches
diff --git a/debian/.vdr-patches.multipatch b/debian/.vdr-patches.multipatch
index d6ac300..ea50a23 100644
--- a/debian/.vdr-patches.multipatch
+++ b/debian/.vdr-patches.multipatch
@@ -9,20 +9,20 @@ debian/patches/82_valgrind.dpatch:503ddba49c243fff798a36a1c12bb5ae
debian/patches/opt-42-x_MainMenuHooks.dpatch:1c4c782b5c88c4f0408890a5f50b217b
debian/patches/opt-44_rotor.dpatch:76a5f215302c5dbf8c8713c092c8c6a2
debian/patches/99_vdr-workaround-broken-sys-capability.dpatch:19d9edf94b745d972761cbcec9f442f2
-debian/patches/opt-20_liemikuutio.dpatch:d359ce2c3e0b58c8a859d4865371ae95
+debian/patches/opt-20_liemikuutio.dpatch:841d24ca517acd300fa9a162a072ad74
debian/patches/opt-21_internal-cam-devices.dpatch:a883c0b09e67b679436b7df1e9807fc8
debian/patches/opt-41-x_timer-info.dpatch:04511ae02243eb1bab94f3f45b59e574
-debian/patches/opt-24_jumpplay.dpatch:cfa5a357bd499978dd87c0167a538cd0
+debian/patches/opt-24_jumpplay.dpatch:42af20c42b21d19c63a2ca287b9417ac
debian/patches/opt-50_graphtft-liemikuutio.dpatch:f82320b9c64e17d06b5d0dbbddf50e8f
debian/patches/opt-31-x_reelchannelscan.dpatch:f8c06ac51888248f68badcab8533c2be
debian/patches/81_Make_config.dpatch:da281b9af48273bcbd19f3052ee993fd
debian/patches/opt-51_cuttime.dpatch:5459582bf3c6d95895d7e0ca18b52213
-debian/patches/opt-48-x_pin.dpatch:3dd524fa2c484cd03fa2f46194ceff18
+debian/patches/opt-48-x_pin.dpatch:f123bc131bb9986fec6143bb288a3c32
debian/patches/opt-37-x_menuorg.dpatch:9fb02cc8bd848add50b3866b6f476644
-debian/patches/opt-45_yaepg.dpatch:fbac27f726253a228d7fe15c1cdabeb2
+debian/patches/opt-45_yaepg.dpatch:77fdabd83bdf4187d7040faaf1c758c7
debian/patches/opt-27_ttxtsubs.dpatch:af553c89b0f4cb7f75fb38768c0ab72a
debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
debian/patches/opt-39_noepg.dpatch:8e479efb77a9a7635a78e21832a56101
debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
debian/patches/opt-38_disableDoubleEpgEntrys.dpatch:7a09fa581f95613497b718b5c4a4a875
-debian/patches/opt-22-x_edit_marks.dpatch:d6b10d4000a85dbf0e42664c349fc5c9
+debian/patches/opt-22-x_edit_marks.dpatch:9d604944f17114e3ac830aa80eff73ed
diff --git a/debian/patches/opt-20_liemikuutio.dpatch b/debian/patches/opt-20_liemikuutio.dpatch
index 6e757f9..039bf0b 100644
--- a/debian/patches/opt-20_liemikuutio.dpatch
+++ b/debian/patches/opt-20_liemikuutio.dpatch
@@ -1,14 +1,14 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## opt-20_liemikuutio.dpatch by Rolf Ahrenberg <Rolf.Ahrenberg AT sci.fi>
-## http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.16-liemikuutio-1.30.patch.gz
+## http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.17-liemikuutio-1.30.patch.gz
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch collection - see HISTORY-liemikuutio for details.
@DPATCH@
-diff -Nru vdr-1.7.16-vanilla/config.c vdr-1.7.16-liemikuutio/config.c
---- vdr-1.7.16-vanilla/config.c 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/config.c 2010-09-19 19:46:32.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/config.c vdr-1.7.17-liemikuutio/config.c
+--- vdr-1.7.17-vanilla/config.c 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/config.c 2011-03-13 15:07:41.000000000 +0200
@@ -399,6 +399,11 @@
InitialVolume = -1;
ChannelsWrap = 0;
@@ -45,9 +45,9 @@ diff -Nru vdr-1.7.16-vanilla/config.c vdr-1.7.16-liemikuutio/config.c
Sort();
-diff -Nru vdr-1.7.16-vanilla/config.h vdr-1.7.16-liemikuutio/config.h
---- vdr-1.7.16-vanilla/config.h 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/config.h 2010-09-19 19:46:32.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/config.h vdr-1.7.17-liemikuutio/config.h
+--- vdr-1.7.17-vanilla/config.h 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/config.h 2011-03-13 15:07:41.000000000 +0200
@@ -36,6 +36,8 @@
// plugins to work with newer versions of the core VDR as long as no
// VDR header files have changed.
@@ -65,9 +65,9 @@ diff -Nru vdr-1.7.16-vanilla/config.h vdr-1.7.16-liemikuutio/config.h
int __EndData__;
cSetup(void);
cSetup& operator= (const cSetup &s);
-diff -Nru vdr-1.7.16-vanilla/device.c vdr-1.7.16-liemikuutio/device.c
---- vdr-1.7.16-vanilla/device.c 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/device.c 2010-09-19 19:46:32.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/device.c vdr-1.7.17-liemikuutio/device.c
+--- vdr-1.7.17-vanilla/device.c 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/device.c 2011-03-13 15:07:41.000000000 +0200
@@ -1012,7 +1012,8 @@
int LanguagePreference = INT_MAX; // higher than the maximum possible value
for (int i = ttSubtitleFirst; i <= ttSubtitleLast; i++) {
@@ -78,9 +78,9 @@ diff -Nru vdr-1.7.16-vanilla/device.c vdr-1.7.16-liemikuutio/device.c
PreferredTrack = eTrackType(i);
}
// Make sure we're set to an available subtitle track:
-diff -Nru vdr-1.7.16-vanilla/HISTORY-liemikuutio vdr-1.7.16-liemikuutio/HISTORY-liemikuutio
---- vdr-1.7.16-vanilla/HISTORY-liemikuutio 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.7.16-liemikuutio/HISTORY-liemikuutio 2010-09-19 19:46:32.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/HISTORY-liemikuutio vdr-1.7.17-liemikuutio/HISTORY-liemikuutio
+--- vdr-1.7.17-vanilla/HISTORY-liemikuutio 1970-01-01 02:00:00.000000000 +0200
++++ vdr-1.7.17-liemikuutio/HISTORY-liemikuutio 2011-03-13 15:07:41.000000000 +0200
@@ -0,0 +1,144 @@
+-----------------------------------
+Liemikuutio for Video Disc Recorder
@@ -226,9 +226,9 @@ diff -Nru vdr-1.7.16-vanilla/HISTORY-liemikuutio vdr-1.7.16-liemikuutio/HISTORY-
+2010-02-01: Version 1.30
+
+- Updated for vdr-1.7.12.
-diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
---- vdr-1.7.16-vanilla/menu.c 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/menu.c 2010-09-19 19:46:32.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/menu.c vdr-1.7.17-liemikuutio/menu.c
+--- vdr-1.7.17-vanilla/menu.c 2011-03-13 15:06:48.000000000 +0200
++++ vdr-1.7.17-liemikuutio/menu.c 2011-03-13 15:07:41.000000000 +0200
@@ -14,6 +14,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -314,7 +314,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
}
}
}
-@@ -2170,7 +2191,7 @@
+@@ -2176,7 +2197,7 @@
fileName = strdup(Recording->FileName());
name = NULL;
totalEntries = newEntries = 0;
@@ -323,7 +323,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
if (*Text() == '\t')
name = strdup(Text() + 2); // 'Text() + 2' to skip the two '\t'
}
-@@ -2186,13 +2207,175 @@
+@@ -2192,13 +2213,175 @@
totalEntries++;
if (New)
newEntries++;
@@ -501,7 +501,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
{
base = Base ? strdup(Base) : NULL;
level = Setup.RecordingDirs ? Level : -1;
-@@ -2427,6 +2610,19 @@
+@@ -2433,6 +2616,19 @@
return osContinue;
}
@@ -521,7 +521,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
eOSState cMenuRecordings::ProcessKey(eKeys Key)
{
bool HadSubMenu = HasSubMenu();
-@@ -2441,7 +2637,12 @@
+@@ -2447,7 +2643,12 @@
case kYellow: return Delete();
case kInfo:
case kBlue: return Info();
@@ -535,7 +535,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
case kNone: if (Recordings.StateChanged(recordingsState))
Set(true);
break;
-@@ -2570,6 +2771,7 @@
+@@ -2576,6 +2777,7 @@
Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"), &data.RecordingDirs));
Add(new cMenuEditBoolItem(tr("Setup.OSD$Folders in timer menu"), &data.FoldersInTimerMenu));
Add(new cMenuEditBoolItem(tr("Setup.OSD$Number keys for characters"), &data.NumberKeysForChars));
@@ -543,7 +543,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
SetCurrent(Get(current));
Display();
}
-@@ -2668,6 +2870,7 @@
+@@ -2674,6 +2876,7 @@
Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout (h)"), &data.EPGScanTimeout));
Add(new cMenuEditIntItem( tr("Setup.EPG$EPG bugfix level"), &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL));
Add(new cMenuEditIntItem( tr("Setup.EPG$EPG linger time (min)"), &data.EPGLinger, 0));
@@ -551,7 +551,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"), &data.SetSystemTime));
if (data.SetSystemTime)
Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder, &data.TimeSource));
-@@ -3057,6 +3260,9 @@
+@@ -3063,6 +3266,9 @@
Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZETS));
Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles));
Add(new cMenuEditStraItem(tr("Setup.Recording$Delete timeshift recording"),&data.DelTimeshiftRec, 3, delTimeshiftRecTexts));
@@ -561,7 +561,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
}
// --- cMenuSetupReplay ------------------------------------------------------
-@@ -3345,6 +3551,7 @@
+@@ -3351,6 +3557,7 @@
// Replay control:
if (replaying && !stopReplayItem)
// TRANSLATORS: note the leading blank!
@@ -569,7 +569,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
Add(stopReplayItem = new cOsdItem(tr(" Stop replaying"), osStopReplay));
else if (stopReplayItem && !replaying) {
Del(stopReplayItem->Index());
-@@ -3359,6 +3566,7 @@
+@@ -3365,6 +3572,7 @@
bool CutterActive = cCutter::Active();
if (CutterActive && !cancelEditingItem) {
// TRANSLATORS: note the leading blank!
@@ -577,7 +577,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
Add(cancelEditingItem = new cOsdItem(tr(" Cancel editing"), osCancelEdit));
result = true;
}
-@@ -3379,6 +3587,7 @@
+@@ -3385,6 +3593,7 @@
while ((s = cRecordControls::GetInstantId(s)) != NULL) {
cOsdItem *item = new cOsdItem(osStopRecord);
item->SetText(cString::sprintf("%s%s", tr(STOP_RECORDING), s));
@@ -585,7 +585,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
Add(item);
if (!stopRecordingItem)
stopRecordingItem = item;
-@@ -4367,6 +4576,10 @@
+@@ -4373,6 +4582,10 @@
// --- cReplayControl --------------------------------------------------------
@@ -596,7 +596,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
cReplayControl *cReplayControl::currentReplayControl = NULL;
char *cReplayControl::fileName = NULL;
char *cReplayControl::title = NULL;
-@@ -4380,6 +4593,9 @@
+@@ -4386,6 +4599,9 @@
lastCurrent = lastTotal = -1;
lastPlay = lastForward = false;
lastSpeed = -2; // an invalid value
@@ -606,7 +606,7 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
timeoutShow = 0;
timeSearchActive = false;
cRecording Recording(fileName);
-@@ -4775,6 +4991,32 @@
+@@ -4783,6 +4999,32 @@
case kGreen: SkipSeconds(-60); break;
case kYellow|k_Repeat:
case kYellow: SkipSeconds( 60); break;
@@ -639,8 +639,8 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
case kStop:
case kBlue: Hide();
Stop();
-@@ -4784,12 +5026,8 @@
- switch (Key) {
+@@ -4792,12 +5034,8 @@
+ switch (int(Key)) {
// Editing:
case kMarkToggle: MarkToggle(); break;
- case kPrev|k_Repeat:
@@ -652,9 +652,9 @@ diff -Nru vdr-1.7.16-vanilla/menu.c vdr-1.7.16-liemikuutio/menu.c
case kMarkJumpForward|k_Repeat:
case kMarkJumpForward: MarkJump(true); break;
case kMarkMoveBack|k_Repeat:
-diff -Nru vdr-1.7.16-vanilla/menu.h vdr-1.7.16-liemikuutio/menu.h
---- vdr-1.7.16-vanilla/menu.h 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/menu.h 2010-09-19 19:46:32.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/menu.h vdr-1.7.17-liemikuutio/menu.h
+--- vdr-1.7.17-vanilla/menu.h 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/menu.h 2011-03-13 15:07:41.000000000 +0200
@@ -204,6 +204,7 @@
eOSState Delete(void);
eOSState Info(void);
@@ -673,9 +673,9 @@ diff -Nru vdr-1.7.16-vanilla/menu.h vdr-1.7.16-liemikuutio/menu.h
time_t timeoutShow;
bool timeSearchActive, timeSearchHide;
int timeSearchTime, timeSearchPos;
-diff -Nru vdr-1.7.16-vanilla/osdbase.c vdr-1.7.16-liemikuutio/osdbase.c
---- vdr-1.7.16-vanilla/osdbase.c 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/osdbase.c 2010-09-19 19:46:32.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/osdbase.c vdr-1.7.17-liemikuutio/osdbase.c
+--- vdr-1.7.17-vanilla/osdbase.c 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/osdbase.c 2011-03-13 15:26:52.000000000 +0200
@@ -77,6 +77,7 @@
{
isMenu = true;
@@ -762,7 +762,7 @@ diff -Nru vdr-1.7.16-vanilla/osdbase.c vdr-1.7.16-liemikuutio/osdbase.c
@@ -501,8 +544,8 @@
}
}
- switch (Key) {
+ switch (int(Key)) {
- case k0: return osUnknown;
- case k1...k9: return hasHotkeys ? HotKey(Key) : osUnknown;
+ case kNone:
@@ -770,9 +770,9 @@ diff -Nru vdr-1.7.16-vanilla/osdbase.c vdr-1.7.16-liemikuutio/osdbase.c
case kUp|k_Repeat:
case kUp: CursorUp(); break;
case kDown|k_Repeat:
-diff -Nru vdr-1.7.16-vanilla/osdbase.h vdr-1.7.16-liemikuutio/osdbase.h
---- vdr-1.7.16-vanilla/osdbase.h 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/osdbase.h 2010-09-19 19:46:32.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/osdbase.h vdr-1.7.17-liemikuutio/osdbase.h
+--- vdr-1.7.17-vanilla/osdbase.h 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/osdbase.h 2011-03-13 15:07:41.000000000 +0200
@@ -95,6 +95,8 @@
char *status;
int digit;
@@ -782,10 +782,10 @@ diff -Nru vdr-1.7.16-vanilla/osdbase.h vdr-1.7.16-liemikuutio/osdbase.h
protected:
void SetDisplayMenu(void);
cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; }
-diff -Nru vdr-1.7.16-vanilla/po/de_DE.po vdr-1.7.16-liemikuutio/po/de_DE.po
---- vdr-1.7.16-vanilla/po/de_DE.po 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/po/de_DE.po 2010-09-19 19:46:32.000000000 +0300
-@@ -1321,3 +1321,45 @@
+diff -Nru vdr-1.7.17-vanilla/po/de_DE.po vdr-1.7.17-liemikuutio/po/de_DE.po
+--- vdr-1.7.17-vanilla/po/de_DE.po 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/po/de_DE.po 2011-03-13 15:07:41.000000000 +0200
+@@ -1322,3 +1322,45 @@
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr "VDR wird in %s Minuten ausschalten"
@@ -831,10 +831,10 @@ diff -Nru vdr-1.7.16-vanilla/po/de_DE.po vdr-1.7.16-liemikuutio/po/de_DE.po
+
+msgid "Setup.Recording$Show length"
+msgstr "Länge der Aufnahme anzeigen"
-diff -Nru vdr-1.7.16-vanilla/po/et_EE.po vdr-1.7.16-liemikuutio/po/et_EE.po
---- vdr-1.7.16-vanilla/po/et_EE.po 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/po/et_EE.po 2010-09-19 19:46:32.000000000 +0300
-@@ -1321,3 +1321,45 @@
+diff -Nru vdr-1.7.17-vanilla/po/et_EE.po vdr-1.7.17-liemikuutio/po/et_EE.po
+--- vdr-1.7.17-vanilla/po/et_EE.po 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/po/et_EE.po 2011-03-13 15:07:41.000000000 +0200
+@@ -1322,3 +1322,45 @@
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr "VDR lülitub välja %s minuti pärast"
@@ -880,10 +880,10 @@ diff -Nru vdr-1.7.16-vanilla/po/et_EE.po vdr-1.7.16-liemikuutio/po/et_EE.po
+
+msgid "Setup.Recording$Show length"
+msgstr "Salvestuse kestus"
-diff -Nru vdr-1.7.16-vanilla/po/fi_FI.po vdr-1.7.16-liemikuutio/po/fi_FI.po
---- vdr-1.7.16-vanilla/po/fi_FI.po 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/po/fi_FI.po 2010-09-19 19:46:32.000000000 +0300
-@@ -1324,3 +1324,45 @@
+diff -Nru vdr-1.7.17-vanilla/po/fi_FI.po vdr-1.7.17-liemikuutio/po/fi_FI.po
+--- vdr-1.7.17-vanilla/po/fi_FI.po 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/po/fi_FI.po 2011-03-13 15:07:41.000000000 +0200
+@@ -1325,3 +1325,45 @@
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr "VDR sammuu %s minuutin kuluttua"
@@ -929,10 +929,10 @@ diff -Nru vdr-1.7.16-vanilla/po/fi_FI.po vdr-1.7.16-liemikuutio/po/fi_FI.po
+
+msgid "Setup.Recording$Show length"
+msgstr "Näytä tallenteen kesto"
-diff -Nru vdr-1.7.16-vanilla/po/fr_FR.po vdr-1.7.16-liemikuutio/po/fr_FR.po
---- vdr-1.7.16-vanilla/po/fr_FR.po 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/po/fr_FR.po 2010-09-19 19:46:32.000000000 +0300
-@@ -1327,3 +1327,45 @@
+diff -Nru vdr-1.7.17-vanilla/po/fr_FR.po vdr-1.7.17-liemikuutio/po/fr_FR.po
+--- vdr-1.7.17-vanilla/po/fr_FR.po 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/po/fr_FR.po 2011-03-13 15:07:41.000000000 +0200
+@@ -1328,3 +1328,45 @@
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr "VDR s'arrêtera dans %s minutes"
@@ -978,10 +978,10 @@ diff -Nru vdr-1.7.16-vanilla/po/fr_FR.po vdr-1.7.16-liemikuutio/po/fr_FR.po
+
+msgid "Setup.Recording$Show length"
+msgstr "Montrer la longueur de l'enregistrement"
-diff -Nru vdr-1.7.16-vanilla/po/ru_RU.po vdr-1.7.16-liemikuutio/po/ru_RU.po
---- vdr-1.7.16-vanilla/po/ru_RU.po 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/po/ru_RU.po 2010-09-19 19:46:32.000000000 +0300
-@@ -1322,3 +1322,45 @@
+diff -Nru vdr-1.7.17-vanilla/po/ru_RU.po vdr-1.7.17-liemikuutio/po/ru_RU.po
+--- vdr-1.7.17-vanilla/po/ru_RU.po 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/po/ru_RU.po 2011-03-13 15:07:41.000000000 +0200
+@@ -1323,3 +1323,45 @@
#, c-format
msgid "VDR will shut down in %s minutes"
msgstr "VDR ÒëÚÛîçØâáï çÕàÕ× %s ÜØÝãâ"
@@ -1027,10 +1027,10 @@ diff -Nru vdr-1.7.16-vanilla/po/ru_RU.po vdr-1.7.16-liemikuutio/po/ru_RU.po
+
+msgid "Setup.Recording$Show length"
+msgstr "¿ÞÚÐ×ëÒÐâì ßàÞÔÞÛÖØâÕÛìÝÞáâì ×ÐßØáØ"
-diff -Nru vdr-1.7.16-vanilla/recording.c vdr-1.7.16-liemikuutio/recording.c
---- vdr-1.7.16-vanilla/recording.c 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/recording.c 2010-09-19 19:46:33.000000000 +0300
-@@ -63,6 +63,7 @@
+diff -Nru vdr-1.7.17-vanilla/recording.c vdr-1.7.17-liemikuutio/recording.c
+--- vdr-1.7.17-vanilla/recording.c 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/recording.c 2011-03-13 15:07:41.000000000 +0200
+@@ -64,6 +64,7 @@
#define MAX_LINK_LEVEL 6
bool VfatFileSystem = false;
@@ -1038,7 +1038,7 @@ diff -Nru vdr-1.7.16-vanilla/recording.c vdr-1.7.16-liemikuutio/recording.c
int InstanceId = 0;
cRecordings DeletedRecordings(true);
-@@ -823,6 +824,8 @@
+@@ -836,6 +837,8 @@
int cRecording::Compare(const cListObject &ListObject) const
{
cRecording *r = (cRecording *)&ListObject;
@@ -1047,7 +1047,7 @@ diff -Nru vdr-1.7.16-vanilla/recording.c vdr-1.7.16-liemikuutio/recording.c
return strcasecmp(SortName(), r->SortName());
}
-@@ -841,7 +844,7 @@
+@@ -854,7 +857,7 @@
return fileName;
}
@@ -1056,7 +1056,7 @@ diff -Nru vdr-1.7.16-vanilla/recording.c vdr-1.7.16-liemikuutio/recording.c
{
char New = NewIndicator && IsNew() ? '*' : ' ';
free(titleBuffer);
-@@ -854,6 +857,7 @@
+@@ -867,6 +870,7 @@
s++;
else
s = name;
@@ -1064,7 +1064,7 @@ diff -Nru vdr-1.7.16-vanilla/recording.c vdr-1.7.16-liemikuutio/recording.c
titleBuffer = strdup(cString::sprintf("%02d.%02d.%02d%c%02d:%02d%c%c%s",
t->tm_mday,
t->tm_mon + 1,
-@@ -864,6 +868,27 @@
+@@ -877,6 +881,27 @@
New,
Delimiter,
s));
@@ -1092,7 +1092,7 @@ diff -Nru vdr-1.7.16-vanilla/recording.c vdr-1.7.16-liemikuutio/recording.c
// let's not display a trailing FOLDERDELIMCHAR:
if (!NewIndicator)
stripspace(titleBuffer);
-@@ -1000,6 +1025,42 @@
+@@ -1021,6 +1046,42 @@
resume = RESUME_NOT_INITIALIZED;
}
@@ -1135,7 +1135,7 @@ diff -Nru vdr-1.7.16-vanilla/recording.c vdr-1.7.16-liemikuutio/recording.c
// --- cRecordings -----------------------------------------------------------
cRecordings Recordings;
-@@ -1777,6 +1838,15 @@
+@@ -1826,6 +1887,15 @@
return false;
}
@@ -1151,9 +1151,9 @@ diff -Nru vdr-1.7.16-vanilla/recording.c vdr-1.7.16-liemikuutio/recording.c
// --- cFileName -------------------------------------------------------------
#define MAXFILESPERRECORDINGPES 255
-diff -Nru vdr-1.7.16-vanilla/recording.h vdr-1.7.16-liemikuutio/recording.h
---- vdr-1.7.16-vanilla/recording.h 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/recording.h 2010-09-19 19:46:33.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/recording.h vdr-1.7.17-liemikuutio/recording.h
+--- vdr-1.7.17-vanilla/recording.h 2011-03-13 15:06:49.000000000 +0200
++++ vdr-1.7.17-liemikuutio/recording.h 2011-03-13 15:07:41.000000000 +0200
@@ -23,6 +23,7 @@
#define TIMERMACRO_EPISODE "EPISODE"
@@ -1171,7 +1171,7 @@ diff -Nru vdr-1.7.16-vanilla/recording.h vdr-1.7.16-liemikuutio/recording.h
const cRecordingInfo *Info(void) const { return info; }
const char *PrefixFileName(char Prefix);
int HierarchyLevels(void) const;
-@@ -128,6 +129,9 @@
+@@ -129,6 +130,9 @@
// Changes the file name so that it will be visible in the "Recordings" menu again and
// not processed by cRemoveDeletedRecordingsThread.
// Returns false in case of error
@@ -1181,7 +1181,7 @@ diff -Nru vdr-1.7.16-vanilla/recording.h vdr-1.7.16-liemikuutio/recording.h
};
class cRecordings : public cList<cRecording>, public cThread {
-@@ -252,6 +256,8 @@
+@@ -258,6 +262,8 @@
bool StoreResume(int Index) { return resumeFile.Save(Index); }
bool IsStillRecording(void);
void Delete(void);
@@ -1190,9 +1190,9 @@ diff -Nru vdr-1.7.16-vanilla/recording.h vdr-1.7.16-liemikuutio/recording.h
};
class cFileName {
-diff -Nru vdr-1.7.16-vanilla/svdrp.c vdr-1.7.16-liemikuutio/svdrp.c
---- vdr-1.7.16-vanilla/svdrp.c 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/svdrp.c 2010-09-19 19:46:33.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/svdrp.c vdr-1.7.17-liemikuutio/svdrp.c
+--- vdr-1.7.17-vanilla/svdrp.c 2011-03-13 15:06:48.000000000 +0200
++++ vdr-1.7.17-liemikuutio/svdrp.c 2011-03-13 15:07:41.000000000 +0200
@@ -304,6 +304,8 @@
"REMO [ on | off ]\n"
" Turns the remote control on or off. Without a parameter, the current\n"
@@ -1247,9 +1247,9 @@ diff -Nru vdr-1.7.16-vanilla/svdrp.c vdr-1.7.16-liemikuutio/svdrp.c
else if (CMD("SCAN")) CmdSCAN(s);
else if (CMD("STAT")) CmdSTAT(s);
else if (CMD("UPDT")) CmdUPDT(s);
-diff -Nru vdr-1.7.16-vanilla/svdrp.h vdr-1.7.16-liemikuutio/svdrp.h
---- vdr-1.7.16-vanilla/svdrp.h 2010-09-19 19:42:08.000000000 +0300
-+++ vdr-1.7.16-liemikuutio/svdrp.h 2010-09-19 19:46:33.000000000 +0300
+diff -Nru vdr-1.7.17-vanilla/svdrp.h vdr-1.7.17-liemikuutio/svdrp.h
+--- vdr-1.7.17-vanilla/svdrp.h 2011-03-13 15:06:48.000000000 +0200
++++ vdr-1.7.17-liemikuutio/svdrp.h 2011-03-13 15:07:41.000000000 +0200
@@ -79,6 +79,7 @@
void CmdPLUG(const char *Option);
void CmdPUTE(const char *Option);
diff --git a/debian/patches/opt-22-x_edit_marks.dpatch b/debian/patches/opt-22-x_edit_marks.dpatch
index 7524f2b..cd168b4 100644
--- a/debian/patches/opt-22-x_edit_marks.dpatch
+++ b/debian/patches/opt-22-x_edit_marks.dpatch
@@ -11,10 +11,10 @@
## DP: 'Green' and 'Yellow' act as 'Prev' and 'Next'.
@DPATCH@
-diff -Naurp vdr-1.7.12-liemikuutio/menu.c vdr-1.7.12-liemikuutio-editmarks/menu.c
---- vdr-1.7.12-liemikuutio/menu.c 2010-02-01 14:42:47.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-editmarks/menu.c 2010-02-01 21:18:07.000000000 +0000
-@@ -4924,10 +4924,6 @@ eOSState cReplayControl::ProcessKey(eKey
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/menu.c vdr/menu.c
+--- vdr~/menu.c 2011-03-19 22:45:57.000000000 +0100
++++ vdr/menu.c 2011-03-19 22:50:08.000000000 +0100
+@@ -4999,10 +4999,6 @@
case kGreen: SkipSeconds(-60); break;
case kYellow|k_Repeat:
case kYellow: SkipSeconds( 60); break;
@@ -25,7 +25,7 @@ diff -Naurp vdr-1.7.12-liemikuutio/menu.c vdr-1.7.12-liemikuutio-editmarks/menu.
case kPrev|k_Repeat:
case kPrev: if (lastSkipTimeout.TimedOut()) {
lastSkipSeconds = REPLAYCONTROLSKIPSECONDS;
-@@ -4955,10 +4951,46 @@ eOSState cReplayControl::ProcessKey(eKey
+@@ -5030,10 +5026,46 @@
Stop();
return osEnd;
default: {
@@ -35,7 +35,7 @@ diff -Naurp vdr-1.7.12-liemikuutio/menu.c vdr-1.7.12-liemikuutio-editmarks/menu.
+ cMark *m;
+
DoShowMode = false;
- switch (Key) {
+ switch (int(Key)) {
// Editing:
- case kMarkToggle: MarkToggle(); break;
+ case k1|k_Repeat:
diff --git a/debian/patches/opt-24_jumpplay.dpatch b/debian/patches/opt-24_jumpplay.dpatch
index 3d0c029..1877f0d 100644
--- a/debian/patches/opt-24_jumpplay.dpatch
+++ b/debian/patches/opt-24_jumpplay.dpatch
@@ -7,12 +7,12 @@
## DP: See README.jumpplay and MANUAL for details.
@DPATCH@
-diff -Naurp vdr-1.7.6/MANUAL vdr-1.7.6-jumpplay/MANUAL
---- vdr-1.7.6/MANUAL 2008-02-24 10:09:17.000000000 +0000
-+++ vdr-1.7.6-jumpplay/MANUAL 2009-04-27 15:49:00.000000000 +0000
-@@ -813,6 +813,30 @@ Version 1.6
- 0 resulting in a file named 'resume.vdr', and any other
- value resulting in 'resume.n.vdr'.
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/MANUAL vdr/MANUAL
+--- vdr~/MANUAL 2011-01-27 23:35:24.000000000 +0100
++++ vdr/MANUAL 2011-03-19 22:52:02.000000000 +0100
+@@ -856,6 +856,30 @@
+ 0 resulting in a file named 'resume', and any other
+ value resulting in 'resume.n'.
+ Jump&Play = no Turns playing on or off after jumping forward to the
+ next editing mark with the '9' key.
@@ -41,9 +41,9 @@ diff -Naurp vdr-1.7.6/MANUAL vdr-1.7.6-jumpplay/MANUAL
Miscellaneous:
Min. event timeout = 30
-diff -Naurp vdr-1.7.6/README.jumpplay vdr-1.7.6-jumpplay/README.jumpplay
---- vdr-1.7.6/README.jumpplay 1970-01-01 00:00:00.000000000 +0000
-+++ vdr-1.7.6-jumpplay/README.jumpplay 2009-04-27 15:49:00.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/README.jumpplay vdr/README.jumpplay
+--- vdr~/README.jumpplay 1970-01-01 01:00:00.000000000 +0100
++++ vdr/README.jumpplay 2011-03-19 22:52:02.000000000 +0100
@@ -0,0 +1,92 @@
+JumpPlay patch for VDR
+----------------------
@@ -137,10 +137,10 @@ diff -Naurp vdr-1.7.6/README.jumpplay vdr-1.7.6-jumpplay/README.jumpplay
+ Play&Jump:
+ - set resume position to 0 if replay stops at the first mark
+ Added French language texts (thanks to Michaël Nival)
-diff -Naurp vdr-1.7.6/config.c vdr-1.7.6-jumpplay/config.c
---- vdr-1.7.6/config.c 2009-01-24 15:05:32.000000000 +0000
-+++ vdr-1.7.6-jumpplay/config.c 2009-04-27 15:49:00.000000000 +0000
-@@ -283,6 +283,10 @@ cSetup::cSetup(void)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/config.c vdr/config.c
+--- vdr~/config.c 2011-03-19 22:52:02.000000000 +0100
++++ vdr/config.c 2011-03-19 22:52:02.000000000 +0100
+@@ -392,6 +392,10 @@
MultiSpeedMode = 0;
ShowReplayMode = 0;
ResumeID = 0;
@@ -151,7 +151,7 @@ diff -Naurp vdr-1.7.6/config.c vdr-1.7.6-jumpplay/config.c
CurrentChannel = -1;
CurrentVolume = MAXVOLUME;
CurrentDolby = 0;
-@@ -456,6 +460,10 @@ bool cSetup::Parse(const char *Name, con
+@@ -588,6 +592,10 @@
else if (!strcasecmp(Name, "MultiSpeedMode")) MultiSpeedMode = atoi(Value);
else if (!strcasecmp(Name, "ShowReplayMode")) ShowReplayMode = atoi(Value);
else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value);
@@ -162,7 +162,7 @@ diff -Naurp vdr-1.7.6/config.c vdr-1.7.6-jumpplay/config.c
else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value);
else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value);
else if (!strcasecmp(Name, "CurrentDolby")) CurrentDolby = atoi(Value);
-@@ -539,6 +547,10 @@ bool cSetup::Save(void)
+@@ -689,6 +697,10 @@
Store("MultiSpeedMode", MultiSpeedMode);
Store("ShowReplayMode", ShowReplayMode);
Store("ResumeID", ResumeID);
@@ -173,19 +173,19 @@ diff -Naurp vdr-1.7.6/config.c vdr-1.7.6-jumpplay/config.c
Store("CurrentChannel", CurrentChannel);
Store("CurrentVolume", CurrentVolume);
Store("CurrentDolby", CurrentDolby);
-diff -Naurp vdr-1.7.6/config.h vdr-1.7.6-jumpplay/config.h
---- vdr-1.7.6/config.h 2009-04-12 14:20:52.000000000 +0000
-+++ vdr-1.7.6-jumpplay/config.h 2009-04-27 15:49:00.000000000 +0000
-@@ -36,6 +36,8 @@
- // plugins to work with newer versions of the core VDR as long as no
- // VDR header files have changed.
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/config.h vdr/config.h
+--- vdr~/config.h 2011-03-19 22:52:02.000000000 +0100
++++ vdr/config.h 2011-03-19 22:52:02.000000000 +0100
+@@ -38,6 +38,8 @@
+
+ #define LIEMIKUUTIO 130
+#define JUMPPLAYVERSNUM 100
+
#define MAXPRIORITY 99
#define MAXLIFETIME 99
-@@ -260,6 +262,10 @@ public:
+@@ -286,6 +288,10 @@
int MultiSpeedMode;
int ShowReplayMode;
int ResumeID;
@@ -196,10 +196,10 @@ diff -Naurp vdr-1.7.6/config.h vdr-1.7.6-jumpplay/config.h
int CurrentChannel;
int CurrentVolume;
int CurrentDolby;
-diff -Naurp vdr-1.7.6/dvbplayer.c vdr-1.7.6-jumpplay/dvbplayer.c
---- vdr-1.7.6/dvbplayer.c 2009-04-19 15:19:10.000000000 +0000
-+++ vdr-1.7.6-jumpplay/dvbplayer.c 2009-04-27 17:33:20.000000000 +0000
-@@ -204,6 +204,7 @@ private:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/dvbplayer.c vdr/dvbplayer.c
+--- vdr~/dvbplayer.c 2011-01-27 23:35:25.000000000 +0100
++++ vdr/dvbplayer.c 2011-03-19 22:52:02.000000000 +0100
+@@ -204,6 +204,7 @@
cNonBlockingFileReader *nonBlockingFileReader;
cRingBufferFrame *ringBuffer;
cPtsIndex ptsIndex;
@@ -207,7 +207,7 @@ diff -Naurp vdr-1.7.6/dvbplayer.c vdr-1.7.6-jumpplay/dvbplayer.c
cFileName *fileName;
cIndexFile *index;
cUnbufferedFile *replayFile;
-@@ -249,7 +250,7 @@ public:
+@@ -250,7 +251,7 @@
int cDvbPlayer::Speeds[] = { 0, -2, -4, -8, 1, 2, 4, 12, 0 };
cDvbPlayer::cDvbPlayer(const char *FileName)
@@ -216,7 +216,7 @@ diff -Naurp vdr-1.7.6/dvbplayer.c vdr-1.7.6-jumpplay/dvbplayer.c
{
nonBlockingFileReader = NULL;
ringBuffer = NULL;
-@@ -357,6 +358,10 @@ bool cDvbPlayer::Save(void)
+@@ -360,6 +361,10 @@
if (index) {
int Index = ptsIndex.FindIndex(DeviceGetSTC());
if (Index >= 0) {
@@ -227,8 +227,8 @@ diff -Naurp vdr-1.7.6/dvbplayer.c vdr-1.7.6-jumpplay/dvbplayer.c
Index -= int(round(RESUMEBACKUP * framesPerSecond));
if (Index > 0)
Index = index->GetNextIFrame(Index, false);
-@@ -384,11 +389,26 @@ void cDvbPlayer::Action(void)
- uchar *b = NULL;
+@@ -386,11 +391,26 @@
+ {
uchar *p = NULL;
int pc = 0;
+ bool cutIn = false;
@@ -254,7 +254,7 @@ diff -Naurp vdr-1.7.6/dvbplayer.c vdr-1.7.6-jumpplay/dvbplayer.c
nonBlockingFileReader = new cNonBlockingFileReader;
int Length = 0;
bool Sleep = false;
-@@ -411,7 +431,7 @@ void cDvbPlayer::Action(void)
+@@ -415,7 +435,7 @@
// Read the next frame from the file:
@@ -263,7 +263,7 @@ diff -Naurp vdr-1.7.6/dvbplayer.c vdr-1.7.6-jumpplay/dvbplayer.c
if (!readFrame && (replayFile || readIndex >= 0)) {
if (!nonBlockingFileReader->Reading()) {
if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) {
-@@ -448,6 +468,44 @@ void cDvbPlayer::Action(void)
+@@ -452,6 +472,44 @@
else if (index) {
uint16_t FileNumber;
off_t FileOffset;
@@ -308,7 +308,7 @@ diff -Naurp vdr-1.7.6/dvbplayer.c vdr-1.7.6-jumpplay/dvbplayer.c
if (index->Get(readIndex + 1, &FileNumber, &FileOffset, &readIndependent, &Length) && NextFile(FileNumber, FileOffset))
readIndex++;
else
-@@ -489,6 +547,13 @@ void cDvbPlayer::Action(void)
+@@ -496,6 +554,13 @@
// Store the frame in the buffer:
if (readFrame) {
@@ -322,7 +322,7 @@ diff -Naurp vdr-1.7.6/dvbplayer.c vdr-1.7.6-jumpplay/dvbplayer.c
if (ringBuffer->Put(readFrame))
readFrame = NULL;
else
-@@ -548,8 +613,13 @@ void cDvbPlayer::Action(void)
+@@ -561,8 +626,13 @@
p = NULL;
}
}
@@ -337,10 +337,10 @@ diff -Naurp vdr-1.7.6/dvbplayer.c vdr-1.7.6-jumpplay/dvbplayer.c
// Handle hitting begin/end of recording:
-diff -Naurp vdr-1.7.6/menu.c vdr-1.7.6-jumpplay/menu.c
---- vdr-1.7.6/menu.c 2009-01-24 15:05:43.000000000 +0000
-+++ vdr-1.7.6-jumpplay/menu.c 2009-04-27 15:49:00.000000000 +0000
-@@ -2717,6 +2717,10 @@ cMenuSetupReplay::cMenuSetupReplay(void)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/menu.c vdr/menu.c
+--- vdr~/menu.c 2011-03-19 22:52:02.000000000 +0100
++++ vdr/menu.c 2011-03-19 22:53:55.000000000 +0100
+@@ -3286,6 +3286,10 @@
Add(new cMenuEditBoolItem(tr("Setup.Replay$Multi speed mode"), &data.MultiSpeedMode));
Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode));
Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
@@ -351,7 +351,7 @@ diff -Naurp vdr-1.7.6/menu.c vdr-1.7.6-jumpplay/menu.c
}
void cMenuSetupReplay::Store(void)
-@@ -4008,7 +4012,7 @@ char *cReplayControl::fileName = NULL;
+@@ -4591,7 +4595,7 @@
char *cReplayControl::title = NULL;
cReplayControl::cReplayControl(void)
@@ -360,7 +360,7 @@ diff -Naurp vdr-1.7.6/menu.c vdr-1.7.6-jumpplay/menu.c
{
currentReplayControl = this;
displayReplay = NULL;
-@@ -4020,7 +4024,6 @@ cReplayControl::cReplayControl(void)
+@@ -4606,7 +4610,6 @@
timeSearchActive = false;
cRecording Recording(fileName);
cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true);
@@ -368,7 +368,7 @@ diff -Naurp vdr-1.7.6/menu.c vdr-1.7.6-jumpplay/menu.c
SetTrackDescriptions(false);
}
-@@ -4248,8 +4251,10 @@ void cReplayControl::MarkToggle(void)
+@@ -4866,8 +4869,10 @@
ShowTimed(2);
bool Play, Forward;
int Speed;
@@ -380,7 +380,7 @@ diff -Naurp vdr-1.7.6/menu.c vdr-1.7.6-jumpplay/menu.c
}
marks.Save();
}
-@@ -4262,8 +4267,17 @@ void cReplayControl::MarkJump(bool Forwa
+@@ -4880,8 +4885,17 @@
if (GetIndex(Current, Total)) {
cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
if (m) {
@@ -400,7 +400,7 @@ diff -Naurp vdr-1.7.6/menu.c vdr-1.7.6-jumpplay/menu.c
}
}
}
-@@ -4318,7 +4332,7 @@ void cReplayControl::EditTest(void)
+@@ -4936,7 +4950,7 @@
if (!m)
m = marks.GetNext(Current);
if (m) {
@@ -409,18 +409,18 @@ diff -Naurp vdr-1.7.6/menu.c vdr-1.7.6-jumpplay/menu.c
m = marks.Next(m);
if (m) {
Goto(m->position - SecondsToFrames(3, FramesPerSecond()));
-@@ -4340,6 +4354,7 @@ eOSState cReplayControl::ProcessKey(eKey
+@@ -4958,6 +4972,7 @@
{
if (!Active())
return osEnd;
+ marks.Reload();
+ if (Key == kNone)
+ marks.Update();
if (visible) {
- if (timeoutShow && time(NULL) > timeoutShow) {
- Hide();
-diff -Naurp vdr-1.7.6/menu.h vdr-1.7.6-jumpplay/menu.h
---- vdr-1.7.6/menu.h 2008-02-10 16:01:53.000000000 +0000
-+++ vdr-1.7.6-jumpplay/menu.h 2009-04-27 15:49:00.000000000 +0000
-@@ -212,7 +212,7 @@ public:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/menu.h vdr/menu.h
+--- vdr~/menu.h 2011-03-19 22:52:02.000000000 +0100
++++ vdr/menu.h 2011-03-19 22:52:02.000000000 +0100
+@@ -254,7 +254,7 @@
class cReplayControl : public cDvbPlayerControl {
private:
cSkinDisplayReplay *displayReplay;
@@ -429,10 +429,10 @@ diff -Naurp vdr-1.7.6/menu.h vdr-1.7.6-jumpplay/menu.h
bool visible, modeOnly, shown, displayFrames;
int lastCurrent, lastTotal;
bool lastPlay, lastForward;
-diff -Naurp vdr-1.7.6/po/de_DE.po vdr-1.7.6-jumpplay/po/de_DE.po
---- vdr-1.7.6/po/de_DE.po 2009-04-18 15:24:48.000000000 +0000
-+++ vdr-1.7.6-jumpplay/po/de_DE.po 2009-04-27 15:49:00.000000000 +0000
-@@ -755,6 +755,18 @@ msgstr "Editierte Dateien aufteilen"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/po/de_DE.po vdr/po/de_DE.po
+--- vdr~/po/de_DE.po 2011-03-19 22:52:02.000000000 +0100
++++ vdr/po/de_DE.po 2011-03-19 22:52:02.000000000 +0100
+@@ -1058,6 +1058,18 @@
msgid "Replay"
msgstr "Wiedergabe"
@@ -451,10 +451,10 @@ diff -Naurp vdr-1.7.6/po/de_DE.po vdr-1.7.6-jumpplay/po/de_DE.po
msgid "Setup.Replay$Multi speed mode"
msgstr "Mehrstufiger Vor-/Rücklauf"
-diff -Naurp vdr-1.7.6/po/fr_FR.po vdr-1.7.6-jumpplay/po/fr_FR.po
---- vdr-1.7.6/po/fr_FR.po 2009-04-18 15:24:48.000000000 +0000
-+++ vdr-1.7.6-jumpplay/po/fr_FR.po 2009-04-27 15:49:00.000000000 +0000
-@@ -761,6 +761,18 @@ msgstr "Séparer les séquences éditées"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/po/fr_FR.po vdr/po/fr_FR.po
+--- vdr~/po/fr_FR.po 2011-03-19 22:52:02.000000000 +0100
++++ vdr/po/fr_FR.po 2011-03-19 22:52:02.000000000 +0100
+@@ -1064,6 +1064,18 @@
msgid "Replay"
msgstr "Lecture"
@@ -473,10 +473,10 @@ diff -Naurp vdr-1.7.6/po/fr_FR.po vdr-1.7.6-jumpplay/po/fr_FR.po
msgid "Setup.Replay$Multi speed mode"
msgstr "Mode multi-vitesses"
-diff -Naurp vdr-1.7.6/recording.c vdr-1.7.6-jumpplay/recording.c
---- vdr-1.7.6/recording.c 2009-04-13 13:50:39.000000000 +0000
-+++ vdr-1.7.6-jumpplay/recording.c 2009-04-27 15:49:00.000000000 +0000
-@@ -1295,6 +1295,52 @@ cMark *cMarks::GetNext(int Position)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/recording.c vdr/recording.c
+--- vdr~/recording.c 2011-03-19 22:52:02.000000000 +0100
++++ vdr/recording.c 2011-03-19 22:52:02.000000000 +0100
+@@ -1404,6 +1404,52 @@
return NULL;
}
@@ -529,10 +529,10 @@ diff -Naurp vdr-1.7.6/recording.c vdr-1.7.6-jumpplay/recording.c
// --- cRecordingUserCommand -------------------------------------------------
const char *cRecordingUserCommand::command = NULL;
-diff -Naurp vdr-1.7.6/recording.h vdr-1.7.6-jumpplay/recording.h
---- vdr-1.7.6/recording.h 2009-04-19 09:00:45.000000000 +0000
-+++ vdr-1.7.6-jumpplay/recording.h 2009-04-27 15:49:00.000000000 +0000
-@@ -194,6 +194,18 @@ public:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/recording.h vdr/recording.h
+--- vdr~/recording.h 2011-03-19 22:52:02.000000000 +0100
++++ vdr/recording.h 2011-03-19 22:52:02.000000000 +0100
+@@ -208,6 +208,18 @@
cMark *GetNext(int Position);
};
diff --git a/debian/patches/opt-45_yaepg.dpatch b/debian/patches/opt-45_yaepg.dpatch
index 2a28eb5..999334f 100644
--- a/debian/patches/opt-45_yaepg.dpatch
+++ b/debian/patches/opt-45_yaepg.dpatch
@@ -16,10 +16,10 @@
## DP: This patch is needed for the yaepg plugin.
@DPATCH@
-diff -Naurp vdr-1.7.11/PLUGINS/src/dvbsddevice/dvbsdffosd.c vdr-1.7.11-yaepg/PLUGINS/src/dvbsddevice/dvbsdffosd.c
---- vdr-1.7.11/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2009-12-29 11:52:48.000000000 +0000
-+++ vdr-1.7.11-yaepg/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2010-01-08 00:03:36.000000000 +0000
-@@ -78,6 +78,10 @@ void cDvbSdFfOsd::SetActive(bool On)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/PLUGINS/src/dvbsddevice/dvbsdffosd.c vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c
+--- vdr~/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2011-01-27 23:35:24.000000000 +0100
++++ vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2011-03-19 22:55:53.000000000 +0100
+@@ -78,6 +78,10 @@
Cmd(OSD_SetWindow, 0, i + 1);
Cmd(OSD_Close);
}
@@ -30,7 +30,7 @@ diff -Naurp vdr-1.7.11/PLUGINS/src/dvbsddevice/dvbsdffosd.c vdr-1.7.11-yaepg/PLU
shown = false;
}
}
-@@ -113,6 +117,10 @@ eOsdError cDvbSdFfOsd::SetAreas(const tA
+@@ -113,6 +117,10 @@
Cmd(OSD_SetWindow, 0, i + 1);
Cmd(OSD_Close);
}
@@ -41,7 +41,7 @@ diff -Naurp vdr-1.7.11/PLUGINS/src/dvbsddevice/dvbsdffosd.c vdr-1.7.11-yaepg/PLU
shown = false;
}
return cOsd::SetAreas(Areas, NumAreas);
-@@ -196,6 +204,11 @@ void cDvbSdFfOsd::Flush(void)
+@@ -196,6 +204,11 @@
Cmd(OSD_SetWindow, 0, i + 1);
Cmd(OSD_MoveWindow, 0, Left() + Bitmap->X0(), Top() + Bitmap->Y0());
}
@@ -53,10 +53,10 @@ diff -Naurp vdr-1.7.11/PLUGINS/src/dvbsddevice/dvbsdffosd.c vdr-1.7.11-yaepg/PLU
shown = true;
}
}
-diff -Naurp vdr-1.7.11/device.h vdr-1.7.11-yaepg/device.h
---- vdr-1.7.11/device.h 2010-01-01 15:04:27.000000000 +0000
-+++ vdr-1.7.11-yaepg/device.h 2010-01-08 00:03:36.000000000 +0000
-@@ -246,12 +246,12 @@ public:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/device.h vdr/device.h
+--- vdr~/device.h 2011-03-19 22:55:53.000000000 +0100
++++ vdr/device.h 2011-03-19 22:55:53.000000000 +0100
+@@ -271,12 +271,12 @@
///< Direction (only the sign of Direction is evaluated, positive values
///< switch to higher channel numbers).
private:
@@ -71,10 +71,10 @@ diff -Naurp vdr-1.7.11/device.h vdr-1.7.11-yaepg/device.h
static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
///< Returns the number of the current channel on the primary device.
static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; }
-diff -Naurp vdr-1.7.11/osd.c vdr-1.7.11-yaepg/osd.c
---- vdr-1.7.11/osd.c 2009-12-06 11:33:47.000000000 +0000
-+++ vdr-1.7.11-yaepg/osd.c 2010-01-08 00:03:36.000000000 +0000
-@@ -746,6 +746,7 @@ cOsd::cOsd(int Left, int Top, uint Level
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/osd.c vdr/osd.c
+--- vdr~/osd.c 2011-03-19 21:07:09.000000000 +0100
++++ vdr/osd.c 2011-03-19 22:55:53.000000000 +0100
+@@ -1596,6 +1596,7 @@
}
}
Osds.Append(this);
@@ -82,14 +82,14 @@ diff -Naurp vdr-1.7.11/osd.c vdr-1.7.11-yaepg/osd.c
}
cOsd::~cOsd()
-diff -Naurp vdr-1.7.11/osd.h vdr-1.7.11-yaepg/osd.h
---- vdr-1.7.11/osd.h 2009-05-08 13:41:03.000000000 +0000
-+++ vdr-1.7.11-yaepg/osd.h 2010-01-08 00:03:36.000000000 +0000
-@@ -401,6 +401,7 @@ public:
- ///< 7: vertical, falling, upper
- virtual void Flush(void);
- ///< Actually commits all data to the OSD hardware.
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/osd.h vdr/osd.h
+--- vdr~/osd.h 2011-03-19 21:07:09.000000000 +0100
++++ vdr/osd.h 2011-03-19 22:56:45.000000000 +0100
+@@ -917,6 +917,7 @@
+ ///< MyOsdDrawPixmap(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), pm->Data(), w, h, h * d);
+ ///< delete pm;
+ ///< }
+ tArea vidWin;
};
- class cOsdProvider {
+ #define MAXOSDIMAGES 64
diff --git a/debian/patches/opt-48-x_pin.dpatch b/debian/patches/opt-48-x_pin.dpatch
index 3350a77..d6c6ef5 100644
--- a/debian/patches/opt-48-x_pin.dpatch
+++ b/debian/patches/opt-48-x_pin.dpatch
@@ -18,10 +18,10 @@
## DP: (vdr-1.4.5.diff)
@DPATCH@
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/Makefile vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/Makefile
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/Makefile 2010-02-01 14:54:18.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/Makefile 2010-02-01 14:56:26.000000000 +0000
-@@ -45,6 +45,8 @@ OBJS = audio.o channels.o ci.o config.o
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/Makefile vdr/Makefile
+--- vdr~/Makefile 2011-03-19 22:58:05.000000000 +0100
++++ vdr/Makefile 2011-03-19 22:58:05.000000000 +0100
+@@ -46,6 +46,8 @@
OBJS += vdrttxtsubshooks.o
@@ -30,9 +30,9 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/Makefile vdr-1
ifndef NO_KBD
DEFINES += -DREMOTE_KBD
endif
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/childlock.c vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/childlock.c
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/childlock.c 1970-01-01 00:00:00.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/childlock.c 2010-02-01 14:56:26.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/childlock.c vdr/childlock.c
+--- vdr~/childlock.c 1970-01-01 01:00:00.000000000 +0100
++++ vdr/childlock.c 2011-03-19 22:58:05.000000000 +0100
@@ -0,0 +1,166 @@
+#include "childlock.h"
+#include "childlockservice.h"
@@ -200,9 +200,9 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/childlock.c vd
+ notificationService->NotifyUserAction(key, Interact);
+ }
+}
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/childlock.h vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/childlock.h
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/childlock.h 1970-01-01 00:00:00.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/childlock.h 2010-02-01 14:56:26.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/childlock.h vdr/childlock.h
+--- vdr~/childlock.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr/childlock.h 2011-03-19 22:58:05.000000000 +0100
@@ -0,0 +1,47 @@
+#ifndef __CHILDLOCK_H
+#define __CHILDLOCK_H
@@ -251,9 +251,9 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/childlock.h vd
+
+};
+#endif
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/childlockservice.h vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/childlockservice.h
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/childlockservice.h 1970-01-01 00:00:00.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/childlockservice.h 2010-02-01 14:56:26.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/childlockservice.h vdr/childlockservice.h
+--- vdr~/childlockservice.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr/childlockservice.h 2011-03-19 22:58:05.000000000 +0100
@@ -0,0 +1,46 @@
+#ifndef __CHILDLOCKSERVICE_H
+#define __CHILDLOCKSERVICE_H
@@ -301,9 +301,9 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/childlockservi
+
+};
+#endif
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/device.c vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/device.c
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/device.c 2010-02-01 14:54:18.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/device.c 2010-02-01 14:56:26.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/device.c vdr/device.c
+--- vdr~/device.c 2011-03-19 22:58:05.000000000 +0100
++++ vdr/device.c 2011-03-19 22:58:05.000000000 +0100
@@ -19,6 +19,7 @@
#include "status.h"
#include "transfer.h"
@@ -312,7 +312,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/device.c vdr-1
// --- cLiveSubtitle ---------------------------------------------------------
-@@ -637,6 +638,7 @@ bool cDevice::SwitchChannel(int Directio
+@@ -669,6 +670,7 @@
cChannel *channel;
while ((channel = Channels.GetByNumber(n, Direction)) != NULL) {
// try only channels which are currently available
@@ -320,7 +320,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/device.c vdr-1
if (GetDevice(channel, 0, true))
break;
n = channel->Number() + Direction;
-@@ -658,6 +660,9 @@ bool cDevice::SwitchChannel(int Directio
+@@ -690,6 +692,9 @@
eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
{
@@ -330,10 +330,10 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/device.c vdr-1
if (LiveView) {
StopReplay();
DELETENULL(liveSubtitle);
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/menu.c
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c 2010-02-01 14:54:39.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/menu.c 2010-02-01 15:00:48.000000000 +0000
-@@ -32,6 +32,7 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/menu.c vdr/menu.c
+--- vdr~/menu.c 2011-03-19 22:58:05.000000000 +0100
++++ vdr/menu.c 2011-03-19 23:01:38.000000000 +0100
+@@ -33,6 +33,7 @@
#include "transfer.h"
#include "videodir.h"
#include "menuorgpatch.h"
@@ -341,7 +341,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
#define MAXWAIT4EPGINFO 3 // seconds
#define MODETIMEOUT 3 // seconds
-@@ -911,6 +912,10 @@ cMenuEditTimer::cMenuEditTimer(cTimer *T
+@@ -920,6 +921,10 @@
Add(new cMenuEditBitItem( tr("VPS"), &data.flags, tfVps));
Add(new cMenuEditIntItem( tr("Priority"), &data.priority, 0, MAXPRIORITY));
Add(new cMenuEditIntItem( tr("Lifetime"), &data.lifetime, 0, MAXLIFETIME));
@@ -352,17 +352,17 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
Add(file = new cMenuEditStrItem( tr("File"), data.file, sizeof(data.file)));
SetFirstDayItem();
}
-@@ -2429,7 +2434,8 @@ void cMenuRecordings::Set(bool Refresh)
+@@ -2586,7 +2591,8 @@
for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
if (!base || (strstr(recording->Name(), base) == recording->Name() && recording->Name()[strlen(base)] == FOLDERDELIMCHAR)) {
cMenuRecordingItem *Item = new cMenuRecordingItem(recording, level);
-- if (*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0)) {
-+ if ((*Item->Text() && (!LastItem || strcmp(Item->Text(), LastItemText) != 0))
+- if (*Item->Text() && (!Item->IsDirectory() || (!LastItem || !LastItem->IsDirectory() || strcmp(Item->Text(), LastItemText) != 0))) {
++ if ((*Item->Text() && (!Item->IsDirectory() || (!LastItem || !LastItem->IsDirectory() || strcmp(Item->Text(), LastItemText) != 0)))
+ && (!PinPatch::ChildLock::IsRecordingHidden(GetRecording(Item), Item->Name(), base, Item->IsDirectory()))) {
Add(Item);
LastItem = Item;
free(LastItemText);
-@@ -2479,6 +2485,9 @@ eOSState cMenuRecordings::Play(void)
+@@ -2649,6 +2655,9 @@
{
cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
if (ri) {
@@ -372,7 +372,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
if (ri->IsDirectory())
Open();
else {
-@@ -3501,6 +3510,8 @@ void cMenuMain::Set(void)
+@@ -3692,6 +3701,8 @@
}
else if ((*i)->IsPluginItem()) {
const char *item = (*i)->PluginMenuEntry();
@@ -381,7 +381,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
if (item)
osdItem = new cMenuPluginItem(hk(item), (*i)->PluginIndex());
}
-@@ -3515,9 +3526,13 @@ void cMenuMain::Set(void)
+@@ -3706,9 +3717,13 @@
// Basic menu items:
@@ -395,7 +395,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
Add(new cOsdItem(hk(tr("Recordings")), osRecordings));
// Plugins:
-@@ -3525,18 +3540,22 @@ void cMenuMain::Set(void)
+@@ -3716,18 +3731,22 @@
for (int i = 0; ; i++) {
cPlugin *p = cPluginManager::GetPlugin(i);
if (p) {
@@ -418,7 +418,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
Add(new cOsdItem(hk(tr("Commands")), osCommands));
}
-@@ -3617,6 +3636,11 @@ eOSState cMenuMain::ProcessKey(eKeys Key
+@@ -3808,6 +3827,11 @@
eOSState state = cOsdMenu::ProcessKey(Key);
HadSubMenu |= HasSubMenu();
@@ -430,7 +430,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
cOsdMenu *menu = NULL;
switch (state) {
case osSchedule:
-@@ -3663,6 +3687,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key
+@@ -3854,6 +3878,7 @@
if (item) {
cPlugin *p = cPluginManager::GetPlugin(item->PluginIndex());
if (p) {
@@ -438,7 +438,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
cOsdObject *menu = p->MainMenuAction();
if (menu) {
if (menu->IsMenu())
-@@ -3673,6 +3698,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key
+@@ -3864,6 +3889,7 @@
}
}
}
@@ -446,7 +446,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
}
state = osEnd;
}
-@@ -3881,6 +3907,7 @@ cChannel *cDisplayChannel::NextAvailable
+@@ -4072,6 +4098,7 @@
Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel);
if (!Channel && Setup.ChannelsWrap)
Channel = Direction > 0 ? Channels.First() : Channels.Last();
@@ -454,7 +454,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, 0, true))
return Channel;
}
-@@ -4513,6 +4540,7 @@ bool cRecordControls::Start(cTimer *Time
+@@ -4705,6 +4732,7 @@
for (int i = 0; i < MAXRECORDCONTROLS; i++) {
if (!RecordControls[i]) {
RecordControls[i] = new cRecordControl(device, Timer, Pause);
@@ -462,10 +462,10 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/menu.c vdr-1.7
return RecordControls[i]->Process(time(NULL));
}
}
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/po/de_DE.po vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/po/de_DE.po
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/po/de_DE.po 2010-02-01 13:57:45.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/po/de_DE.po 2010-02-01 14:56:26.000000000 +0000
-@@ -635,6 +635,9 @@ msgstr "Priorität"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/po/de_DE.po vdr/po/de_DE.po
+--- vdr~/po/de_DE.po 2011-03-19 22:58:05.000000000 +0100
++++ vdr/po/de_DE.po 2011-03-19 22:58:05.000000000 +0100
+@@ -639,6 +639,9 @@
msgid "Lifetime"
msgstr "Lebensdauer"
@@ -475,10 +475,10 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/po/de_DE.po vd
msgid "File"
msgstr "Datei"
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/po/fr_FR.po vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/po/fr_FR.po
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/po/fr_FR.po 2010-02-01 13:57:45.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/po/fr_FR.po 2010-02-01 14:56:26.000000000 +0000
-@@ -641,6 +641,9 @@ msgstr "Priorité"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/po/fr_FR.po vdr/po/fr_FR.po
+--- vdr~/po/fr_FR.po 2011-03-19 22:58:05.000000000 +0100
++++ vdr/po/fr_FR.po 2011-03-19 22:58:05.000000000 +0100
+@@ -645,6 +645,9 @@
msgid "Lifetime"
msgstr "Durée de vie"
@@ -488,9 +488,9 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/po/fr_FR.po vd
msgid "File"
msgstr "Fichier"
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.c vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/timers.c
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.c 2010-01-16 11:18:53.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/timers.c 2010-02-01 14:56:26.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/timers.c vdr/timers.c
+--- vdr~/timers.c 2011-01-27 23:35:25.000000000 +0100
++++ vdr/timers.c 2011-03-19 22:58:05.000000000 +0100
@@ -16,6 +16,7 @@
#include "recording.h"
#include "remote.h"
@@ -507,7 +507,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.c vdr-1
startTime = stopTime = 0;
lastSetEvent = 0;
recording = pending = inVpsMargin = false;
-@@ -47,7 +49,6 @@ cTimer::cTimer(bool Instant, bool Pause,
+@@ -47,7 +49,6 @@
priority = Pause ? Setup.PausePriority : Setup.DefaultPriority;
lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime;
*file = 0;
@@ -515,7 +515,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.c vdr-1
event = NULL;
if (Instant && channel)
snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name());
-@@ -60,6 +61,7 @@ cTimer::cTimer(bool Instant, bool Pause,
+@@ -60,6 +61,7 @@
cTimer::cTimer(const cEvent *Event)
{
@@ -523,7 +523,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.c vdr-1
startTime = stopTime = 0;
lastSetEvent = 0;
recording = pending = inVpsMargin = false;
-@@ -93,8 +95,8 @@ cTimer::cTimer(const cEvent *Event)
+@@ -93,8 +95,8 @@
file[Utf8SymChars(file, VFAT_MAX_FILENAME)] = 0;
dsyslog("timer file name truncated to '%s'", file);
}
@@ -533,7 +533,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.c vdr-1
}
cTimer::cTimer(const cTimer &Timer)
-@@ -269,6 +271,8 @@ cString cTimer::PrintFirstDay(void) cons
+@@ -269,6 +271,8 @@
return ""; // not NULL, so the caller can always use the result
}
@@ -542,7 +542,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.c vdr-1
bool cTimer::Parse(const char *s)
{
char *channelbuffer = NULL;
-@@ -323,6 +327,8 @@ bool cTimer::Parse(const char *s)
+@@ -323,6 +327,8 @@
result = false;
}
}
@@ -551,7 +551,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.c vdr-1
free(channelbuffer);
free(daybuffer);
free(filebuffer);
-@@ -592,6 +598,26 @@ void cTimer::SetPriority(int Priority)
+@@ -592,6 +598,26 @@
void cTimer::SetFlags(uint Flags)
{
flags |= Flags;
@@ -578,10 +578,10 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.c vdr-1
}
void cTimer::ClrFlags(uint Flags)
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.h vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/timers.h
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.h 2008-02-16 14:33:23.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/timers.h 2010-02-01 14:56:26.000000000 +0000
-@@ -20,6 +20,7 @@ enum eTimerFlags { tfNone = 0x0000,
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/timers.h vdr/timers.h
+--- vdr~/timers.h 2011-01-27 23:35:25.000000000 +0100
++++ vdr/timers.h 2011-03-19 22:58:05.000000000 +0100
+@@ -20,6 +20,7 @@
tfInstant = 0x0002,
tfVps = 0x0004,
tfRecording = 0x0008,
@@ -589,18 +589,18 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/timers.h vdr-1
tfAll = 0xFFFF,
};
enum eTimerMatch { tmNone, tmPartial, tmFull };
-diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/vdr.c vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/vdr.c
---- vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/vdr.c 2010-01-31 11:14:40.000000000 +0000
-+++ vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks-pin/vdr.c 2010-02-01 14:56:26.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/vdr.c vdr/vdr.c
+--- vdr~/vdr.c 2011-03-19 22:58:05.000000000 +0100
++++ vdr/vdr.c 2011-03-19 22:58:05.000000000 +0100
@@ -63,6 +63,7 @@
#include "timers.h"
#include "tools.h"
#include "transfer.h"
+#include "childlock.h"
#include "videodir.h"
-
- #define MINCHANNELWAIT 10 // seconds to wait between failed channel switchings
-@@ -928,6 +929,7 @@ int main(int argc, char *argv[])
+ // include this one last due to some versions of it being buggy:
+ // http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html
+@@ -948,6 +949,7 @@
cOsdObject *Interact = Menu ? Menu : cControl::Control();
eKeys key = Interface->GetKey(!Interact || !Interact->NeedsFastResponse());
if (ISREALKEY(key)) {
@@ -608,7 +608,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/vdr.c vdr-1.7.
EITScanner.Activity();
// Cancel shutdown countdown:
if (ShutdownHandler.countdown)
-@@ -1000,10 +1002,12 @@ int main(int argc, char *argv[])
+@@ -1020,10 +1022,12 @@
cControl::Control()->Hide();
cPlugin *plugin = cPluginManager::GetPlugin(PluginName);
if (plugin) {
@@ -621,7 +621,7 @@ diff -Naurp vdr-1.7.12-liemikuutio-ttxtsubs-menuorg-MainMenuHooks/vdr.c vdr-1.7.
else
esyslog("ERROR: unknown plugin '%s'", PluginName);
}
-@@ -1217,9 +1221,11 @@ int main(int argc, char *argv[])
+@@ -1237,9 +1241,11 @@
// Instant resume of the last viewed recording:
case kPlay:
if (cReplayControl::LastReplayed()) {
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list