r741 - vdr/vdr/trunk/debian/patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Tue, 28 Jun 2005 20:19:05 +0000
Author: tschmidt
Date: 2005-06-28 20:19:04 +0000 (Tue, 28 Jun 2005)
New Revision: 741
Modified:
vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch
vdr/vdr/trunk/debian/patches/opt-24_jumpplay-0.6.dpatch
Log:
vdr: Now using the cmdsubmenu and jumpplay patches from vdrdevel
Modified: vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch 2005-06-28 20:01:38 UTC (rev 740)
+++ vdr/vdr/trunk/debian/patches/03_cmdsubmenu.dpatch 2005-06-28 20:19:04 UTC (rev 741)
@@ -1,15 +1,39 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
-## submenu patch
+## cmdsubmenu patch - version 0.4
##
+## 2003-10-08: Version 0.1 - Albu at vdrportal.de
+## http://vdrportal.de/board/thread.php?threadid=6319
+##
+## 2003-10-09: Version 0.2 - Tobias Grimm <tg@e-tobi.net>
+## Added Define CMD_SUBMENUS in Makefile
+##
+## 2004-05-28: Version 0.3 - Thomas Günther <tom@toms-cafe.de>
+## Fixed compilation with gcc-3.3.3
+## Added new virtual method AddConfig in cConfig
+## Redefining of method Add in cListBase to virtual no longer necessary
+## Improved code in menu.c
+##
+## 2004-12-20: Version 0.4 - Thomas Günther <tom@toms-cafe.de>
+## Solved conflict with jumpplay patch 0.6
+##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Adds submenus within the commands and recording commands menu.
## DP: To create a submenu entry, prefix the name by one ore more "-".
@DPATCH@
-diff -urNad vdr-1.3.23/config.c /tmp/dpep.74bcRU/vdr-1.3.23/config.c
---- vdr-1.3.23/config.c 2005-02-20 13:52:59.000000000 +0100
-+++ /tmp/dpep.74bcRU/vdr-1.3.23/config.c 2005-04-09 21:28:28.912856112 +0200
+--- vdr-1.2.6/Makefile
++++ vdr-1.2.6/Makefile
+@@ -48,6 +48,7 @@
+
+ DEFINES += -DREMOTE_$(REMOTE)
+
++DEFINES += -DCMD_SUBMENUS
+ DEFINES += -D_GNU_SOURCE
+
+ DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+--- vdr-1.2.6/config.c
++++ vdr-1.2.6/config.c
@@ -27,18 +27,29 @@
{
title = command = NULL;
@@ -117,13 +141,12 @@
// -- cSVDRPhost -------------------------------------------------------------
cSVDRPhost::cSVDRPhost(void)
-diff -urNad vdr-1.3.23/config.h /tmp/dpep.74bcRU/vdr-1.3.23/config.h
---- vdr-1.3.23/config.h 2005-03-05 16:44:35.000000000 +0100
-+++ /tmp/dpep.74bcRU/vdr-1.3.23/config.h 2005-04-09 21:28:28.913855960 +0200
-@@ -35,11 +35,15 @@
- #define MaxSkinName 16
- #define MaxThemeName 16
+--- vdr-1.2.6/config.h
++++ vdr-1.2.6/config.h
+@@ -32,11 +32,15 @@
+ #define MaxFileName 256
+
+class cCommands;
+
class cCommand : public cListObject {
@@ -136,7 +159,7 @@
static char *result;
public:
cCommand(void);
-@@ -48,6 +52,12 @@
+@@ -45,6 +49,12 @@
const char *Title(void) { return title; }
bool Confirm(void) { return confirm; }
const char *Execute(const char *Parameters = NULL);
@@ -149,18 +172,18 @@
};
typedef uint32_t in_addr_t; //XXX from /usr/include/netinet/in.h (apparently this is not defined on systems with glibc < 2.2)
-@@ -90,6 +100,10 @@
+@@ -86,6 +96,10 @@
+ public:
cConfig(void) { fileName = NULL; }
virtual ~cConfig() { free(fileName); }
- const char *FileName(void) { return fileName; }
+ virtual void AddConfig(T *Object)
+ {
+ cList<T>::Add(Object);
+ }
+ const char *FileName(void) { return fileName; }
bool Load(const char *FileName = NULL, bool AllowComments = false, bool MustExist = false)
{
- Clear();
-@@ -117,7 +131,7 @@
+@@ -114,7 +128,7 @@
if (!isempty(buffer)) {
T *l = new T;
if (l->Parse(buffer))
@@ -169,7 +192,7 @@
else {
esyslog("ERROR: error in %s, line %d\n", fileName, line);
delete l;
-@@ -159,7 +173,10 @@
+@@ -156,7 +170,10 @@
}
};
@@ -181,21 +204,9 @@
class cSVDRPhosts : public cConfig<cSVDRPhost> {
public:
-diff -urNad vdr-1.3.23/Makefile /tmp/dpep.74bcRU/vdr-1.3.23/Makefile
---- vdr-1.3.23/Makefile 2005-04-09 21:28:28.756879824 +0200
-+++ /tmp/dpep.74bcRU/vdr-1.3.23/Makefile 2005-04-09 21:28:28.912856112 +0200
-@@ -67,6 +67,7 @@
-
- DEFINES += -DREMOTE_$(REMOTE)
-
-+DEFINES += -DCMD_SUBMENUS
- DEFINES += -D_GNU_SOURCE
-
- DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
-diff -urNad vdr-1.3.23/menu.c /tmp/dpep.74bcRU/vdr-1.3.23/menu.c
---- vdr-1.3.23/menu.c 2005-03-20 16:14:51.000000000 +0100
-+++ /tmp/dpep.74bcRU/vdr-1.3.23/menu.c 2005-04-09 21:28:28.914855808 +0200
-@@ -1272,6 +1272,12 @@
+--- vdr-1.2.6/menu.c
++++ vdr-1.2.6/menu.c
+@@ -1518,6 +1518,12 @@
if (command) {
char *buffer = NULL;
bool confirmed = true;
Modified: vdr/vdr/trunk/debian/patches/opt-24_jumpplay-0.6.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/opt-24_jumpplay-0.6.dpatch 2005-06-28 20:01:38 UTC (rev 740)
+++ vdr/vdr/trunk/debian/patches/opt-24_jumpplay-0.6.dpatch 2005-06-28 20:19:04 UTC (rev 741)
@@ -1,14 +1,14 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
-## jumpplay patch - version 0.6 for vdr-1.3.18 - see README.jumpplay for details
+## jumpplay patch - version 0.6 for vdr-1.3.24 - see README.jumpplay for details
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Play after jump to next mark. Automatically jump over commercial breaks.
@DPATCH@
-diff -Naur vdr-1.3.18/README.jumpplay vdr-1.3.18-jumpplay-0.6/README.jumpplay
---- vdr-1.3.18/README.jumpplay 1970-01-01 01:00:00.000000000 +0100
-+++ vdr-1.3.18-jumpplay-0.6/README.jumpplay 2005-01-09 19:47:13.000000000 +0100
+diff -Naur vdr-1.3.24/README.jumpplay vdr-1.3.24-jumpplay-0.6/README.jumpplay
+--- vdr-1.3.24/README.jumpplay 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.3.24-jumpplay-0.6/README.jumpplay 2005-05-09 21:58:00.000000000 +0200
@@ -0,0 +1,89 @@
+JumpPlay patch for VDR
+----------------------
@@ -99,10 +99,10 @@
+ - don't stop after the last mark in case of live-recordings
+ New setup parameter "Load marks interval (s)"
+ Updated description in README.jumpplay
-diff -Naur vdr-1.3.18/config.c vdr-1.3.18-jumpplay-0.6/config.c
---- vdr-1.3.18/config.c 2005-01-09 13:14:58.000000000 +0100
-+++ vdr-1.3.18-jumpplay-0.6/config.c 2005-01-09 19:47:13.000000000 +0100
-@@ -296,6 +296,9 @@
+diff -Naur vdr-1.3.24/config.c vdr-1.3.24-jumpplay-0.6/config.c
+--- vdr-1.3.24/config.c 2005-02-20 13:52:59.000000000 +0100
++++ vdr-1.3.24-jumpplay-0.6/config.c 2005-05-09 21:58:00.000000000 +0200
+@@ -298,6 +298,9 @@
MultiSpeedMode = 0;
ShowReplayMode = 0;
ResumeID = 0;
@@ -112,7 +112,7 @@
CurrentChannel = -1;
CurrentVolume = MAXVOLUME;
CurrentDolby = 0;
-@@ -451,6 +454,9 @@
+@@ -455,6 +458,9 @@
else if (!strcasecmp(Name, "MultiSpeedMode")) MultiSpeedMode = atoi(Value);
else if (!strcasecmp(Name, "ShowReplayMode")) ShowReplayMode = atoi(Value);
else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value);
@@ -122,7 +122,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);
-@@ -513,6 +519,9 @@
+@@ -519,6 +525,9 @@
Store("MultiSpeedMode", MultiSpeedMode);
Store("ShowReplayMode", ShowReplayMode);
Store("ResumeID", ResumeID);
@@ -132,9 +132,9 @@
Store("CurrentChannel", CurrentChannel);
Store("CurrentVolume", CurrentVolume);
Store("CurrentDolby", CurrentDolby);
-diff -Naur vdr-1.3.18/config.h vdr-1.3.18-jumpplay-0.6/config.h
---- vdr-1.3.18/config.h 2005-01-09 13:14:33.000000000 +0100
-+++ vdr-1.3.18-jumpplay-0.6/config.h 2005-01-09 19:47:13.000000000 +0100
+diff -Naur vdr-1.3.24/config.h vdr-1.3.24-jumpplay-0.6/config.h
+--- vdr-1.3.24/config.h 2005-05-05 13:04:18.000000000 +0200
++++ vdr-1.3.24-jumpplay-0.6/config.h 2005-05-09 21:58:00.000000000 +0200
@@ -90,7 +90,7 @@
cConfig(void) { fileName = NULL; }
virtual ~cConfig() { free(fileName); }
@@ -154,7 +154,7 @@
FILE *f = fopen(fileName, "r");
if (f) {
int line = 0;
-@@ -250,6 +251,9 @@
+@@ -252,6 +253,9 @@
int MultiSpeedMode;
int ShowReplayMode;
int ResumeID;
@@ -164,9 +164,9 @@
int CurrentChannel;
int CurrentVolume;
int CurrentDolby;
-diff -Naur vdr-1.3.18/dvbplayer.c vdr-1.3.18-jumpplay-0.6/dvbplayer.c
---- vdr-1.3.18/dvbplayer.c 2004-12-26 12:45:34.000000000 +0100
-+++ vdr-1.3.18-jumpplay-0.6/dvbplayer.c 2005-01-09 20:02:03.000000000 +0100
+diff -Naur vdr-1.3.24/dvbplayer.c vdr-1.3.24-jumpplay-0.6/dvbplayer.c
+--- vdr-1.3.24/dvbplayer.c 2005-05-08 16:52:49.000000000 +0200
++++ vdr-1.3.24-jumpplay-0.6/dvbplayer.c 2005-05-09 21:58:54.000000000 +0200
@@ -183,6 +183,7 @@
cNonBlockingFileReader *nonBlockingFileReader;
cRingBufferFrame *ringBuffer;
@@ -201,7 +201,7 @@
}
cDvbPlayer::~cDvbPlayer()
-@@ -363,11 +365,25 @@
+@@ -365,11 +367,25 @@
uchar *b = NULL;
uchar *p = NULL;
int pc = 0;
@@ -226,8 +226,8 @@
+
nonBlockingFileReader = new cNonBlockingFileReader;
int Length = 0;
-
-@@ -410,6 +426,36 @@
+ bool Sleep = false;
+@@ -417,6 +433,36 @@
uchar FileNumber;
int FileOffset;
readIndex++;
@@ -264,18 +264,18 @@
if (!(index->Get(readIndex, &FileNumber, &FileOffset, NULL, &Length) && NextFile(FileNumber, FileOffset))) {
readIndex = -1;
eof = true;
-@@ -445,6 +491,10 @@
- // Store the frame in the buffer:
+@@ -449,6 +495,10 @@
+ // Store the frame in the buffer:
- if (readFrame) {
-+ if (cutIn) {
-+ cRemux::SetBrokenLink(readFrame->Data(), readFrame->Count());
-+ cutIn = false;
-+ }
- if (ringBuffer->Put(readFrame))
- readFrame = NULL;
- }
-@@ -710,6 +760,11 @@
+ if (readFrame) {
++ if (cutIn) {
++ cRemux::SetBrokenLink(readFrame->Data(), readFrame->Count());
++ cutIn = false;
++ }
+ if (ringBuffer->Put(readFrame))
+ readFrame = NULL;
+ }
+@@ -717,6 +767,11 @@
{
}
@@ -287,9 +287,9 @@
cDvbPlayerControl::~cDvbPlayerControl()
{
Stop();
-diff -Naur vdr-1.3.18/dvbplayer.h vdr-1.3.18-jumpplay-0.6/dvbplayer.h
---- vdr-1.3.18/dvbplayer.h 2002-06-23 12:13:51.000000000 +0200
-+++ vdr-1.3.18-jumpplay-0.6/dvbplayer.h 2005-01-09 19:47:13.000000000 +0100
+diff -Naur vdr-1.3.24/dvbplayer.h vdr-1.3.24-jumpplay-0.6/dvbplayer.h
+--- vdr-1.3.24/dvbplayer.h 2002-06-23 12:13:51.000000000 +0200
++++ vdr-1.3.24-jumpplay-0.6/dvbplayer.h 2005-05-09 21:58:00.000000000 +0200
@@ -20,6 +20,7 @@
cDvbPlayer *player;
public:
@@ -298,10 +298,10 @@
// Sets up a player for the given file.
virtual ~cDvbPlayerControl();
bool Active(void);
-diff -Naur vdr-1.3.18/i18n.c vdr-1.3.18-jumpplay-0.6/i18n.c
---- vdr-1.3.18/i18n.c 2005-01-09 13:17:44.000000000 +0100
-+++ vdr-1.3.18-jumpplay-0.6/i18n.c 2005-01-09 19:47:13.000000000 +0100
-@@ -3703,6 +3703,93 @@
+diff -Naur vdr-1.3.24/i18n.c vdr-1.3.24-jumpplay-0.6/i18n.c
+--- vdr-1.3.24/i18n.c 2005-05-05 15:12:54.000000000 +0200
++++ vdr-1.3.24-jumpplay-0.6/i18n.c 2005-05-09 21:58:00.000000000 +0200
+@@ -3850,6 +3850,93 @@
"Jätkamise ID",
"Genoptagelses ID",
},
@@ -395,10 +395,10 @@
{ "Setup.Miscellaneous$Min. event timeout (min)",
"Mindest Event Pause (min)",
"Najmanjsi cas dogodka (min)",
-diff -Naur vdr-1.3.18/menu.c vdr-1.3.18-jumpplay-0.6/menu.c
---- vdr-1.3.18/menu.c 2005-01-09 14:04:49.000000000 +0100
-+++ vdr-1.3.18-jumpplay-0.6/menu.c 2005-01-09 19:47:13.000000000 +0100
-@@ -2171,6 +2171,9 @@
+diff -Naur vdr-1.3.24/menu.c vdr-1.3.24-jumpplay-0.6/menu.c
+--- vdr-1.3.24/menu.c 2005-03-20 16:14:51.000000000 +0100
++++ vdr-1.3.24-jumpplay-0.6/menu.c 2005-05-09 21:58:00.000000000 +0200
+@@ -2198,6 +2198,9 @@
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));
@@ -408,7 +408,7 @@
}
// --- cMenuSetupMisc --------------------------------------------------------
-@@ -3264,7 +3267,7 @@
+@@ -3293,7 +3296,7 @@
char *cReplayControl::title = NULL;
cReplayControl::cReplayControl(void)
@@ -417,7 +417,7 @@
{
displayReplay = NULL;
visible = modeOnly = shown = displayFrames = false;
-@@ -3274,6 +3277,7 @@
+@@ -3303,6 +3306,7 @@
timeoutShow = 0;
timeSearchActive = false;
marks.Load(fileName);
@@ -425,7 +425,7 @@
cRecording Recording(fileName);
cStatus::MsgReplaying(this, Recording.Name());
}
-@@ -3490,8 +3494,10 @@
+@@ -3519,8 +3523,10 @@
ShowTimed(2);
bool Play, Forward;
int Speed;
@@ -437,7 +437,7 @@
}
marks.Save();
}
-@@ -3503,10 +3509,20 @@
+@@ -3532,10 +3538,20 @@
int Current, Total;
if (GetIndex(Current, Total)) {
cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
@@ -461,7 +461,7 @@
}
}
-@@ -3559,7 +3575,7 @@
+@@ -3588,7 +3604,7 @@
if (!m)
m = marks.GetNext(Current);
if (m) {
@@ -470,7 +470,7 @@
m = marks.Next(m);
if (m) {
Goto(m->position - SecondsToFrames(3));
-@@ -3573,6 +3589,11 @@
+@@ -3602,6 +3618,11 @@
{
if (!Active())
return osEnd;
@@ -482,10 +482,10 @@
if (visible) {
if (timeoutShow && time(NULL) > timeoutShow) {
Hide();
-diff -Naur vdr-1.3.18/menu.h vdr-1.3.18-jumpplay-0.6/menu.h
---- vdr-1.3.18/menu.h 2005-01-08 16:48:57.000000000 +0100
-+++ vdr-1.3.18-jumpplay-0.6/menu.h 2005-01-09 19:47:13.000000000 +0100
-@@ -188,6 +188,7 @@
+diff -Naur vdr-1.3.24/menu.h vdr-1.3.24-jumpplay-0.6/menu.h
+--- vdr-1.3.24/menu.h 2005-03-20 11:57:29.000000000 +0100
++++ vdr-1.3.24-jumpplay-0.6/menu.h 2005-05-09 21:58:00.000000000 +0200
+@@ -187,6 +187,7 @@
bool lastPlay, lastForward;
int lastSpeed;
time_t timeoutShow;
@@ -493,10 +493,10 @@
bool timeSearchActive, timeSearchHide;
int timeSearchTime, timeSearchPos;
void TimeSearchDisplay(void);
-diff -Naur vdr-1.3.18/recording.c vdr-1.3.18-jumpplay-0.6/recording.c
---- vdr-1.3.18/recording.c 2004-12-26 12:55:24.000000000 +0100
-+++ vdr-1.3.18-jumpplay-0.6/recording.c 2005-01-09 19:53:01.000000000 +0100
-@@ -743,9 +743,10 @@
+diff -Naur vdr-1.3.24/recording.c vdr-1.3.24-jumpplay-0.6/recording.c
+--- vdr-1.3.24/recording.c 2005-05-07 17:25:15.000000000 +0200
++++ vdr-1.3.24-jumpplay-0.6/recording.c 2005-05-09 21:58:00.000000000 +0200
+@@ -744,9 +744,10 @@
// --- cMarks ----------------------------------------------------------------
@@ -509,9 +509,9 @@
Sort();
return true;
}
-diff -Naur vdr-1.3.18/recording.h vdr-1.3.18-jumpplay-0.6/recording.h
---- vdr-1.3.18/recording.h 2004-12-26 12:47:35.000000000 +0100
-+++ vdr-1.3.18-jumpplay-0.6/recording.h 2005-01-09 19:47:13.000000000 +0100
+diff -Naur vdr-1.3.24/recording.h vdr-1.3.24-jumpplay-0.6/recording.h
+--- vdr-1.3.24/recording.h 2005-01-16 16:11:31.000000000 +0100
++++ vdr-1.3.24-jumpplay-0.6/recording.h 2005-05-09 21:58:00.000000000 +0200
@@ -98,7 +98,7 @@
class cMarks : public cConfig<cMark> {