[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.27-1_etobi1
etobi
git at e-tobi.net
Sat Mar 31 11:28:11 UTC 2012
The following commit has been merged in the e-tobi branch:
commit 5437a9d86259f1ae59fc40f5fda5cba4c60f130b
Author: etobi <git at e-tobi.net>
Date: Wed Mar 28 20:42:20 2012 +0200
Fixed patches
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 52e936d..23b98ad 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,4 +1,4 @@
-debian/patches/opt-20_liemikuutio.patch:aff4b9cd0a7bef47b0a35c59d735acbd
+debian/patches/opt-20_liemikuutio.patch:a724587fb8d95bca266df8fec67cb71d
debian/patches/opt-27_ttxtsubs.patch:edee4d1927f7e4606d3e177e8b3f392b
debian/patches/12_osdbase-maxitems.patch:2c1da1d095dac066237d77f8dedde68d
debian/patches/16_channels.conf.terr-fix.patch:d8b141b9ffdbb9841625f1671eacd25d
@@ -6,7 +6,7 @@ debian/patches/82_valgrind.patch:02f07d119ac1f7c9112060bdbe105e54
debian/patches/opt-45_yaepg.patch:ebfc90b2ee42a1ed67cc2a033afc7832
debian/patches/04_newplugin.patch:1caa94c8f161b8f5cee8848ad5ed617c
debian/patches/99_ncursesw-include.patch:a0afe2be5c9453ea7c93d6f2abff1e3a
-debian/patches/opt-24_jumpplay.patch:d4c0120d85745d2139c95b06042347a5
+debian/patches/opt-24_jumpplay.patch:0856a9d4433bac830b086cbf18c0682f
debian/patches/opt-41-x_timer-info.patch:9461f18f19577b74d8e5a370a033d792
debian/patches/opt-43-x_recordshowfree.patch:1f5c356e66136ab5ba7c51cd4b196b9a
debian/patches/opt-42-x_MainMenuHooks.patch:648ee497dd3c3ec1ce824cc1442e7d2b
@@ -14,6 +14,6 @@ debian/patches/opt-50_graphtft-liemikuutio.patch:f21935955b6e1ad2ce2d274e84856f6
debian/patches/06_default_svdrp_port_0.patch:961fed0d8413e21265d9d9a75910663b
debian/patches/opt-50_graphtft.patch:4fa3b5b529ab273feee5e0783415c3d1
debian/patches/opt-37-x_menuorg.patch:b9a001ede140f6a155372a351e2b85fc
-debian/patches/opt-22-x_edit_marks.patch:c3ba02b37f27f3a913415819f1d5b200
+debian/patches/opt-22-x_edit_marks.patch:5ec87a8f787d4d74d01fb30abc456958
debian/patches/11_sortrecordings.patch:faf3aa6ba793831039e45090db3ee099
debian/patches/81_Make_config.patch:2c8d5f7511ebaaf156fcf96c3310b290
diff --git a/debian/patches/opt-20_liemikuutio.patch b/debian/patches/opt-20_liemikuutio.patch
index 00c0022..15b5478 100644
--- a/debian/patches/opt-20_liemikuutio.patch
+++ b/debian/patches/opt-20_liemikuutio.patch
@@ -1,11 +1,10 @@
Description: Patch collection - see HISTORY-liemikuutio for details.
Author: Rolf Ahrenberg <Rolf.Ahrenberg AT sci.fi>
-Origin: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.26-liemikuutio-1.34.patch.gz
+Origin: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.27-liemikuutio-1.34.patch.gz
-Index: vdr/config.h
-===================================================================
---- vdr.orig/config.h 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/config.h 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/config.h vdr-1.7.27-liemikuutio/config.h
+--- vdr-1.7.27-vanilla/config.h 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/config.h 2012-03-25 15:20:40.000000000 +0300
@@ -36,6 +36,8 @@
// plugins to work with newer versions of the core VDR as long as no
// VDR header files have changed.
@@ -15,10 +14,9 @@ Index: vdr/config.h
#define MAXPRIORITY 99
#define MINPRIORITY (-MAXPRIORITY)
#define LIVEPRIORITY 0 // priority used when selecting a device for live viewing
-Index: vdr/cutter.c
-===================================================================
---- vdr.orig/cutter.c 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/cutter.c 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/cutter.c vdr-1.7.27-liemikuutio/cutter.c
+--- vdr-1.7.27-vanilla/cutter.c 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/cutter.c 2012-03-25 15:20:41.000000000 +0300
@@ -8,6 +8,7 @@
*/
@@ -56,10 +54,9 @@ Index: vdr/cutter.c
char *e = strrchr(s, '.');
if (e) {
if (strcmp(e, ".rec") == 0) {
-Index: vdr/cutter.h
-===================================================================
---- vdr.orig/cutter.h 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/cutter.h 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/cutter.h vdr-1.7.27-liemikuutio/cutter.h
+--- vdr-1.7.27-vanilla/cutter.h 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/cutter.h 2012-03-25 15:20:41.000000000 +0300
@@ -24,7 +24,7 @@
static bool error;
static bool ended;
@@ -69,10 +66,9 @@ Index: vdr/cutter.h
static void Stop(void);
static bool Active(const char *FileName = NULL);
///< Returns true if the cutter is currently active.
-Index: vdr/filetransfer.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/filetransfer.c 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/filetransfer.c vdr-1.7.27-liemikuutio/filetransfer.c
+--- vdr-1.7.27-vanilla/filetransfer.c 1970-01-01 02:00:00.000000000 +0200
++++ vdr-1.7.27-liemikuutio/filetransfer.c 2012-03-25 15:20:41.000000000 +0300
@@ -0,0 +1,278 @@
+/*
+ * filetransfer.c: The video file transfer facilities
@@ -352,10 +348,9 @@ Index: vdr/filetransfer.c
+ ended = false;
+ return result;
+}
-Index: vdr/filetransfer.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/filetransfer.h 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/filetransfer.h vdr-1.7.27-liemikuutio/filetransfer.h
+--- vdr-1.7.27-vanilla/filetransfer.h 1970-01-01 02:00:00.000000000 +0200
++++ vdr-1.7.27-liemikuutio/filetransfer.h 2012-03-25 15:20:41.000000000 +0300
@@ -0,0 +1,33 @@
+/*
+ * filetransfer.h: The video file transfer facilities
@@ -390,10 +385,9 @@ Index: vdr/filetransfer.h
+ };
+
+#endif //__FILETRANSFER_H
-Index: vdr/HISTORY-liemikuutio
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/HISTORY-liemikuutio 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/HISTORY-liemikuutio vdr-1.7.27-liemikuutio/HISTORY-liemikuutio
+--- vdr-1.7.27-vanilla/HISTORY-liemikuutio 1970-01-01 02:00:00.000000000 +0200
++++ vdr-1.7.27-liemikuutio/HISTORY-liemikuutio 2012-03-25 15:20:41.000000000 +0300
@@ -0,0 +1,165 @@
+-----------------------------------
+Liemikuutio for Video Disc Recorder
@@ -560,10 +554,9 @@ Index: vdr/HISTORY-liemikuutio
+
+- Updated the filetransfer patch.
+- Removed the DVB subtitles hack for old recordings.
-Index: vdr/Makefile
-===================================================================
---- vdr.orig/Makefile 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/Makefile 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/Makefile vdr-1.7.27-liemikuutio/Makefile
+--- vdr-1.7.27-vanilla/Makefile 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/Makefile 2012-03-25 15:20:41.000000000 +0300
@@ -41,8 +41,8 @@
SILIB = $(LSIDIR)/libsi.a
@@ -575,10 +568,9 @@ Index: vdr/Makefile
receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
skinclassic.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
timers.o tools.o transfer.o vdr.o videodir.o
-Index: vdr/menu.c
-===================================================================
---- vdr.orig/menu.c 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/menu.c 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
+--- vdr-1.7.27-vanilla/menu.c 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/menu.c 2012-03-25 15:28:20.000000000 +0300
@@ -18,6 +18,7 @@
#include "config.h"
#include "cutter.h"
@@ -621,7 +613,7 @@ Index: vdr/menu.c
+
+ Add(new cOsdItem("", osUnknown, false));
+
-+ Add(new cOsdItem(cString::sprintf("%s:\t%s", tr("Date"), *DayDateTime(recording->start)), osUnknown, false));
++ Add(new cOsdItem(cString::sprintf("%s:\t%s", tr("Date"), *DayDateTime(recording->Start())), osUnknown, false));
+
+ cChannel *channel = Channels.GetByChannelID(((cRecordingInfo *)recording->Info())->ChannelID());
+ if (channel)
@@ -900,10 +892,9 @@ Index: vdr/menu.c
case kMarkJumpForward|k_Repeat:
case kMarkJumpForward: MarkJump(true); break;
case kMarkMoveBack|k_Repeat:
-Index: vdr/menu.h
-===================================================================
---- vdr.orig/menu.h 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/menu.h 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/menu.h vdr-1.7.27-liemikuutio/menu.h
+--- vdr-1.7.27-vanilla/menu.h 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/menu.h 2012-03-25 15:20:41.000000000 +0300
@@ -101,6 +101,7 @@
bool replaying;
cOsdItem *stopReplayItem;
@@ -930,10 +921,9 @@ Index: vdr/menu.h
time_t timeoutShow;
bool timeSearchActive, timeSearchHide;
int timeSearchTime, timeSearchPos;
-Index: vdr/osdbase.c
-===================================================================
---- vdr.orig/osdbase.c 2012-03-28 20:18:33.000000000 +0200
-+++ vdr/osdbase.c 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/osdbase.c vdr-1.7.27-liemikuutio/osdbase.c
+--- vdr-1.7.27-vanilla/osdbase.c 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/osdbase.c 2012-03-25 15:20:41.000000000 +0300
@@ -78,6 +78,7 @@
{
isMenu = true;
@@ -951,7 +941,7 @@ Index: vdr/osdbase.c
s = buffer;
}
}
-@@ -468,20 +469,60 @@
+@@ -464,20 +465,60 @@
}
}
@@ -1015,7 +1005,7 @@ Index: vdr/osdbase.c
return osContinue;
}
-@@ -520,8 +561,8 @@
+@@ -516,8 +557,8 @@
}
}
switch (int(Key)) {
@@ -1026,10 +1016,9 @@ Index: vdr/osdbase.c
case kUp|k_Repeat:
case kUp: CursorUp(); break;
case kDown|k_Repeat:
-Index: vdr/osdbase.h
-===================================================================
---- vdr.orig/osdbase.h 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/osdbase.h 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/osdbase.h vdr-1.7.27-liemikuutio/osdbase.h
+--- vdr-1.7.27-vanilla/osdbase.h 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/osdbase.h 2012-03-25 15:20:41.000000000 +0300
@@ -30,6 +30,7 @@
osStopRecord,
osStopReplay,
@@ -1047,10 +1036,9 @@ Index: vdr/osdbase.h
void DisplayHelp(bool Force = false);
protected:
void SetDisplayMenu(void);
-Index: vdr/po/de_DE.po
-===================================================================
---- vdr.orig/po/de_DE.po 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/po/de_DE.po 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/po/de_DE.po vdr-1.7.27-liemikuutio/po/de_DE.po
+--- vdr-1.7.27-vanilla/po/de_DE.po 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/po/de_DE.po 2012-03-25 15:20:41.000000000 +0300
@@ -1341,3 +1341,70 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -1122,10 +1110,9 @@ Index: vdr/po/de_DE.po
+
+msgid "File already exists - overwrite?"
+msgstr "Datei besteht bereits - überschreiben?"
-Index: vdr/po/fi_FI.po
-===================================================================
---- vdr.orig/po/fi_FI.po 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/po/fi_FI.po 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/po/fi_FI.po vdr-1.7.27-liemikuutio/po/fi_FI.po
+--- vdr-1.7.27-vanilla/po/fi_FI.po 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/po/fi_FI.po 2012-03-25 15:20:41.000000000 +0300
@@ -1344,3 +1344,70 @@
#, c-format
msgid "VDR will shut down in %s minutes"
@@ -1197,10 +1184,9 @@ Index: vdr/po/fi_FI.po
+
+msgid "File already exists - overwrite?"
+msgstr "Tiedosto on jo olemassa - ylikirjoitetaanko?"
-Index: vdr/recording.c
-===================================================================
---- vdr.orig/recording.c 2012-03-28 20:18:33.000000000 +0200
-+++ vdr/recording.c 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/recording.c vdr-1.7.27-liemikuutio/recording.c
+--- vdr-1.7.27-vanilla/recording.c 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/recording.c 2012-03-25 15:20:41.000000000 +0300
@@ -932,6 +932,16 @@
return NULL;
}
@@ -1236,10 +1222,9 @@ Index: vdr/recording.c
strncpy(ext, DELEXT, strlen(ext));
if (access(recording->FileName(), F_OK) == 0) {
recording->deleted = time(NULL);
-Index: vdr/recording.h
-===================================================================
---- vdr.orig/recording.h 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/recording.h 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/recording.h vdr-1.7.27-liemikuutio/recording.h
+--- vdr-1.7.27-vanilla/recording.h 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/recording.h 2012-03-25 15:20:41.000000000 +0300
@@ -121,6 +121,7 @@
const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const;
const cRecordingInfo *Info(void) const { return info; }
@@ -1257,10 +1242,9 @@ Index: vdr/recording.h
void UpdateByName(const char *FileName);
int TotalFileSizeMB(void);
double MBperMinute(void);
-Index: vdr/shutdown.c
-===================================================================
---- vdr.orig/shutdown.c 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/shutdown.c 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/shutdown.c vdr-1.7.27-liemikuutio/shutdown.c
+--- vdr-1.7.27-vanilla/shutdown.c 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/shutdown.c 2012-03-25 15:20:41.000000000 +0300
@@ -17,6 +17,7 @@
#include "channels.h"
#include "config.h"
@@ -1291,10 +1275,9 @@ Index: vdr/shutdown.c
cTimer *timer = Timers.GetNextActiveTimer();
time_t Next = timer ? timer->StartTime() : 0;
-Index: vdr/svdrp.c
-===================================================================
---- vdr.orig/svdrp.c 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/svdrp.c 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/svdrp.c vdr-1.7.27-liemikuutio/svdrp.c
+--- vdr-1.7.27-vanilla/svdrp.c 2012-03-25 15:17:56.000000000 +0300
++++ vdr-1.7.27-liemikuutio/svdrp.c 2012-03-25 15:20:41.000000000 +0300
@@ -31,6 +31,7 @@
#include "cutter.h"
#include "device.h"
@@ -1409,10 +1392,9 @@ Index: vdr/svdrp.c
else if (CMD("NEWC")) CmdNEWC(s);
else if (CMD("NEWT")) CmdNEWT(s);
else if (CMD("NEXT")) CmdNEXT(s);
-Index: vdr/svdrp.h
-===================================================================
---- vdr.orig/svdrp.h 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/svdrp.h 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/svdrp.h vdr-1.7.27-liemikuutio/svdrp.h
+--- vdr-1.7.27-vanilla/svdrp.h 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/svdrp.h 2012-03-25 15:20:41.000000000 +0300
@@ -56,6 +56,7 @@
void PrintHelpTopics(const char **hp);
void CmdCHAN(const char *Option);
@@ -1429,10 +1411,9 @@ Index: vdr/svdrp.h
void CmdNEWC(const char *Option);
void CmdNEWT(const char *Option);
void CmdNEXT(const char *Option);
-Index: vdr/vdr.c
-===================================================================
---- vdr.orig/vdr.c 2012-03-28 20:18:35.000000000 +0200
-+++ vdr/vdr.c 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/vdr.c vdr-1.7.27-liemikuutio/vdr.c
+--- vdr-1.7.27-vanilla/vdr.c 2012-03-25 15:17:56.000000000 +0300
++++ vdr-1.7.27-liemikuutio/vdr.c 2012-03-25 15:20:41.000000000 +0300
@@ -45,6 +45,7 @@
#include "dvbdevice.h"
#include "eitscan.h"
@@ -1441,7 +1422,7 @@ Index: vdr/vdr.c
#include "i18n.h"
#include "interface.h"
#include "keys.h"
-@@ -1233,6 +1234,12 @@
+@@ -1223,6 +1224,12 @@
else
Skins.Message(mtInfo, tr("Editing process finished"));
}
@@ -1454,7 +1435,7 @@ Index: vdr/vdr.c
}
// SIGHUP shall cause a restart:
-@@ -1248,7 +1255,7 @@
+@@ -1238,7 +1245,7 @@
ShutdownHandler.countdown.Cancel();
}
@@ -1463,7 +1444,7 @@ Index: vdr/vdr.c
// Handle housekeeping tasks
// Shutdown:
-@@ -1295,6 +1302,7 @@
+@@ -1285,6 +1292,7 @@
PluginManager.StopPlugins();
cRecordControls::Shutdown();
@@ -1471,10 +1452,9 @@ Index: vdr/vdr.c
cCutter::Stop();
delete Menu;
cControl::Shutdown();
-Index: vdr/videodir.c
-===================================================================
---- vdr.orig/videodir.c 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/videodir.c 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/videodir.c vdr-1.7.27-liemikuutio/videodir.c
+--- vdr-1.7.27-vanilla/videodir.c 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/videodir.c 2012-03-25 15:20:41.000000000 +0300
@@ -224,6 +224,22 @@
return NULL;
}
@@ -1498,10 +1478,9 @@ Index: vdr/videodir.c
void RemoveEmptyVideoDirectories(void)
{
cVideoDirectory Dir;
-Index: vdr/videodir.h
-===================================================================
---- vdr.orig/videodir.h 2012-03-28 20:18:26.000000000 +0200
-+++ vdr/videodir.h 2012-03-28 20:18:36.000000000 +0200
+diff -Nru vdr-1.7.27-vanilla/videodir.h vdr-1.7.27-liemikuutio/videodir.h
+--- vdr-1.7.27-vanilla/videodir.h 2012-03-25 15:17:57.000000000 +0300
++++ vdr-1.7.27-liemikuutio/videodir.h 2012-03-25 15:20:41.000000000 +0300
@@ -22,6 +22,7 @@
bool VideoFileSpaceAvailable(int SizeMB);
int VideoDiskSpace(int *FreeMB = NULL, int *UsedMB = NULL); // returns the used disk space in percent
diff --git a/debian/patches/opt-22-x_edit_marks.patch b/debian/patches/opt-22-x_edit_marks.patch
index 7f5c2c0..e1dfdfe 100644
--- a/debian/patches/opt-22-x_edit_marks.patch
+++ b/debian/patches/opt-22-x_edit_marks.patch
@@ -6,8 +6,8 @@ Origin: http://vdrportal.de/board/thread.php?postid=718583#post718583
Index: vdr/menu.c
===================================================================
---- vdr.orig/menu.c 2012-03-28 20:18:36.000000000 +0200
-+++ vdr/menu.c 2012-03-28 20:18:36.000000000 +0200
+--- vdr.orig/menu.c 2012-03-28 21:54:07.000000000 +0200
++++ vdr/menu.c 2012-03-28 21:56:26.000000000 +0200
@@ -5048,10 +5048,6 @@
case kGreen: SkipSeconds(-60); break;
case kYellow|k_Repeat:
@@ -19,7 +19,7 @@ Index: vdr/menu.c
case kPrev|k_Repeat:
case kPrev: if (lastSkipTimeout.TimedOut()) {
lastSkipSeconds = REPLAYCONTROLSKIPSECONDS;
-@@ -5079,10 +5075,46 @@
+@@ -5079,10 +5075,48 @@
Stop();
return osEnd;
default: {
@@ -37,9 +37,10 @@ Index: vdr/menu.c
+ displayFrames = true;
+ int p = SkipFrames(-SecondsToFrames(5, FramesPerSecond()));
+ cMark *m2;
-+ if ((m2 = marks.Prev(m)) != NULL && m2->position >= p)
++ if ((m2 = marks.Prev(m)) != NULL && m2->Position() >= p)
+ break;
-+ Goto(m->position = p, true);
++ m->SetPosition(p);
++ Goto(m->Position(), true);
+ marks.Save();
+ }
+ else
@@ -50,9 +51,10 @@ Index: vdr/menu.c
+ displayFrames = true;
+ int p = SkipFrames(SecondsToFrames(5, FramesPerSecond()));
+ cMark *m2;
-+ if ((m2 = marks.Next(m)) != NULL && m2->position <= p)
++ if ((m2 = marks.Next(m)) != NULL && m2->Position() <= p)
+ break;
-+ Goto(m->position = p, true);
++ m->SetPosition(p);
++ Goto(m->Position(), true);
+ marks.Save();
+ }
+ else
diff --git a/debian/patches/opt-24_jumpplay.patch b/debian/patches/opt-24_jumpplay.patch
index d2df471..a516e00 100644
--- a/debian/patches/opt-24_jumpplay.patch
+++ b/debian/patches/opt-24_jumpplay.patch
@@ -215,7 +215,7 @@ Index: vdr/dvbplayer.c
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) <= int(round(RESUMEBACKUP * framesPerSecond)))
++ abs(Index - marks.First()->Position()) <= int(round(RESUMEBACKUP * framesPerSecond)))
+ Index = 0;
Index -= int(round(RESUMEBACKUP * framesPerSecond));
if (Index > 0)
@@ -232,7 +232,7 @@ Index: vdr/dvbplayer.c
isyslog("resuming replay at index %d (%s)", readIndex, *IndexToHMSF(readIndex, true, framesPerSecond));
+ if (Setup.PlayJump && readIndex <= 0 && marks.First() && index) {
-+ int Index = marks.First()->position;
++ int Index = marks.First()->Position();
+ uint16_t FileNumber;
+ off_t FileOffset;
+ if (index->Get(Index, &FileNumber, &FileOffset) &&
@@ -269,7 +269,7 @@ Index: vdr/dvbplayer.c
+ m = marks.Next(m);
+ int Index;
+ if (m)
-+ Index = m->position;
++ Index = m->Position();
+ else if (Setup.PauseLastMark) {
+ // pause at last mark
+ isyslog("PauseLastMark: pause at position %d (%s)",
@@ -365,12 +365,12 @@ Index: vdr/menu.c
+ bool Play2, Forward2;
+ int Speed;
+ if (Setup.JumpPlay && GetReplayMode(Play2, Forward2, Speed) &&
-+ Play2 && Forward && m->position < Total - SecondsToFrames(3, FramesPerSecond())) {
-+ Goto(m->position);
++ Play2 && Forward && m->Position() < Total - SecondsToFrames(3, FramesPerSecond())) {
++ Goto(m->Position());
+ Play();
+ }
+ else {
-+ Goto(m->position, true);
++ Goto(m->Position(), true);
+ displayFrames = true;
+ }
}
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list