r7584 - in /vdr/vdr/trunk/debian: .vdr-patches .vdr-patches.multipatch changelog copyright patches/10_dd-record-option.dpatch patches/opt-24_jumpplay.dpatch patches/opt-38_disableDoubleEpgEntrys.dpatch
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Wed Apr 1 16:48:54 UTC 2009
Author: tiber-guest
Date: Wed Apr 1 16:48:54 2009
New Revision: 7584
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7584
Log:
* Updated debian/copryright
* Added French language texts to 10_dd-record-option.dpatch (Thx to Michaël
Nival)
* Upgraded opt-24_jumpplay.dpatch to version 1.0
* Added French language texts to opt-38_disableDoubleEpgEntrys.dpatch (Thx to
Michaël Nival)
Modified:
vdr/vdr/trunk/debian/.vdr-patches
vdr/vdr/trunk/debian/.vdr-patches.multipatch
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/copyright
vdr/vdr/trunk/debian/patches/10_dd-record-option.dpatch
vdr/vdr/trunk/debian/patches/opt-24_jumpplay.dpatch
vdr/vdr/trunk/debian/patches/opt-38_disableDoubleEpgEntrys.dpatch
Modified: vdr/vdr/trunk/debian/.vdr-patches
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/.vdr-patches?rev=7584&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/.vdr-patches (original)
+++ vdr/vdr/trunk/debian/.vdr-patches Wed Apr 1 16:48:54 2009
@@ -1,7 +1,7 @@
debian/patches/81_Make_config.dpatch:dcff6a00ef9474bca19d955d19574009
debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
debian/patches/12_osdbase-maxitems.dpatch:e45d1b62f7d66c3e5d279e3561034107
-debian/patches/10_dd-record-option.dpatch:56f2327b5930da8d40873b0140f5e051
+debian/patches/10_dd-record-option.dpatch:58c3a3dbcd9a3ec4b0ee1814f71d1e88
debian/patches/11_sortrecordings.dpatch:9ed4cd1e144ee59dab34d4df4aa9af51
debian/patches/19_dvb-api-v5.dpatch:6714266c10537521d2440cfa4d50b3f0
debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
Modified: vdr/vdr/trunk/debian/.vdr-patches.multipatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/.vdr-patches.multipatch?rev=7584&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/.vdr-patches.multipatch (original)
+++ vdr/vdr/trunk/debian/.vdr-patches.multipatch Wed Apr 1 16:48:54 2009
@@ -11,11 +11,11 @@
debian/patches/opt-42-x_MainMenuHooks.dpatch:1c4c782b5c88c4f0408890a5f50b217b
debian/patches/opt-44_rotor.dpatch:bbcc27512e0a0b610efadcde8fa67d02
debian/patches/opt-20_liemikuutio.dpatch:bb8bb6b250b8b2ee24dad87a7c4490f8
-debian/patches/10_dd-record-option.dpatch:56f2327b5930da8d40873b0140f5e051
+debian/patches/10_dd-record-option.dpatch:58c3a3dbcd9a3ec4b0ee1814f71d1e88
debian/patches/opt-21_internal-cam-devices.dpatch:a883c0b09e67b679436b7df1e9807fc8
debian/patches/09_sort_options.dpatch:3b561fcd7645b216b4dab989d7786fda
debian/patches/opt-41-x_timer-info.dpatch:92ee6cdf60b795d9fbcf4fdcafe401b4
-debian/patches/opt-24_jumpplay.dpatch:31906df69c18642ddd0996fa0b82a527
+debian/patches/opt-24_jumpplay.dpatch:1ff8f1a90e02b11a42218ffba18b5f26
debian/patches/opt-30-x_analogtv.dpatch:3789ff68d9dc9a2482f78519634b27b6
debian/patches/17_vdr-maintenance-1.6.0-1.dpatch:3a2ff2c6d3b13489c19eda4e32f2537c
debian/patches/03_cmdsubmenu.dpatch:abff754a3d760764796f06cdf1cf5105
@@ -36,6 +36,6 @@
debian/patches/opt-54_deltimeshiftrec.dpatch:5ed1505172adbdb45a583a69dfe19763
debian/patches/opt-49-x_pvrinput.dpatch:213c07a003000b6b93f1a8d004787220
debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
-debian/patches/opt-38_disableDoubleEpgEntrys.dpatch:7899100c3c242d7bcd35f1d3cee9ef9d
+debian/patches/opt-38_disableDoubleEpgEntrys.dpatch:7a09fa581f95613497b718b5c4a4a875
debian/patches/opt-29_syncearly-audioindexer.dpatch:4093d09329d441bd25703a4892633efb
debian/patches/15_dvbplayer.dpatch:d1f31f0687c917dea48bc0ba26b7f3bb
Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=7584&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Wed Apr 1 16:48:54 2009
@@ -5,10 +5,16 @@
be part of the standard kernel (at least on i386 and amd64).
* Fixed debconf to not ask to create /var/lib/video.00 if it already exists
* Added 19_dvb-api-v5.dpatch for new DVB API version 5 in kernel 2.6.28
+ * Updated debian/copryright
[ Thomas Günther ]
* Added removal of vdr-dbg.1 to clean target in debian/rules
* Fixed substitution of 00list in debian/rules
+ * Added French language texts to 10_dd-record-option.dpatch (Thx to Michaël
+ Nival)
+ * Upgraded opt-24_jumpplay.dpatch to version 1.0
+ * Added French language texts to opt-38_disableDoubleEpgEntrys.dpatch (Thx to
+ Michaël Nival)
-- Tobias Grimm <etobi at debian.org> Sat, 10 Jan 2009 23:10:46 +0100
Modified: vdr/vdr/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/copyright?rev=7584&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/copyright (original)
+++ vdr/vdr/trunk/debian/copyright Wed Apr 1 16:48:54 2009
@@ -33,7 +33,7 @@
Copyright (Debian packaging):
(C) 2001 - 2002 Eduard Bloch
(C) 2003 - 2004 Andreas Müller
- (C) 2002 - 2008 Tobias Grimm, Thomas Günther, Thomas Schmidt
+ (C) 2002 - 2009 Tobias Grimm, Thomas Günther, Thomas Schmidt
License:
This program is free software; you can redistribute it and/or modify
Modified: vdr/vdr/trunk/debian/patches/10_dd-record-option.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/10_dd-record-option.dpatch?rev=7584&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/10_dd-record-option.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/10_dd-record-option.dpatch Wed Apr 1 16:48:54 2009
@@ -6,16 +6,18 @@
## - fixed i18n texts for replay
## - adapted to VDR-1.5.7
## http://toms-cafe.de/vdr/download/vdr-dd-record-option-1.5.7.diff
+## - added French language texts (thanks to Michaël Nival)
+## http://toms-cafe.de/vdr/download/vdr-dd-record-option-1.6.0.diff
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allows to choose if to record and to replay Dolby Digital
-## DP: independently (to work around some audio issues with the
+## DP: Allows to choose if to record and to replay Dolby Digital
+## DP: independently (to work around some audio issues with the
## DP: dvd-plugin)
@DPATCH@
---- vdr-1.5.7/config.c
-+++ vdr-1.5.7/config.c
-@@ -255,6 +255,7 @@
+--- vdr-1.6.0/config.c
++++ vdr-1.6.0/config.c
+@@ -259,6 +259,7 @@ cSetup::cSetup(void)
VideoDisplayFormat = 1;
VideoFormat = 0;
UpdateChannels = 5;
@@ -23,7 +25,7 @@
UseDolbyDigital = 1;
ChannelInfoPos = 0;
ChannelInfoTime = 5;
-@@ -425,6 +426,7 @@
+@@ -432,6 +433,7 @@ bool cSetup::Parse(const char *Name, con
else if (!strcasecmp(Name, "VideoDisplayFormat")) VideoDisplayFormat = atoi(Value);
else if (!strcasecmp(Name, "VideoFormat")) VideoFormat = atoi(Value);
else if (!strcasecmp(Name, "UpdateChannels")) UpdateChannels = atoi(Value);
@@ -31,7 +33,7 @@
else if (!strcasecmp(Name, "UseDolbyDigital")) UseDolbyDigital = atoi(Value);
else if (!strcasecmp(Name, "ChannelInfoPos")) ChannelInfoPos = atoi(Value);
else if (!strcasecmp(Name, "ChannelInfoTime")) ChannelInfoTime = atoi(Value);
-@@ -502,6 +504,7 @@
+@@ -515,6 +517,7 @@ bool cSetup::Save(void)
Store("VideoDisplayFormat", VideoDisplayFormat);
Store("VideoFormat", VideoFormat);
Store("UpdateChannels", UpdateChannels);
@@ -39,9 +41,9 @@
Store("UseDolbyDigital", UseDolbyDigital);
Store("ChannelInfoPos", ChannelInfoPos);
Store("ChannelInfoTime", ChannelInfoTime);
---- vdr-1.5.7/config.h
-+++ vdr-1.5.7/config.h
-@@ -237,6 +237,7 @@
+--- vdr-1.6.0/config.h
++++ vdr-1.6.0/config.h
+@@ -241,6 +241,7 @@ public:
int VideoDisplayFormat;
int VideoFormat;
int UpdateChannels;
@@ -49,9 +51,9 @@
int UseDolbyDigital;
int ChannelInfoPos;
int ChannelInfoTime;
---- vdr-1.5.7/menu.c
-+++ vdr-1.5.7/menu.c
-@@ -2437,7 +2437,8 @@
+--- vdr-1.6.0/menu.c
++++ vdr-1.6.0/menu.c
+@@ -2488,7 +2488,8 @@ void cMenuSetupDVB::Setup(void)
Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"), &data.VideoFormat, "4:3", "16:9"));
if (data.VideoFormat == 0)
Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
@@ -61,9 +63,12 @@
Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"), &data.UpdateChannels, 6, updateChannelsTexts));
Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"), &numAudioLanguages, 0, I18nLanguages()->Size()));
for (int i = 0; i < numAudioLanguages; i++)
---- vdr-1.5.7/po/de_DE.po
-+++ vdr-1.5.7/po/de_DE.po
-@@ -803,2 +803,5 @@
+--- vdr-1.6.0/po/de_DE.po
++++ vdr-1.6.0/po/de_DE.po
+@@ -620,8 +620,11 @@ msgstr "Videoformat"
+ msgid "Setup.DVB$Video display format"
+ msgstr "Video-Anzeigeformat"
+
-msgid "Setup.DVB$Use Dolby Digital"
-msgstr "Dolby-Digital-Ton benutzen"
+msgid "Setup.DVB$Record Dolby Digital"
@@ -71,9 +76,28 @@
+
+msgid "Setup.DVB$Replay Dolby Digital"
+msgstr "Dolby-Digital-Ton wiedergeben"
---- vdr-1.5.7/recorder.c
-+++ vdr-1.5.7/recorder.c
-@@ -127,7 +127,7 @@
+
+ msgid "Setup.DVB$Update channels"
+ msgstr "Kanäle aktualisieren"
+--- vdr-1.6.0/po/fr_FR.po
++++ vdr-1.6.0/po/fr_FR.po
+@@ -626,8 +626,11 @@ msgstr "Format vidéo"
+ msgid "Setup.DVB$Video display format"
+ msgstr "Format d'affichage"
+
+-msgid "Setup.DVB$Use Dolby Digital"
+-msgstr "Utiliser le Dolby Digital"
++msgid "Setup.DVB$Record Dolby Digital"
++msgstr "Enregistrer le Dolby Digital"
++
++msgid "Setup.DVB$Replay Dolby Digital"
++msgstr "Lire le Dolby Digital"
+
+ msgid "Setup.DVB$Update channels"
+ msgstr "Mettre à jour les chaînes"
+--- vdr-1.6.0/recorder.c
++++ vdr-1.6.0/recorder.c
+@@ -127,7 +127,7 @@ void cFileWriter::Action(void)
// --- cRecorder -------------------------------------------------------------
cRecorder::cRecorder(const char *FileName, tChannelID ChannelID, int Priority, int VPid, const int *APids, const int *DPids, const int *SPids)
@@ -82,7 +106,7 @@
,cThread("recording")
{
// Make sure the disk is up and running:
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ cRecorder::cRecorder(const char *FileNam
ringBuffer = new cRingBufferLinear(RECORDERBUFSIZE, TS_SIZE * 2, true, "Recorder");
ringBuffer->SetTimeouts(0, 100);
Modified: vdr/vdr/trunk/debian/patches/opt-24_jumpplay.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-24_jumpplay.dpatch?rev=7584&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-24_jumpplay.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-24_jumpplay.dpatch Wed Apr 1 16:48:54 2009
@@ -1,16 +1,16 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## opt-24_jumpplay-0.9.dpatch by Torsten Kunkel <vdr at tkunkel.de>, Thomas Günther <tom at toms-cafe.de>
-## http://toms-cafe.de/vdr/download/vdr-jumpplay-0.9-1.5.7.diff
+## opt-24_jumpplay.dpatch by Torsten Kunkel <vdr at tkunkel.de>, Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/vdr-jumpplay-1.0-1.6.0.diff
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Play after jump to next mark. Automatically jump over commercial breaks.
## DP: See README.jumpplay and MANUAL for details.
@DPATCH@
-diff -Naur vdr-1.5.7/MANUAL vdr-1.5.7-jumpplay-0.9/MANUAL
---- vdr-1.5.7/MANUAL 2007-06-23 09:28:05.000000000 +0000
-+++ vdr-1.5.7-jumpplay-0.9/MANUAL 2007-08-12 17:51:54.000000000 +0000
-@@ -786,6 +786,30 @@
+diff -Naurp vdr-1.6.0/MANUAL vdr-1.6.0-jumpplay-1.0/MANUAL
+--- vdr-1.6.0/MANUAL 2008-02-24 10:09:17.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/MANUAL 2009-03-31 00:11:13.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'.
@@ -41,10 +41,10 @@
Miscellaneous:
Min. event timeout = 30
-diff -Naur vdr-1.5.7/README.jumpplay vdr-1.5.7-jumpplay-0.9/README.jumpplay
---- vdr-1.5.7/README.jumpplay 1970-01-01 00:00:00.000000000 +0000
-+++ vdr-1.5.7-jumpplay-0.9/README.jumpplay 2007-08-12 17:51:54.000000000 +0000
-@@ -0,0 +1,87 @@
+diff -Naurp vdr-1.6.0/README.jumpplay vdr-1.6.0-jumpplay-1.0/README.jumpplay
+--- vdr-1.6.0/README.jumpplay 1970-01-01 00:00:00.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/README.jumpplay 2009-03-31 00:24:59.000000000 +0000
+@@ -0,0 +1,92 @@
+JumpPlay patch for VDR
+----------------------
+
@@ -132,10 +132,15 @@
+ New setup parameter "Pause at last mark"
+ Updated description in README.jumpplay
+ Moved parameters description to MANUAL
-diff -Naur vdr-1.5.7/config.c vdr-1.5.7-jumpplay-0.9/config.c
---- vdr-1.5.7/config.c 2007-08-12 12:09:37.000000000 +0000
-+++ vdr-1.5.7-jumpplay-0.9/config.c 2007-08-12 17:51:54.000000000 +0000
-@@ -279,6 +279,10 @@
++
++ 2009-03-31: Version 1.0 - Thomas Günther <tom at toms-cafe.de>
++ 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.6.0/config.c vdr-1.6.0-jumpplay-1.0/config.c
+--- vdr-1.6.0/config.c 2008-02-17 13:39:00.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/config.c 2009-03-31 00:11:13.000000000 +0000
+@@ -283,6 +283,10 @@ cSetup::cSetup(void)
MultiSpeedMode = 0;
ShowReplayMode = 0;
ResumeID = 0;
@@ -146,7 +151,7 @@
CurrentChannel = -1;
CurrentVolume = MAXVOLUME;
CurrentDolby = 0;
-@@ -449,6 +453,10 @@
+@@ -456,6 +460,10 @@ bool cSetup::Parse(const char *Name, con
else if (!strcasecmp(Name, "MultiSpeedMode")) MultiSpeedMode = atoi(Value);
else if (!strcasecmp(Name, "ShowReplayMode")) ShowReplayMode = atoi(Value);
else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value);
@@ -157,7 +162,7 @@
else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value);
else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value);
else if (!strcasecmp(Name, "CurrentDolby")) CurrentDolby = atoi(Value);
-@@ -526,6 +534,10 @@
+@@ -539,6 +547,10 @@ bool cSetup::Save(void)
Store("MultiSpeedMode", MultiSpeedMode);
Store("ShowReplayMode", ShowReplayMode);
Store("ResumeID", ResumeID);
@@ -168,19 +173,19 @@
Store("CurrentChannel", CurrentChannel);
Store("CurrentVolume", CurrentVolume);
Store("CurrentDolby", CurrentDolby);
-diff -Naur vdr-1.5.7/config.h vdr-1.5.7-jumpplay-0.9/config.h
---- vdr-1.5.7/config.h 2007-08-10 13:01:52.000000000 +0000
-+++ vdr-1.5.7-jumpplay-0.9/config.h 2007-08-12 17:51:54.000000000 +0000
+diff -Naurp vdr-1.6.0/config.h vdr-1.6.0-jumpplay-1.0/config.h
+--- vdr-1.6.0/config.h 2008-03-23 10:26:10.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/config.h 2009-03-31 00:11:13.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.
-+#define JUMPPLAYVERSNUM 9
++#define JUMPPLAYVERSNUM 100
+
#define MAXPRIORITY 99
#define MAXLIFETIME 99
-@@ -257,6 +259,10 @@
+@@ -261,6 +263,10 @@ public:
int MultiSpeedMode;
int ShowReplayMode;
int ResumeID;
@@ -191,10 +196,10 @@
int CurrentChannel;
int CurrentVolume;
int CurrentDolby;
-diff -Naur vdr-1.5.7/dvbplayer.c vdr-1.5.7-jumpplay-0.9/dvbplayer.c
---- vdr-1.5.7/dvbplayer.c 2007-04-28 14:55:22.000000000 +0000
-+++ vdr-1.5.7-jumpplay-0.9/dvbplayer.c 2007-08-12 17:51:54.000000000 +0000
-@@ -193,6 +193,7 @@
+diff -Naurp vdr-1.6.0/dvbplayer.c vdr-1.6.0-jumpplay-1.0/dvbplayer.c
+--- vdr-1.6.0/dvbplayer.c 2008-02-09 15:10:54.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/dvbplayer.c 2009-03-31 00:17:08.000000000 +0000
+@@ -193,6 +193,7 @@ private:
cNonBlockingFileReader *nonBlockingFileReader;
cRingBufferFrame *ringBuffer;
cBackTrace *backTrace;
@@ -202,7 +207,7 @@
cFileName *fileName;
cIndexFile *index;
cUnbufferedFile *replayFile;
-@@ -234,7 +235,7 @@
+@@ -234,7 +235,7 @@ public:
int cDvbPlayer::Speeds[] = { 0, -2, -4, -8, 1, 2, 4, 12, 0 };
cDvbPlayer::cDvbPlayer(const char *FileName)
@@ -211,7 +216,18 @@
{
nonBlockingFileReader = NULL;
ringBuffer = NULL;
-@@ -368,11 +369,26 @@
+@@ -341,6 +342,10 @@ bool cDvbPlayer::Save(void)
+ if (index) {
+ int Index = writeIndex;
+ if (Index >= 0) {
++ // set resume position to 0 if replay stops at the first mark
++ if (Setup.PlayJump && marks.First() &&
++ abs(Index - marks.First()->position) <= RESUMEBACKUP)
++ Index = 0;
+ Index -= RESUMEBACKUP;
+ if (Index > 0)
+ Index = index->GetNextIFrame(Index, false);
+@@ -368,11 +373,26 @@ void cDvbPlayer::Action(void)
uchar *b = NULL;
uchar *p = NULL;
int pc = 0;
@@ -238,7 +254,7 @@
nonBlockingFileReader = new cNonBlockingFileReader;
int Length = 0;
bool Sleep = false;
-@@ -393,7 +409,7 @@
+@@ -393,7 +413,7 @@ void cDvbPlayer::Action(void)
// Read the next frame from the file:
@@ -247,7 +263,7 @@
if (!readFrame && (replayFile || readIndex >= 0)) {
if (!nonBlockingFileReader->Reading()) {
if (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward)) {
-@@ -432,6 +448,44 @@
+@@ -438,6 +458,44 @@ void cDvbPlayer::Action(void)
uchar FileNumber;
int FileOffset;
readIndex++;
@@ -292,7 +308,7 @@
if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset))) {
readIndex = -1;
eof = true;
-@@ -467,6 +521,10 @@
+@@ -473,6 +531,10 @@ void cDvbPlayer::Action(void)
// Store the frame in the buffer:
if (readFrame) {
@@ -303,7 +319,7 @@
if (ringBuffer->Put(readFrame))
readFrame = NULL;
}
-@@ -515,8 +573,14 @@
+@@ -521,8 +583,14 @@ void cDvbPlayer::Action(void)
p = NULL;
}
}
@@ -319,10 +335,10 @@
}
}
-diff -Naur vdr-1.5.7/menu.c vdr-1.5.7-jumpplay-0.9/menu.c
---- vdr-1.5.7/menu.c 2007-08-12 10:44:35.000000000 +0000
-+++ vdr-1.5.7-jumpplay-0.9/menu.c 2007-08-12 17:51:54.000000000 +0000
-@@ -2690,6 +2690,10 @@
+diff -Naurp vdr-1.6.0/menu.c vdr-1.6.0-jumpplay-1.0/menu.c
+--- vdr-1.6.0/menu.c 2008-03-16 11:15:28.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/menu.c 2009-03-31 00:11:13.000000000 +0000
+@@ -2775,6 +2775,10 @@ cMenuSetupReplay::cMenuSetupReplay(void)
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));
@@ -333,7 +349,7 @@
}
void cMenuSetupReplay::Store(void)
-@@ -3892,7 +3896,7 @@
+@@ -4064,7 +4068,7 @@ char *cReplayControl::fileName = NULL;
char *cReplayControl::title = NULL;
cReplayControl::cReplayControl(void)
@@ -342,7 +358,7 @@
{
currentReplayControl = this;
displayReplay = NULL;
-@@ -3902,7 +3906,6 @@
+@@ -4074,7 +4078,6 @@ cReplayControl::cReplayControl(void)
lastSpeed = -2; // an invalid value
timeoutShow = 0;
timeSearchActive = false;
@@ -350,7 +366,7 @@
cRecording Recording(fileName);
cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true);
SetTrackDescriptions(false);
-@@ -4131,8 +4134,10 @@
+@@ -4304,8 +4307,10 @@ void cReplayControl::MarkToggle(void)
ShowTimed(2);
bool Play, Forward;
int Speed;
@@ -362,7 +378,7 @@
}
marks.Save();
}
-@@ -4145,8 +4150,17 @@
+@@ -4318,8 +4323,17 @@ void cReplayControl::MarkJump(bool Forwa
if (GetIndex(Current, Total)) {
cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
if (m) {
@@ -382,7 +398,7 @@
}
}
}
-@@ -4201,7 +4215,7 @@
+@@ -4374,7 +4388,7 @@ void cReplayControl::EditTest(void)
if (!m)
m = marks.GetNext(Current);
if (m) {
@@ -391,7 +407,7 @@
m = marks.Next(m);
if (m) {
Goto(m->position - SecondsToFrames(3));
-@@ -4223,6 +4237,7 @@
+@@ -4396,6 +4410,7 @@ eOSState cReplayControl::ProcessKey(eKey
{
if (!Active())
return osEnd;
@@ -399,10 +415,10 @@
if (visible) {
if (timeoutShow && time(NULL) > timeoutShow) {
Hide();
-diff -Naur vdr-1.5.7/menu.h vdr-1.5.7-jumpplay-0.9/menu.h
---- vdr-1.5.7/menu.h 2007-08-12 10:35:42.000000000 +0000
-+++ vdr-1.5.7-jumpplay-0.9/menu.h 2007-08-12 17:51:54.000000000 +0000
-@@ -195,7 +195,7 @@
+diff -Naurp vdr-1.6.0/menu.h vdr-1.6.0-jumpplay-1.0/menu.h
+--- vdr-1.6.0/menu.h 2008-02-10 16:01:53.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/menu.h 2009-03-31 00:11:13.000000000 +0000
+@@ -212,7 +212,7 @@ public:
class cReplayControl : public cDvbPlayerControl {
private:
cSkinDisplayReplay *displayReplay;
@@ -411,15 +427,13 @@
bool visible, modeOnly, shown, displayFrames;
int lastCurrent, lastTotal;
bool lastPlay, lastForward;
-diff -Naur vdr-1.5.7/po/de_DE.po vdr-1.5.7-jumpplay-0.9/po/de_DE.po
---- vdr-1.5.7/po/de_DE.po 2007-08-12 22:40:41.000000000 +0000
-+++ vdr-1.5.7-jumpplay-0.9/po/de_DE.po 2007-08-21 17:12:15.000000000 +0000
-@@ -943,2 +943,14 @@
--msgid "Replay"
--msgstr "Wiedergabe"
-+msgid "Replay"
-+msgstr "Wiedergabe"
-+
+diff -Naurp vdr-1.6.0/po/de_DE.po vdr-1.6.0-jumpplay-1.0/po/de_DE.po
+--- vdr-1.6.0/po/de_DE.po 2008-03-23 10:31:29.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/po/de_DE.po 2009-03-31 00:11:13.000000000 +0000
+@@ -746,6 +746,18 @@ msgstr "Editierte Dateien aufteilen"
+ msgid "Replay"
+ msgstr "Wiedergabe"
+
+msgid "Setup.Replay$Jump&Play"
+msgstr "Wiedergabe nach Sprung"
+
@@ -431,10 +445,36 @@
+
+msgid "Setup.Replay$Reload marks"
+msgstr "Marken aktualisieren"
-diff -Naur vdr-1.5.7/recording.c vdr-1.5.7-jumpplay-0.9/recording.c
---- vdr-1.5.7/recording.c 2007-06-17 13:10:12.000000000 +0000
-+++ vdr-1.5.7-jumpplay-0.9/recording.c 2007-08-12 17:51:54.000000000 +0000
-@@ -1114,6 +1114,49 @@
++
+ msgid "Setup.Replay$Multi speed mode"
+ msgstr "Mehrstufiger Vor-/Rücklauf"
+
+diff -Naurp vdr-1.6.0/po/fr_FR.po vdr-1.6.0-jumpplay-1.0/po/fr_FR.po
+--- vdr-1.6.0/po/fr_FR.po 2008-03-23 10:31:29.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/po/fr_FR.po 2009-03-31 00:11:13.000000000 +0000
+@@ -752,6 +752,18 @@ msgstr "Séparer les séquences éditées"
+ msgid "Replay"
+ msgstr "Lecture"
+
++msgid "Setup.Replay$Jump&Play"
++msgstr "Lecture après saut"
++
++msgid "Setup.Replay$Play&Jump"
++msgstr "Saut sur les marques de découpes"
++
++msgid "Setup.Replay$Pause at last mark"
++msgstr "Pause après la dernière marque"
++
++msgid "Setup.Replay$Reload marks"
++msgstr "Actualiser les marques"
++
+ msgid "Setup.Replay$Multi speed mode"
+ msgstr "Mode multi-vitesses"
+
+diff -Naurp vdr-1.6.0/recording.c vdr-1.6.0-jumpplay-1.0/recording.c
+--- vdr-1.6.0/recording.c 2008-02-24 10:28:53.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/recording.c 2009-03-31 00:11:13.000000000 +0000
+@@ -1154,6 +1154,49 @@ cMark *cMarks::GetNext(int Position)
return NULL;
}
@@ -484,10 +524,10 @@
// --- cRecordingUserCommand -------------------------------------------------
const char *cRecordingUserCommand::command = NULL;
-diff -Naur vdr-1.5.7/recording.h vdr-1.5.7-jumpplay-0.9/recording.h
---- vdr-1.5.7/recording.h 2007-06-17 12:53:05.000000000 +0000
-+++ vdr-1.5.7-jumpplay-0.9/recording.h 2007-08-12 17:51:54.000000000 +0000
-@@ -164,6 +164,18 @@
+diff -Naurp vdr-1.6.0/recording.h vdr-1.6.0-jumpplay-1.0/recording.h
+--- vdr-1.6.0/recording.h 2007-10-14 10:11:34.000000000 +0000
++++ vdr-1.6.0-jumpplay-1.0/recording.h 2009-03-31 00:11:13.000000000 +0000
+@@ -170,6 +170,18 @@ public:
cMark *GetNext(int Position);
};
Modified: vdr/vdr/trunk/debian/patches/opt-38_disableDoubleEpgEntrys.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/opt-38_disableDoubleEpgEntrys.dpatch?rev=7584&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/opt-38_disableDoubleEpgEntrys.dpatch (original)
+++ vdr/vdr/trunk/debian/patches/opt-38_disableDoubleEpgEntrys.dpatch Wed Apr 1 16:48:54 2009
@@ -5,17 +5,22 @@
## Thomas Günther <tom at toms-cafe.de>:
## - adapted to VDR-1.5.1
## - adapted to VDR-1.5.7
+## http://toms-cafe.de/vdr/download/vdr-disableDoubleEpgEntrys_0.7.3b-1.5.7.diff
+## Tobias Grimm <tg at e-tobi.net>:
## - added buffer overflow fix from:
## http://vdrportal.de/board/thread.php?postid=683477#post683477
+## Thomas Günther <tom at toms-cafe.de>:
+## - added French language texts (thanks to Michaël Nival)
+## http://toms-cafe.de/vdr/download/vdr-disableDoubleEpgEntrys_0.7.3b-1.6.0.diff
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: This patch suppresses double EPG entries.
@DPATCH@
-diff -Naurp vdr-1.5.13/config.c vdr-1.5.13-disableDoubleEpgEntrys/config.c
---- vdr-1.5.13/config.c 2007-11-25 13:46:27.000000000 +0000
-+++ vdr-1.5.13-disableDoubleEpgEntrys/config.c 2008-01-14 21:33:25.000000000 +0000
-@@ -242,6 +242,10 @@ cSetup::cSetup(void)
+diff -Naurp vdr-1.6.0/config.c vdr-1.6.0-disableDoubleEpgEntrys/config.c
+--- vdr-1.6.0/config.c 2008-02-17 13:39:00.000000000 +0000
++++ vdr-1.6.0-disableDoubleEpgEntrys/config.c 2009-03-29 23:25:00.000000000 +0000
+@@ -241,6 +241,10 @@ cSetup::cSetup(void)
SubtitleFgTransparency = 0;
SubtitleBgTransparency = 0;
EPGLanguages[0] = -1;
@@ -26,7 +31,7 @@
EPGScanTimeout = 5;
EPGBugfixLevel = 3;
EPGLinger = 0;
-@@ -418,6 +422,10 @@ bool cSetup::Parse(const char *Name, con
+@@ -414,6 +418,10 @@ bool cSetup::Parse(const char *Name, con
else if (!strcasecmp(Name, "SubtitleFgTransparency")) SubtitleFgTransparency = atoi(Value);
else if (!strcasecmp(Name, "SubtitleBgTransparency")) SubtitleBgTransparency = atoi(Value);
else if (!strcasecmp(Name, "EPGLanguages")) return ParseLanguages(Value, EPGLanguages);
@@ -37,7 +42,7 @@
else if (!strcasecmp(Name, "EPGScanTimeout")) EPGScanTimeout = atoi(Value);
else if (!strcasecmp(Name, "EPGBugfixLevel")) EPGBugfixLevel = atoi(Value);
else if (!strcasecmp(Name, "EPGLinger")) EPGLinger = atoi(Value);
-@@ -501,6 +509,10 @@ bool cSetup::Save(void)
+@@ -497,6 +505,10 @@ bool cSetup::Save(void)
Store("SubtitleFgTransparency", SubtitleFgTransparency);
Store("SubtitleBgTransparency", SubtitleBgTransparency);
StoreLanguages("EPGLanguages", EPGLanguages);
@@ -48,9 +53,9 @@
Store("EPGScanTimeout", EPGScanTimeout);
Store("EPGBugfixLevel", EPGBugfixLevel);
Store("EPGLinger", EPGLinger);
-diff -Naurp vdr-1.5.13/config.h vdr-1.5.13-disableDoubleEpgEntrys/config.h
---- vdr-1.5.13/config.h 2007-11-25 13:45:48.000000000 +0000
-+++ vdr-1.5.13-disableDoubleEpgEntrys/config.h 2008-01-14 21:33:25.000000000 +0000
+diff -Naurp vdr-1.6.0/config.h vdr-1.6.0-disableDoubleEpgEntrys/config.h
+--- vdr-1.6.0/config.h 2008-03-23 10:26:10.000000000 +0000
++++ vdr-1.6.0-disableDoubleEpgEntrys/config.h 2009-03-29 23:25:00.000000000 +0000
@@ -225,6 +225,10 @@ public:
int SubtitleOffset;
int SubtitleFgTransparency, SubtitleBgTransparency;
@@ -62,9 +67,9 @@
int EPGScanTimeout;
int EPGBugfixLevel;
int EPGLinger;
-diff -Naurp vdr-1.5.13/eit.c vdr-1.5.13-disableDoubleEpgEntrys/eit.c
---- vdr-1.5.13/eit.c 2007-08-26 10:56:33.000000000 +0000
-+++ vdr-1.5.13-disableDoubleEpgEntrys/eit.c 2008-01-14 21:33:50.000000000 +0000
+diff -Naurp vdr-1.6.0/eit.c vdr-1.6.0-disableDoubleEpgEntrys/eit.c
+--- vdr-1.6.0/eit.c 2007-08-26 10:56:33.000000000 +0000
++++ vdr-1.6.0-disableDoubleEpgEntrys/eit.c 2009-03-29 23:25:00.000000000 +0000
@@ -72,7 +72,83 @@ cEIT::cEIT(cSchedules *Schedules, int So
// not be overwritten.
if (pEvent->TableID() == 0x00) {
@@ -240,10 +245,10 @@
}
if (Empty && Tid == 0x4E && getSectionNumber() == 0)
// ETR 211: an empty entry in section 0 of table 0x4E means there is currently no event running
-diff -Naurp vdr-1.5.13/epg.c vdr-1.5.13-disableDoubleEpgEntrys/epg.c
---- vdr-1.5.13/epg.c 2007-06-10 12:52:19.000000000 +0000
-+++ vdr-1.5.13-disableDoubleEpgEntrys/epg.c 2008-01-14 21:33:25.000000000 +0000
-@@ -741,6 +741,29 @@ const cEvent *cSchedule::GetEventAround(
+diff -Naurp vdr-1.6.0/epg.c vdr-1.6.0-disableDoubleEpgEntrys/epg.c
+--- vdr-1.6.0/epg.c 2008-02-16 16:09:12.000000000 +0000
++++ vdr-1.6.0-disableDoubleEpgEntrys/epg.c 2009-03-29 23:25:00.000000000 +0000
+@@ -742,6 +742,29 @@ const cEvent *cSchedule::GetEventAround(
return pe;
}
@@ -273,9 +278,9 @@
void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Channel)
{
hasRunning = false;
-diff -Naurp vdr-1.5.13/epg.h vdr-1.5.13-disableDoubleEpgEntrys/epg.h
---- vdr-1.5.13/epg.h 2006-10-07 13:47:19.000000000 +0000
-+++ vdr-1.5.13-disableDoubleEpgEntrys/epg.h 2008-01-14 21:33:25.000000000 +0000
+diff -Naurp vdr-1.6.0/epg.h vdr-1.6.0-disableDoubleEpgEntrys/epg.h
+--- vdr-1.6.0/epg.h 2006-10-07 13:47:19.000000000 +0000
++++ vdr-1.6.0-disableDoubleEpgEntrys/epg.h 2009-03-29 23:25:00.000000000 +0000
@@ -137,6 +137,7 @@ public:
void DropOutdated(time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
void Cleanup(time_t Time);
@@ -284,10 +289,10 @@
cEvent *AddEvent(cEvent *Event);
void DelEvent(cEvent *Event);
void HashEvent(cEvent *Event);
-diff -Naurp vdr-1.5.13/menu.c vdr-1.5.13-disableDoubleEpgEntrys/menu.c
---- vdr-1.5.13/menu.c 2008-01-13 13:59:33.000000000 +0000
-+++ vdr-1.5.13-disableDoubleEpgEntrys/menu.c 2008-01-14 21:33:25.000000000 +0000
-@@ -2354,6 +2354,10 @@ void cMenuSetupEPG::Setup(void)
+diff -Naurp vdr-1.6.0/menu.c vdr-1.6.0-disableDoubleEpgEntrys/menu.c
+--- vdr-1.6.0/menu.c 2008-03-16 11:15:28.000000000 +0000
++++ vdr-1.6.0-disableDoubleEpgEntrys/menu.c 2009-03-29 23:25:00.000000000 +0000
+@@ -2388,6 +2388,10 @@ void cMenuSetupEPG::Setup(void)
for (int i = 0; i < numLanguages; i++)
// TRANSLATORS: note the singular!
Add(new cMenuEditStraItem(tr("Setup.EPG$Preferred language"), &data.EPGLanguages[i], I18nLanguages()->Size(), &I18nLanguages()->At(0)));
@@ -298,15 +303,13 @@
SetCurrent(Get(current));
Display();
-diff -Naurp vdr-1.5.13/po/de_DE.po vdr-1.5.13-disableDoubleEpgEntrys/po/de_DE.po
---- vdr-1.5.13/po/de_DE.po 2008-01-13 15:06:32.000000000 +0000
-+++ vdr-1.5.13-disableDoubleEpgEntrys/po/de_DE.po 2008-01-14 21:33:25.000000000 +0000
-@@ -552,2 +552,14 @@
--msgid "Button$Scan"
--msgstr "Scan"
-+msgid "Button$Scan"
-+msgstr "Scan"
-+
+diff -Naurp vdr-1.6.0/po/de_DE.po vdr-1.6.0-disableDoubleEpgEntrys/po/de_DE.po
+--- vdr-1.6.0/po/de_DE.po 2008-03-23 10:31:29.000000000 +0000
++++ vdr-1.6.0-disableDoubleEpgEntrys/po/de_DE.po 2009-03-29 23:25:00.000000000 +0000
+@@ -558,6 +558,18 @@ msgstr "EPG"
+ msgid "Button$Scan"
+ msgstr "Scan"
+
+msgid "Setup.EPG$Period for double EPG search(min)"
+msgstr "Zeitspanne für dop. EPG-Suche(min)"
+
@@ -318,3 +321,29 @@
+
+msgid "Setup.EPG$Disable running VPS event"
+msgstr "Erk. des lauf. VPS-Events abschalten"
++
+ msgid "Setup.EPG$EPG scan timeout (h)"
+ msgstr "Zeit bis zur EPG-Aktualisierung (h)"
+
+diff -Naurp vdr-1.6.0/po/fr_FR.po vdr-1.6.0-disableDoubleEpgEntrys/po/fr_FR.po
+--- vdr-1.6.0/po/fr_FR.po 2008-03-23 10:31:29.000000000 +0000
++++ vdr-1.6.0-disableDoubleEpgEntrys/po/fr_FR.po 2009-03-29 23:25:58.000000000 +0000
+@@ -564,6 +564,18 @@ msgstr "Guide des programmes"
+ msgid "Button$Scan"
+ msgstr "Scan"
+
++msgid "Setup.EPG$Period for double EPG search(min)"
++msgstr "Intervalle de recherche du double EPG(min)"
++
++msgid "Setup.EPG$extern double Epg entry"
++msgstr "Entrée EPG externe en double"
++
++msgid "Setup.EPG$Mix intern and extern EPG"
++msgstr "Mixer EPG interne et externe"
++
++msgid "Setup.EPG$Disable running VPS event"
++msgstr "Désactiver événement VPS"
++
+ msgid "Setup.EPG$EPG scan timeout (h)"
+ msgstr "Inactivité avant rech. EPG (h)"
+
More information about the pkg-vdr-dvb-changes
mailing list