r6457 - in /vdr/vdr/trunk/debian: changelog patches/opt-20_liemikuutio.dpatch patches/opt-28_audioindexer.dpatch patches/opt-31-x_reelchannelscan.dpatch patches/opt-40_iptv.dpatch
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Sun Mar 16 17:55:51 UTC 2008
Author: tiber-guest
Date: Sun Mar 16 17:55:51 2008
New Revision: 6457
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6457
Log:
patch-update
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/opt-20_liemikuutio.dpatch
vdr/vdr/trunk/debian/patches/opt-28_audioindexer.dpatch
vdr/vdr/trunk/debian/patches/opt-31-x_reelchannelscan.dpatch
vdr/vdr/trunk/debian/patches/opt-40_iptv.dpatch
Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=6457&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Sun Mar 16 17:55:51 2008
@@ -4,7 +4,7 @@
* New upstream release (closes: #467512)
* Updated 03_cmdsubmenu.dpatch
* Updated 09_sort_options.dpatch
- * Upgraded opt-20_liemikuutio.dpatch to version 1.18
+ * Upgraded opt-20_liemikuutio.dpatch to version 1.19
* Updated opt-31-x_reelchannelscan
* Updated opt-37-x_menuorg.dpatch
* Updated opt-38_disableDoubleEpgEntrys.dpatch, to avoid sprintf buffer
Modified: vdr/vdr/trunk/debian/patches/opt-20_liemikuutio.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-20_liemikuutio.dpatch?rev=6457&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-20_liemikuutio.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-20_liemikuutio.dpatch Sun Mar 16 17:55:51 2008
@@ -1,17 +1,20 @@
#! /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.5.15-liemikuutio-1.18.diff.gz
+## http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.5.17-liemikuutio-1.19.diff.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.5.15-vanilla/HISTORY-liemikuutio vdr-1.5.15-liemikuutio/HISTORY-liemikuutio
---- vdr-1.5.15-vanilla/HISTORY-liemikuutio 1970-01-01 02:00:00.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/HISTORY-liemikuutio 2008-02-17 18:08:07.000000000 +0200
-@@ -0,0 +1,89 @@
-+Liemikuutio Revision History
-+----------------------------
+diff -Nru vdr-1.5.17-vanilla/HISTORY-liemikuutio vdr-1.5.17-liemikuutio/HISTORY-liemikuutio
+--- vdr-1.5.17-vanilla/HISTORY-liemikuutio 1970-01-01 02:00:00.000000000 +0200
++++ vdr-1.5.17-liemikuutio/HISTORY-liemikuutio 2008-03-02 22:25:16.000000000 +0200
+@@ -0,0 +1,97 @@
++-----------------------------------
++Liemikuutio for Video Disc Recorder
++
++Maintainer: Rolf Ahrenberg
++-----------------------------------
+
+2006-01-08: Version 1.0
+
@@ -99,9 +102,14 @@
+
+- Updated for vdr-1.5.15.
+
-diff -Nru vdr-1.5.15-vanilla/config.c vdr-1.5.15-liemikuutio/config.c
---- vdr-1.5.15-vanilla/config.c 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/config.c 2008-02-17 17:22:17.000000000 +0200
++2008-03-02: Version 1.19
++
++- Modified binary skip to use kPrev and kNext keys and the skip is now
++ always shortened after a direction change (Thanks to Timo Eskola).
++- Readded k1_k3_jumps_20s patch.
+diff -Nru vdr-1.5.17-vanilla/config.c vdr-1.5.17-liemikuutio/config.c
+--- vdr-1.5.17-vanilla/config.c 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/config.c 2008-03-02 19:10:40.000000000 +0200
@@ -289,6 +289,11 @@
InitialChannel = 0;
InitialVolume = -1;
@@ -138,14 +146,14 @@
Sort();
-diff -Nru vdr-1.5.15-vanilla/config.h vdr-1.5.15-liemikuutio/config.h
---- vdr-1.5.15-vanilla/config.h 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/config.h 2008-02-17 18:07:28.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/config.h vdr-1.5.17-liemikuutio/config.h
+--- vdr-1.5.17-vanilla/config.h 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/config.h 2008-03-02 22:10:34.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.
-+#define LIEMIKUUTIO 118
++#define LIEMIKUUTIO 119
+
#define MAXPRIORITY 99
#define MAXLIFETIME 99
@@ -158,9 +166,9 @@
int __EndData__;
cSetup(void);
cSetup& operator= (const cSetup &s);
-diff -Nru vdr-1.5.15-vanilla/menu.c vdr-1.5.15-liemikuutio/menu.c
---- vdr-1.5.15-vanilla/menu.c 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/menu.c 2008-02-17 18:07:13.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/menu.c vdr-1.5.17-liemikuutio/menu.c
+--- vdr-1.5.17-vanilla/menu.c 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/menu.c 2008-03-02 22:08:14.000000000 +0200
@@ -13,6 +13,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -246,7 +254,7 @@
}
}
}
-@@ -1882,7 +1903,7 @@
+@@ -1883,7 +1904,7 @@
fileName = strdup(Recording->FileName());
name = NULL;
totalEntries = newEntries = 0;
@@ -255,7 +263,7 @@
if (*Text() == '\t')
name = strdup(Text() + 2); // 'Text() + 2' to skip the two '\t'
}
-@@ -1898,13 +1919,133 @@
+@@ -1899,13 +1920,133 @@
totalEntries++;
if (New)
newEntries++;
@@ -391,7 +399,7 @@
{
base = Base ? strdup(Base) : NULL;
level = Setup.RecordingDirs ? Level : -1;
-@@ -2135,6 +2276,19 @@
+@@ -2136,6 +2277,19 @@
return osContinue;
}
@@ -411,7 +419,7 @@
eOSState cMenuRecordings::ProcessKey(eKeys Key)
{
bool HadSubMenu = HasSubMenu();
-@@ -2149,7 +2303,12 @@
+@@ -2150,7 +2304,12 @@
case kYellow: return Delete();
case kInfo:
case kBlue: return Info();
@@ -425,7 +433,7 @@
case kNone: if (Recordings.StateChanged(recordingsState))
Set(true);
break;
-@@ -2275,6 +2434,7 @@
+@@ -2276,6 +2435,7 @@
Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll wraps"), &data.MenuScrollWrap));
Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu key closes"), &data.MenuKeyCloses));
Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"), &data.RecordingDirs));
@@ -433,7 +441,7 @@
SetCurrent(Get(current));
Display();
}
-@@ -2379,6 +2539,7 @@
+@@ -2380,6 +2540,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));
@@ -441,7 +449,7 @@
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));
-@@ -2757,6 +2918,9 @@
+@@ -2758,6 +2919,9 @@
Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"), &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE));
Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles));
@@ -451,7 +459,7 @@
}
// --- cMenuSetupReplay ------------------------------------------------------
-@@ -3044,6 +3208,7 @@
+@@ -3045,6 +3209,7 @@
// Replay control:
if (replaying && !stopReplayItem)
// TRANSLATORS: note the leading blank!
@@ -459,7 +467,7 @@
Add(stopReplayItem = new cOsdItem(tr(" Stop replaying"), osStopReplay));
else if (stopReplayItem && !replaying) {
Del(stopReplayItem->Index());
-@@ -3058,6 +3223,7 @@
+@@ -3059,6 +3224,7 @@
bool CutterActive = cCutter::Active();
if (CutterActive && !cancelEditingItem) {
// TRANSLATORS: note the leading blank!
@@ -467,7 +475,7 @@
Add(cancelEditingItem = new cOsdItem(tr(" Cancel editing"), osCancelEdit));
result = true;
}
-@@ -3078,6 +3244,7 @@
+@@ -3079,6 +3245,7 @@
while ((s = cRecordControls::GetInstantId(s)) != NULL) {
cOsdItem *item = new cOsdItem(osStopRecord);
item->SetText(cString::sprintf("%s%s", tr(STOP_RECORDING), s));
@@ -475,52 +483,76 @@
Add(item);
if (!stopRecordingItem)
stopRecordingItem = item;
-@@ -4055,6 +4222,9 @@
+@@ -4056,6 +4223,10 @@
// --- cReplayControl --------------------------------------------------------
-+#define REPLAYCONTROLSKIPSECONDS 60 // s
++#define REPLAYCONTROLSKIPLIMIT 9 // s
++#define REPLAYCONTROLSKIPSECONDS 90 // s
+#define REPLAYCONTROLSKIPTIMEOUT 5000 // ms
+
cReplayControl *cReplayControl::currentReplayControl = NULL;
char *cReplayControl::fileName = NULL;
char *cReplayControl::title = NULL;
-@@ -4068,6 +4238,8 @@
+@@ -4069,6 +4240,9 @@
lastCurrent = lastTotal = -1;
lastPlay = lastForward = false;
lastSpeed = -2; // an invalid value
+ lastSkipKey = kNone;
+ lastSkipSeconds = REPLAYCONTROLSKIPSECONDS;
++ lastSkipTimeout.Set(0);
timeoutShow = 0;
timeSearchActive = false;
marks.Load(fileName);
-@@ -4428,9 +4600,21 @@
- case kRight: Forward(); break;
- case kRed: TimeSearch(); break;
- case kGreen|k_Repeat:
-- case kGreen: SkipSeconds(-60); break;
-+ case kGreen: if (lastSkipTimeout.TimedOut())
+@@ -4432,6 +4606,32 @@
+ case kGreen: SkipSeconds(-60); break;
+ case kYellow|k_Repeat:
+ case kYellow: SkipSeconds( 60); break;
++ case k1|k_Repeat:
++ case k1: SkipSeconds(-20); break;
++ case k3|k_Repeat:
++ case k3: SkipSeconds( 20); break;
++ case kPrev|k_Repeat:
++ case kPrev: if (lastSkipTimeout.TimedOut()) {
+ lastSkipSeconds = REPLAYCONTROLSKIPSECONDS;
-+ else if (ISREALKEY(lastSkipKey) && (RAWKEY(lastSkipKey) != kGreen) && (lastSkipSeconds > 10))
++ lastSkipKey = kPrev;
++ }
++ else if (RAWKEY(lastSkipKey) != kPrev && lastSkipSeconds > (2 * REPLAYCONTROLSKIPLIMIT)) {
+ lastSkipSeconds /= 2;
-+ lastSkipKey = kGreen;
++ lastSkipKey = kNone;
++ }
+ lastSkipTimeout.Set(REPLAYCONTROLSKIPTIMEOUT);
+ SkipSeconds(-lastSkipSeconds); break;
- case kYellow|k_Repeat:
-- case kYellow: SkipSeconds( 60); break;
-+ case kYellow: if (lastSkipTimeout.TimedOut())
++ case kNext|k_Repeat:
++ case kNext: if (lastSkipTimeout.TimedOut()) {
+ lastSkipSeconds = REPLAYCONTROLSKIPSECONDS;
-+ else if (ISREALKEY(lastSkipKey) && (RAWKEY(lastSkipKey) != kYellow) && (lastSkipSeconds > 10))
++ lastSkipKey = kNext;
++ }
++ else if (RAWKEY(lastSkipKey) != kNext && lastSkipSeconds > (2 * REPLAYCONTROLSKIPLIMIT)) {
+ lastSkipSeconds /= 2;
-+ lastSkipKey = kYellow;
++ lastSkipKey = kNone;
++ }
+ lastSkipTimeout.Set(REPLAYCONTROLSKIPTIMEOUT);
+ SkipSeconds(lastSkipSeconds); break;
case kStop:
case kBlue: Hide();
Stop();
-diff -Nru vdr-1.5.15-vanilla/menu.h vdr-1.5.15-liemikuutio/menu.h
---- vdr-1.5.15-vanilla/menu.h 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/menu.h 2008-02-17 17:22:17.000000000 +0200
+@@ -4441,12 +4641,8 @@
+ switch (Key) {
+ // Editing:
+ case kMarkToggle: MarkToggle(); break;
+- case kPrev|k_Repeat:
+- case kPrev:
+ case kMarkJumpBack|k_Repeat:
+ case kMarkJumpBack: MarkJump(false); break;
+- case kNext|k_Repeat:
+- case kNext:
+ case kMarkJumpForward|k_Repeat:
+ case kMarkJumpForward: MarkJump(true); break;
+ case kMarkMoveBack|k_Repeat:
+diff -Nru vdr-1.5.17-vanilla/menu.h vdr-1.5.17-liemikuutio/menu.h
+--- vdr-1.5.17-vanilla/menu.h 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/menu.h 2008-03-02 19:10:40.000000000 +0200
@@ -35,6 +35,7 @@
private:
cTimer *timer;
@@ -547,9 +579,9 @@
time_t timeoutShow;
bool timeSearchActive, timeSearchHide;
int timeSearchTime, timeSearchPos;
-diff -Nru vdr-1.5.15-vanilla/osdbase.c vdr-1.5.15-liemikuutio/osdbase.c
---- vdr-1.5.15-vanilla/osdbase.c 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/osdbase.c 2008-02-17 17:22:17.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/osdbase.c vdr-1.5.17-liemikuutio/osdbase.c
+--- vdr-1.5.17-vanilla/osdbase.c 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/osdbase.c 2008-03-02 19:10:40.000000000 +0200
@@ -77,6 +77,7 @@
{
isMenu = true;
@@ -644,9 +676,9 @@
case kUp|k_Repeat:
case kUp: CursorUp(); break;
case kDown|k_Repeat:
-diff -Nru vdr-1.5.15-vanilla/osdbase.h vdr-1.5.15-liemikuutio/osdbase.h
---- vdr-1.5.15-vanilla/osdbase.h 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/osdbase.h 2008-02-17 17:22:17.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/osdbase.h vdr-1.5.17-liemikuutio/osdbase.h
+--- vdr-1.5.17-vanilla/osdbase.h 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/osdbase.h 2008-03-02 19:10:40.000000000 +0200
@@ -95,6 +95,8 @@
char *status;
int digit;
@@ -656,9 +688,9 @@
protected:
void SetDisplayMenu(void);
cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; }
-diff -Nru vdr-1.5.15-vanilla/po/de_DE.po vdr-1.5.15-liemikuutio/po/de_DE.po
---- vdr-1.5.15-vanilla/po/de_DE.po 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/po/de_DE.po 2008-02-17 18:57:59.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/po/de_DE.po vdr-1.5.17-liemikuutio/po/de_DE.po
+--- vdr-1.5.17-vanilla/po/de_DE.po 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/po/de_DE.po 2008-03-02 19:10:40.000000000 +0200
@@ -998,3 +998,36 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -696,9 +728,9 @@
+
+msgid "Setup.Recording$Show length"
+msgstr "Länge der Aufnahme anzeigen"
-diff -Nru vdr-1.5.15-vanilla/po/et_EE.po vdr-1.5.15-liemikuutio/po/et_EE.po
---- vdr-1.5.15-vanilla/po/et_EE.po 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/po/et_EE.po 2008-02-17 18:57:59.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/po/et_EE.po vdr-1.5.17-liemikuutio/po/et_EE.po
+--- vdr-1.5.17-vanilla/po/et_EE.po 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/po/et_EE.po 2008-03-02 19:10:40.000000000 +0200
@@ -998,3 +998,36 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -736,9 +768,9 @@
+
+msgid "Setup.Recording$Show length"
+msgstr "Salvestuse pikkus"
-diff -Nru vdr-1.5.15-vanilla/po/fi_FI.po vdr-1.5.15-liemikuutio/po/fi_FI.po
---- vdr-1.5.15-vanilla/po/fi_FI.po 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/po/fi_FI.po 2008-02-17 18:57:59.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/po/fi_FI.po vdr-1.5.17-liemikuutio/po/fi_FI.po
+--- vdr-1.5.17-vanilla/po/fi_FI.po 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/po/fi_FI.po 2008-03-02 19:10:40.000000000 +0200
@@ -1001,3 +1001,36 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -776,9 +808,9 @@
+
+msgid "Setup.Recording$Show length"
+msgstr "Näytä tallenteen kesto"
-diff -Nru vdr-1.5.15-vanilla/po/fr_FR.po vdr-1.5.15-liemikuutio/po/fr_FR.po
---- vdr-1.5.15-vanilla/po/fr_FR.po 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/po/fr_FR.po 2008-02-17 18:57:59.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/po/fr_FR.po vdr-1.5.17-liemikuutio/po/fr_FR.po
+--- vdr-1.5.17-vanilla/po/fr_FR.po 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/po/fr_FR.po 2008-03-02 19:10:40.000000000 +0200
@@ -1004,3 +1004,36 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -816,9 +848,9 @@
+
+msgid "Setup.Recording$Show length"
+msgstr "Monter la longueur de l'enregistrement"
-diff -Nru vdr-1.5.15-vanilla/po/ru_RU.po vdr-1.5.15-liemikuutio/po/ru_RU.po
---- vdr-1.5.15-vanilla/po/ru_RU.po 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/po/ru_RU.po 2008-02-17 18:57:59.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/po/ru_RU.po vdr-1.5.17-liemikuutio/po/ru_RU.po
+--- vdr-1.5.17-vanilla/po/ru_RU.po 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/po/ru_RU.po 2008-03-02 19:10:40.000000000 +0200
@@ -999,3 +999,36 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -856,9 +888,9 @@
+
+msgid "Setup.Recording$Show length"
+msgstr "¿ÞÚÐ×ëÒÐâì ßàÞÔÞÛÖØâÕÛìÝÞáâì ×ÐßØáØ"
-diff -Nru vdr-1.5.15-vanilla/recording.c vdr-1.5.15-liemikuutio/recording.c
---- vdr-1.5.15-vanilla/recording.c 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/recording.c 2008-02-17 18:57:17.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/recording.c vdr-1.5.17-liemikuutio/recording.c
+--- vdr-1.5.17-vanilla/recording.c 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/recording.c 2008-03-02 19:10:40.000000000 +0200
@@ -46,6 +46,7 @@
#endif
#define INFOFILESUFFIX "/info.vdr"
@@ -911,9 +943,9 @@
+ if (Setup.ShowRecLength && FileName()) {
+ cString filename = cString::sprintf("%s%s", FileName(), INDEXFILESUFFIX);
+ if (*filename) {
-+ if (access(*filename, R_OK) == 0) {
++ if (access(filename, R_OK) == 0) {
+ struct stat buf;
-+ if (stat(*filename, &buf) == 0) {
++ if (stat(filename, &buf) == 0) {
+ struct tIndex { int offset; uchar type; uchar number; short reserved; };
+ int delta = buf.st_size % sizeof(tIndex);
+ if (delta) {
@@ -992,9 +1024,9 @@
// The number of frames to stay off the end in case of time shift:
#define INDEXSAFETYLIMIT 150 // frames
-diff -Nru vdr-1.5.15-vanilla/recording.h vdr-1.5.15-liemikuutio/recording.h
---- vdr-1.5.15-vanilla/recording.h 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/recording.h 2008-02-17 17:22:18.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/recording.h vdr-1.5.17-liemikuutio/recording.h
+--- vdr-1.5.17-vanilla/recording.h 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/recording.h 2008-03-02 19:10:40.000000000 +0200
@@ -19,6 +19,7 @@
#include "tools.h"
@@ -1022,9 +1054,9 @@
};
class cRecordings : public cList<cRecording>, public cThread {
-diff -Nru vdr-1.5.15-vanilla/svdrp.c vdr-1.5.15-liemikuutio/svdrp.c
---- vdr-1.5.15-vanilla/svdrp.c 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/svdrp.c 2008-02-17 17:22:18.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/svdrp.c vdr-1.5.17-liemikuutio/svdrp.c
+--- vdr-1.5.17-vanilla/svdrp.c 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/svdrp.c 2008-03-02 19:10:40.000000000 +0200
@@ -296,6 +296,8 @@
"REMO [ on | off ]\n"
" Turns the remote control on or off. Without a parameter, the current\n"
@@ -1081,9 +1113,9 @@
else if (CMD("SCAN")) CmdSCAN(s);
else if (CMD("STAT")) CmdSTAT(s);
else if (CMD("UPDT")) CmdUPDT(s);
-diff -Nru vdr-1.5.15-vanilla/svdrp.h vdr-1.5.15-liemikuutio/svdrp.h
---- vdr-1.5.15-vanilla/svdrp.h 2008-02-17 17:21:42.000000000 +0200
-+++ vdr-1.5.15-liemikuutio/svdrp.h 2008-02-17 17:22:18.000000000 +0200
+diff -Nru vdr-1.5.17-vanilla/svdrp.h vdr-1.5.17-liemikuutio/svdrp.h
+--- vdr-1.5.17-vanilla/svdrp.h 2008-03-02 19:09:57.000000000 +0200
++++ vdr-1.5.17-liemikuutio/svdrp.h 2008-03-02 19:10:40.000000000 +0200
@@ -79,6 +79,7 @@
void CmdPLUG(const char *Option);
void CmdPUTE(const char *Option);
Modified: vdr/vdr/trunk/debian/patches/opt-28_audioindexer.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-28_audioindexer.dpatch?rev=6457&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-28_audioindexer.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-28_audioindexer.dpatch Sun Mar 16 17:55:51 2008
@@ -1,8 +1,10 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## opt-28_audioindexer.dpatch by Tobias Grimm <tg at e-tobi.net>
+## opt-28_audioindexer.dpatch by Reinhard Nissl <rnissl at gmx.de>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fixes cRemux to only generate an index entry whenever
+## DP: the recorded amount of music crosses a 40 ms boundary.
+## DP: This should fix problems with the length of radio recordings.
@DPATCH@
diff -urNad vdr-1.5.10~/remux.c vdr-1.5.10/remux.c
Modified: vdr/vdr/trunk/debian/patches/opt-31-x_reelchannelscan.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-31-x_reelchannelscan.dpatch?rev=6457&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-31-x_reelchannelscan.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-31-x_reelchannelscan.dpatch Sun Mar 16 17:55:51 2008
@@ -5,19 +5,20 @@
## - adapted to VDR-1.5.8
## Tobias Grimm <tg at e-tobi.net>:
## - adapted to VDR-1.5.16
+## - adapted to VDR-1.5.18
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Makes VDR aware of the reelchannelscan plugin.
@DPATCH@
-diff -urNad vdr-1.5.16~/vdr.c vdr-1.5.16/vdr.c
---- vdr-1.5.16~/vdr.c 2008-02-25 20:52:42.000000000 +0100
-+++ vdr-1.5.16/vdr.c 2008-02-25 20:56:26.000000000 +0100
-@@ -740,7 +740,14 @@
+diff -urNad vdr-1.5.18~/vdr.c vdr-1.5.18/vdr.c
+--- vdr-1.5.18~/vdr.c 2008-03-14 14:22:39.000000000 +0100
++++ vdr-1.5.18/vdr.c 2008-03-16 15:59:55.000000000 +0100
+@@ -731,7 +731,14 @@
// Make sure we have a visible programme in case device usage has changed:
if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
static time_t lastTime = 0;
-- if (!Menu && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
+- if ((!Menu || CheckHasProgramme) && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
+
+ bool reelChannelscanIsScanningOnReceivingDevice;
+ if (!cPluginManager::CallFirstService("ReelChannelscan::IsScanningOnReceivingDevice", &reelChannelscanIsScanningOnReceivingDevice))
@@ -25,7 +26,7 @@
+ reelChannelscanIsScanningOnReceivingDevice = false;
+ }
+
-+ if (!reelChannelscanIsScanningOnReceivingDevice && !Menu && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
++ if (!reelChannelscanIsScanningOnReceivingDevice && (!Menu || CheckHasProgramme) && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
if (Channel && (Channel->Vpid() || Channel->Apid(0))) {
if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
Modified: vdr/vdr/trunk/debian/patches/opt-40_iptv.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-40_iptv.dpatch?rev=6457&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-40_iptv.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-40_iptv.dpatch Sun Mar 16 17:55:51 2008
@@ -1,15 +1,15 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## opt-40_iptv.dpatch by Tobias Grimm <tg at e-tobi.net>
-## from version 0.0.6 of the IPTV plug-in
+## from version 0.0.7 of the IPTV plug-in
## http://www.saunalahti.fi/~rahrenbe/vdr/iptv/
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch required for the IPTV plug-in
@DPATCH@
-diff -urNad vdr-1.5.15~/channels.c vdr-1.5.15/channels.c
---- vdr-1.5.15~/channels.c 2008-02-10 16:45:38.000000000 +0100
-+++ vdr-1.5.15/channels.c 2008-02-18 17:23:54.000000000 +0100
+diff -urNad vdr-1.5.18~/channels.c vdr-1.5.18/channels.c
+--- vdr-1.5.18~/channels.c 2008-03-16 16:08:41.000000000 +0100
++++ vdr-1.5.18/channels.c 2008-03-16 16:08:41.000000000 +0100
@@ -166,6 +166,7 @@
shortName = strdup("");
provider = strdup("");
@@ -53,17 +53,17 @@
+bool cChannel::SetPlugTransponderData(int Source, int Frequency, const char *PluginParam)
+{
+ if (source != Source || frequency != Frequency || (strcmp(pluginParam, PluginParam) != 0)) {
-+ if (Number()) {
-+ dsyslog("changing transponder data of channel %d from %s:%d:%s to %s:%d:%s", Number(), *cSource::ToString(source), frequency, pluginParam, *cSource::ToString(Source), Frequency, PluginParam);
-+ modification |= CHANNELMOD_TRANSP;
-+ Channels.SetModified();
-+ }
-+ source = Source;
-+ frequency = Frequency;
-+ pluginParam = strcpyrealloc(pluginParam, PluginParam);
-+ schedule = NULL;
-+ }
-+ return true;
++ if (Number()) {
++ dsyslog("changing transponder data of channel %d from %s:%d:%s to %s:%d:%s", Number(), *cSource::ToString(source), frequency, pluginParam, *cSource::ToString(Source), Frequency, PluginParam);
++ modification |= CHANNELMOD_TRANSP;
++ Channels.SetModified();
++ }
++ source = Source;
++ frequency = Frequency;
++ pluginParam = strcpyrealloc(pluginParam, PluginParam);
++ schedule = NULL;
++ }
++ return true;
+}
+
bool cChannel::SetSatTransponderData(int Source, int Frequency, char Polarization, int Srate, int CoderateH)
@@ -131,9 +131,9 @@
free(parambuf);
free(sourcebuf);
-diff -urNad vdr-1.5.15~/channels.h vdr-1.5.15/channels.h
---- vdr-1.5.15~/channels.h 2008-02-08 14:48:31.000000000 +0100
-+++ vdr-1.5.15/channels.h 2008-02-18 17:23:54.000000000 +0100
+diff -urNad vdr-1.5.18~/channels.h vdr-1.5.18/channels.h
+--- vdr-1.5.18~/channels.h 2008-02-08 14:48:31.000000000 +0100
++++ vdr-1.5.18/channels.h 2008-03-16 16:08:41.000000000 +0100
@@ -114,6 +114,7 @@
char *shortName;
char *provider;
@@ -173,9 +173,9 @@
void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
void SetCaIds(const int *CaIds); // list must be zero-terminated
void SetCaDescriptors(int Level);
-diff -urNad vdr-1.5.15~/config.h vdr-1.5.15/config.h
---- vdr-1.5.15~/config.h 2008-02-05 16:35:11.000000000 +0100
-+++ vdr-1.5.15/config.h 2008-02-18 17:23:54.000000000 +0100
+diff -urNad vdr-1.5.18~/config.h vdr-1.5.18/config.h
+--- vdr-1.5.18~/config.h 2008-03-16 16:08:41.000000000 +0100
++++ vdr-1.5.18/config.h 2008-03-16 16:08:41.000000000 +0100
@@ -30,6 +30,8 @@
#define APIVERSION "1.5.15"
#define APIVERSNUM 10515 // Version * 10000 + Major * 100 + Minor
@@ -185,10 +185,10 @@
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to
// VDR header files since the last APIVERSION. This allows compiled
-diff -urNad vdr-1.5.15~/menu.c vdr-1.5.15/menu.c
---- vdr-1.5.15~/menu.c 2008-02-16 14:53:26.000000000 +0100
-+++ vdr-1.5.15/menu.c 2008-02-18 17:23:54.000000000 +0100
-@@ -253,6 +253,7 @@
+diff -urNad vdr-1.5.18~/menu.c vdr-1.5.18/menu.c
+--- vdr-1.5.18~/menu.c 2008-03-16 16:08:41.000000000 +0100
++++ vdr-1.5.18/menu.c 2008-03-16 16:08:41.000000000 +0100
+@@ -256,6 +256,7 @@
cChannel *channel;
cChannel data;
char name[256];
@@ -196,7 +196,7 @@
void Setup(void);
public:
cMenuEditChannel(cChannel *Channel, bool New = false);
-@@ -285,6 +286,7 @@
+@@ -288,6 +289,7 @@
// Parameters for all types of sources:
strn0cpy(name, data.name, sizeof(name));
@@ -204,7 +204,7 @@
Add(new cMenuEditStrItem( tr("Name"), name, sizeof(name)));
Add(new cMenuEditSrcItem( tr("Source"), &data.source));
Add(new cMenuEditIntItem( tr("Frequency"), &data.frequency));
-@@ -315,6 +317,7 @@
+@@ -318,6 +320,7 @@
ST(" T") Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues));
ST(" T") Add(new cMenuEditMapItem( tr("Guard"), &data.guard, GuardValues));
ST(" T") Add(new cMenuEditMapItem( tr("Hierarchy"), &data.hierarchy, HierarchyValues, tr("none")));
@@ -212,7 +212,7 @@
SetCurrent(Get(current));
Display();
-@@ -329,6 +332,7 @@
+@@ -332,6 +335,7 @@
if (Key == kOk) {
if (Channels.HasUniqueChannelID(&data, channel)) {
data.name = strcpyrealloc(data.name, name);
@@ -220,22 +220,29 @@
if (channel) {
*channel = data;
isyslog("edited channel %d %s", channel->Number(), *data.ToText());
-diff -urNad vdr-1.5.15~/po/fi_FI.po vdr-1.5.15/po/fi_FI.po
---- vdr-1.5.15~/po/fi_FI.po 2008-02-17 14:45:14.000000000 +0100
-+++ vdr-1.5.15/po/fi_FI.po 2008-02-18 17:25:37.000000000 +0100
-@@ -18,6 +18,9 @@
- "Content-Type: text/plain; charset=ISO-8859-15\n"
- "Content-Transfer-Encoding: 8bit\n"
-
+diff -urNad vdr-1.5.18~/po/fi_FI.po vdr-1.5.18/po/fi_FI.po
+--- vdr-1.5.18~/po/fi_FI.po 2008-03-16 16:08:41.000000000 +0100
++++ vdr-1.5.18/po/fi_FI.po 2008-03-16 16:09:59.000000000 +0100
+@@ -1034,3 +1034,6 @@
+
+ msgid "Setup.Recording$Show length"
+ msgstr "Näytä tallenteen kesto"
++
+msgid "Parameters"
+msgstr "Parametrit"
-+
- msgid "*** Invalid Channel ***"
- msgstr "*** Virheellinen kanavavalinta ***"
-
-diff -urNad vdr-1.5.15~/sources.c vdr-1.5.15/sources.c
---- vdr-1.5.15~/sources.c 2008-02-10 15:07:26.000000000 +0100
-+++ vdr-1.5.15/sources.c 2008-02-18 17:23:54.000000000 +0100
+diff -urNad vdr-1.5.18~/po/fr_FR.po vdr-1.5.18/po/fr_FR.po
+--- vdr-1.5.18~/po/fr_FR.po 2008-03-16 16:08:41.000000000 +0100
++++ vdr-1.5.18/po/fr_FR.po 2008-03-16 16:10:20.000000000 +0100
+@@ -1037,3 +1037,6 @@
+
+ msgid "Setup.Recording$Show length"
+ msgstr "Monter la longueur de l'enregistrement"
++
++msgid "Parameters"
++msgstr "Paramètres"
+diff -urNad vdr-1.5.18~/sources.c vdr-1.5.18/sources.c
+--- vdr-1.5.18~/sources.c 2008-02-10 15:07:26.000000000 +0100
++++ vdr-1.5.18/sources.c 2008-03-16 16:08:41.000000000 +0100
@@ -37,6 +37,7 @@
char buffer[16];
char *q = buffer;
@@ -252,9 +259,9 @@
case 'C': type = stCable; break;
case 'S': type = stSat; break;
case 'T': type = stTerr; break;
-diff -urNad vdr-1.5.15~/sources.conf vdr-1.5.15/sources.conf
---- vdr-1.5.15~/sources.conf 2007-02-17 17:15:13.000000000 +0100
-+++ vdr-1.5.15/sources.conf 2008-02-18 17:23:54.000000000 +0100
+diff -urNad vdr-1.5.18~/sources.conf vdr-1.5.18/sources.conf
+--- vdr-1.5.18~/sources.conf 2007-02-17 17:15:13.000000000 +0100
++++ vdr-1.5.18/sources.conf 2008-03-16 16:08:41.000000000 +0100
@@ -188,3 +188,7 @@
# Terrestrial
@@ -263,9 +270,9 @@
+# Plugin
+
+P Plugin
-diff -urNad vdr-1.5.15~/sources.h vdr-1.5.15/sources.h
---- vdr-1.5.15~/sources.h 2005-05-14 11:30:41.000000000 +0200
-+++ vdr-1.5.15/sources.h 2008-02-18 17:23:54.000000000 +0100
+diff -urNad vdr-1.5.18~/sources.h vdr-1.5.18/sources.h
+--- vdr-1.5.18~/sources.h 2005-05-14 11:30:41.000000000 +0200
++++ vdr-1.5.18/sources.h 2008-03-16 16:08:41.000000000 +0100
@@ -16,10 +16,11 @@
public:
enum eSourceType {
More information about the pkg-vdr-dvb-changes
mailing list