[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.27-2_etobi2-13-g2810347
etobi
git at e-tobi.net
Wed Jun 6 21:19:06 UTC 2012
The following commit has been merged in the e-tobi branch:
commit 2ef79edb430049bd5f1421a60027464a2d058108
Author: etobi <git at e-tobi.net>
Date: Wed Jun 6 23:09:38 2012 +0200
Updated patches, dropped opt-43-x_recordshowfree.patch
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 8211e85..e919572 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,4 +1,4 @@
-debian/patches/opt-20_liemikuutio.patch:a724587fb8d95bca266df8fec67cb71d
+debian/patches/opt-20_liemikuutio.patch:0623db6ca26f22d370ed76ac6d33c32b
debian/patches/opt-27_ttxtsubs.patch:edee4d1927f7e4606d3e177e8b3f392b
debian/patches/12_osdbase-maxitems.patch:2c1da1d095dac066237d77f8dedde68d
debian/patches/16_channels.conf.terr-fix.patch:d8b141b9ffdbb9841625f1671eacd25d
@@ -9,11 +9,10 @@ debian/patches/04_newplugin.patch:1caa94c8f161b8f5cee8848ad5ed617c
debian/patches/99_ncursesw-include.patch:202634ae3e5d18b35edd5d04d2390e01
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
debian/patches/fix-no-hddvbdevice-segfault.patch:51fca90c1a05d8ddfa6a8988c11be6f2
debian/patches/06_default_svdrp_port_0.patch:961fed0d8413e21265d9d9a75910663b
-debian/patches/opt-50_graphtft.patch:4fa3b5b529ab273feee5e0783415c3d1
+debian/patches/opt-50_graphtft.patch:f8a96457c65a5cb3893b0f9425eb26d9
debian/patches/opt-37-x_menuorg.patch:b9a001ede140f6a155372a351e2b85fc
debian/patches/opt-22-x_edit_marks.patch:5ec87a8f787d4d74d01fb30abc456958
debian/patches/11_sortrecordings.patch:faf3aa6ba793831039e45090db3ee099
diff --git a/debian/changelog b/debian/changelog
index b651c36..91e26d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ vdr (1.7.28-1~etobi1) unstable; urgency=low
* Added fix-no-hddvbdevice-segfault.patch to avoid a segfault when the
dvbhddevice plugin is installed but no full featured HD DVB card is
available (Closes: #674441)
+ * Updated patches, dropped opt-43-x_recordshowfree.patch
-- Tobias Grimm <etobi at debian.org> Wed, 06 Jun 2012 17:57:29 +0200
diff --git a/debian/patches/opt-20_liemikuutio.patch b/debian/patches/opt-20_liemikuutio.patch
index 15b5478..cb55526 100644
--- a/debian/patches/opt-20_liemikuutio.patch
+++ b/debian/patches/opt-20_liemikuutio.patch
@@ -2,9 +2,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.27-liemikuutio-1.34.patch.gz
-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
+Index: vdr/config.h
+===================================================================
+--- vdr.orig/config.h 2012-06-06 21:30:58.000000000 +0200
++++ vdr/config.h 2012-06-06 22:47:49.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.
@@ -14,9 +15,10 @@ diff -Nru vdr-1.7.27-vanilla/config.h vdr-1.7.27-liemikuutio/config.h
#define MAXPRIORITY 99
#define MINPRIORITY (-MAXPRIORITY)
#define LIVEPRIORITY 0 // priority used when selecting a device for live viewing
-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
+Index: vdr/cutter.c
+===================================================================
+--- vdr.orig/cutter.c 2012-06-06 21:30:58.000000000 +0200
++++ vdr/cutter.c 2012-06-06 22:47:49.000000000 +0200
@@ -8,6 +8,7 @@
*/
@@ -54,9 +56,10 @@ diff -Nru vdr-1.7.27-vanilla/cutter.c vdr-1.7.27-liemikuutio/cutter.c
char *e = strrchr(s, '.');
if (e) {
if (strcmp(e, ".rec") == 0) {
-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
+Index: vdr/cutter.h
+===================================================================
+--- vdr.orig/cutter.h 2012-04-26 21:27:38.000000000 +0200
++++ vdr/cutter.h 2012-06-06 22:47:49.000000000 +0200
@@ -24,7 +24,7 @@
static bool error;
static bool ended;
@@ -66,9 +69,10 @@ diff -Nru vdr-1.7.27-vanilla/cutter.h vdr-1.7.27-liemikuutio/cutter.h
static void Stop(void);
static bool Active(const char *FileName = NULL);
///< Returns true if the cutter is currently active.
-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
+Index: vdr/filetransfer.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr/filetransfer.c 2012-06-06 22:47:49.000000000 +0200
@@ -0,0 +1,278 @@
+/*
+ * filetransfer.c: The video file transfer facilities
@@ -348,9 +352,10 @@ diff -Nru vdr-1.7.27-vanilla/filetransfer.c vdr-1.7.27-liemikuutio/filetransfer.
+ ended = false;
+ return result;
+}
-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
+Index: vdr/filetransfer.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr/filetransfer.h 2012-06-06 22:47:49.000000000 +0200
@@ -0,0 +1,33 @@
+/*
+ * filetransfer.h: The video file transfer facilities
@@ -385,9 +390,10 @@ diff -Nru vdr-1.7.27-vanilla/filetransfer.h vdr-1.7.27-liemikuutio/filetransfer.
+ };
+
+#endif //__FILETRANSFER_H
-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
+Index: vdr/HISTORY-liemikuutio
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vdr/HISTORY-liemikuutio 2012-06-06 22:47:49.000000000 +0200
@@ -0,0 +1,165 @@
+-----------------------------------
+Liemikuutio for Video Disc Recorder
@@ -554,9 +560,10 @@ diff -Nru vdr-1.7.27-vanilla/HISTORY-liemikuutio vdr-1.7.27-liemikuutio/HISTORY-
+
+- Updated the filetransfer patch.
+- Removed the DVB subtitles hack for old recordings.
-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
+Index: vdr/Makefile
+===================================================================
+--- vdr.orig/Makefile 2012-06-06 21:30:58.000000000 +0200
++++ vdr/Makefile 2012-06-06 22:47:49.000000000 +0200
@@ -41,8 +41,8 @@
SILIB = $(LSIDIR)/libsi.a
@@ -566,11 +573,12 @@ diff -Nru vdr-1.7.27-vanilla/Makefile vdr-1.7.27-liemikuutio/Makefile
+ dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filetransfer.o filter.o font.o i18n.o\
+ interface.o keys.o lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\
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\
+ skinclassic.o skinlcars.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
-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
+Index: vdr/menu.c
+===================================================================
+--- vdr.orig/menu.c 2012-06-06 21:30:58.000000000 +0200
++++ vdr/menu.c 2012-06-06 22:47:49.000000000 +0200
@@ -18,6 +18,7 @@
#include "config.h"
#include "cutter.h"
@@ -579,7 +587,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
#include "i18n.h"
#include "interface.h"
#include "plugin.h"
-@@ -2207,6 +2208,167 @@
+@@ -2180,6 +2181,167 @@
SetText(cString::sprintf("%d\t\t%d\t%s", totalEntries, newEntries, name));
}
@@ -747,7 +755,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
// --- cMenuRecordings -------------------------------------------------------
cMenuRecordings::cMenuRecordings(const char *Base, int Level, bool OpenSubMenus)
-@@ -2455,6 +2617,19 @@
+@@ -2417,6 +2579,19 @@
return osContinue;
}
@@ -767,7 +775,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
eOSState cMenuRecordings::ProcessKey(eKeys Key)
{
bool HadSubMenu = HasSubMenu();
-@@ -2469,6 +2644,7 @@
+@@ -2431,6 +2606,7 @@
case kYellow: return Delete();
case kInfo:
case kBlue: return Info();
@@ -775,7 +783,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
case k1...k9: return Commands(Key);
case kNone: if (Recordings.StateChanged(recordingsState))
Set(true);
-@@ -3329,6 +3505,7 @@
+@@ -3300,6 +3476,7 @@
replaying = false;
stopReplayItem = NULL;
cancelEditingItem = NULL;
@@ -783,7 +791,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
stopRecordingItem = NULL;
recordControlsState = 0;
Set();
-@@ -3430,6 +3607,19 @@
+@@ -3394,6 +3571,19 @@
result = true;
}
@@ -803,7 +811,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
// Record control:
if (cRecordControls::StateChanged(recordControlsState)) {
while (stopRecordingItem) {
-@@ -3478,6 +3668,12 @@
+@@ -3442,6 +3632,12 @@
return osEnd;
}
break;
@@ -816,7 +824,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
case osPlugin: {
cMenuPluginItem *item = (cMenuPluginItem *)Get(Current());
if (item) {
-@@ -4428,6 +4624,10 @@
+@@ -4401,6 +4597,10 @@
// --- cReplayControl --------------------------------------------------------
@@ -825,9 +833,9 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
+#define REPLAYCONTROLSKIPTIMEOUT 5000 // ms
+
cReplayControl *cReplayControl::currentReplayControl = NULL;
- char *cReplayControl::fileName = NULL;
- char *cReplayControl::title = NULL;
-@@ -4441,6 +4641,9 @@
+ cString cReplayControl::fileName;
+
+@@ -4413,6 +4613,9 @@
lastCurrent = lastTotal = -1;
lastPlay = lastForward = false;
lastSpeed = -2; // an invalid value
@@ -837,7 +845,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
timeoutShow = 0;
timeSearchActive = false;
cRecording Recording(fileName);
-@@ -4763,7 +4966,7 @@
+@@ -4732,7 +4935,7 @@
if (!cCutter::Active()) {
if (!marks.Count())
Skins.Message(mtError, tr("No editing marks defined!"));
@@ -846,7 +854,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
Skins.Message(mtError, tr("Can't start editing process!"));
else
Skins.Message(mtInfo, tr("Editing process started"));
-@@ -4845,6 +5048,32 @@
+@@ -4821,6 +5024,32 @@
case kGreen: SkipSeconds(-60); break;
case kYellow|k_Repeat:
case kYellow: SkipSeconds( 60); break;
@@ -879,7 +887,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
case kStop:
case kBlue: Hide();
Stop();
-@@ -4854,12 +5083,8 @@
+@@ -4830,12 +5059,8 @@
switch (int(Key)) {
// Editing:
case kMarkToggle: MarkToggle(); break;
@@ -892,9 +900,10 @@ diff -Nru vdr-1.7.27-vanilla/menu.c vdr-1.7.27-liemikuutio/menu.c
case kMarkJumpForward|k_Repeat:
case kMarkJumpForward: MarkJump(true); break;
case kMarkMoveBack|k_Repeat:
-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
+Index: vdr/menu.h
+===================================================================
+--- vdr.orig/menu.h 2012-06-06 21:30:58.000000000 +0200
++++ vdr/menu.h 2012-06-06 22:47:49.000000000 +0200
@@ -101,6 +101,7 @@
bool replaying;
cOsdItem *stopReplayItem;
@@ -903,7 +912,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.h vdr-1.7.27-liemikuutio/menu.h
cOsdItem *stopRecordingItem;
int recordControlsState;
static cOsdObject *pluginOsdObject;
-@@ -205,6 +206,7 @@
+@@ -204,6 +205,7 @@
eOSState Delete(void);
eOSState Info(void);
eOSState Commands(eKeys Key = kNone);
@@ -911,7 +920,7 @@ diff -Nru vdr-1.7.27-vanilla/menu.h vdr-1.7.27-liemikuutio/menu.h
protected:
cRecording *GetRecording(cMenuRecordingItem *Item);
public:
-@@ -259,6 +261,9 @@
+@@ -261,6 +263,9 @@
int lastCurrent, lastTotal;
bool lastPlay, lastForward;
int lastSpeed;
@@ -921,18 +930,19 @@ diff -Nru vdr-1.7.27-vanilla/menu.h vdr-1.7.27-liemikuutio/menu.h
time_t timeoutShow;
bool timeSearchActive, timeSearchHide;
int timeSearchTime, timeSearchPos;
-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 @@
+Index: vdr/osdbase.c
+===================================================================
+--- vdr.orig/osdbase.c 2012-06-06 22:47:37.000000000 +0200
++++ vdr/osdbase.c 2012-06-06 22:47:49.000000000 +0200
+@@ -77,6 +77,7 @@
{
isMenu = true;
digit = 0;
+ key_nr = -1;
hasHotkeys = false;
+ displayMenuItems = 0;
title = NULL;
- SetTitle(Title);
-@@ -121,7 +122,7 @@
+@@ -126,7 +127,7 @@
digit = -1; // prevents automatic hotkeys - input already has them
if (digit >= 0) {
digit++;
@@ -941,7 +951,7 @@ diff -Nru vdr-1.7.27-vanilla/osdbase.c vdr-1.7.27-liemikuutio/osdbase.c
s = buffer;
}
}
-@@ -464,20 +465,60 @@
+@@ -476,20 +477,60 @@
}
}
@@ -1005,7 +1015,7 @@ diff -Nru vdr-1.7.27-vanilla/osdbase.c vdr-1.7.27-liemikuutio/osdbase.c
return osContinue;
}
-@@ -516,8 +557,8 @@
+@@ -528,8 +569,8 @@
}
}
switch (int(Key)) {
@@ -1016,9 +1026,10 @@ diff -Nru vdr-1.7.27-vanilla/osdbase.c vdr-1.7.27-liemikuutio/osdbase.c
case kUp|k_Repeat:
case kUp: CursorUp(); break;
case kDown|k_Repeat:
-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
+Index: vdr/osdbase.h
+===================================================================
+--- vdr.orig/osdbase.h 2012-06-06 21:30:58.000000000 +0200
++++ vdr/osdbase.h 2012-06-06 22:47:49.000000000 +0200
@@ -30,6 +30,7 @@
osStopRecord,
osStopReplay,
@@ -1027,7 +1038,7 @@ diff -Nru vdr-1.7.27-vanilla/osdbase.h vdr-1.7.27-liemikuutio/osdbase.h
osSwitchDvb,
osBack,
osEnd,
-@@ -96,6 +97,8 @@
+@@ -97,6 +98,8 @@
char *status;
int digit;
bool hasHotkeys;
@@ -1036,34 +1047,35 @@ diff -Nru vdr-1.7.27-vanilla/osdbase.h vdr-1.7.27-liemikuutio/osdbase.h
void DisplayHelp(bool Force = false);
protected:
void SetDisplayMenu(void);
-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"
- msgstr "VDR wird in %s Minuten abgeschaltet"
+Index: vdr/po/de_DE.po
+===================================================================
+--- vdr.orig/po/de_DE.po 2012-06-06 21:30:58.000000000 +0200
++++ vdr/po/de_DE.po 2012-06-06 22:49:54.000000000 +0200
+@@ -1359,3 +1359,70 @@
+
+ msgid "free"
+ msgstr "frei"
+
+msgid "Edit recording"
-+msgstr "Aufnahme bearbeiten"
++msgstr "Muokkaa tallennetta"
+
+msgid "Button$Cut"
-+msgstr "Schneiden"
++msgstr "Leikkaa"
+
+msgid "Button$Copy"
-+msgstr "Kopieren"
++msgstr "Kopioi"
+
+msgid "Button$Rename/Move"
-+msgstr "Umbenennen/Bewegen"
++msgstr "Nimeä/Siirrä"
+
+msgid "Date"
-+msgstr "Datum"
++msgstr "Päiväys"
+
+msgid "Length"
-+msgstr "Länge"
++msgstr "Pituus"
+
+msgid "Format"
-+msgstr "Format"
++msgstr "Tiedostomuoto"
+
+msgid "PES"
+msgstr "PES"
@@ -1072,51 +1084,52 @@ diff -Nru vdr-1.7.27-vanilla/po/de_DE.po vdr-1.7.27-liemikuutio/po/de_DE.po
+msgstr "TS"
+
+msgid "Size"
-+msgstr "Größe"
++msgstr "Koko"
+
+msgid "Delete marks information?"
-+msgstr "Gespeicherte Schnittmarken löschen?"
++msgstr "Poista tallenteen merkinnät?"
+
+msgid "Delete resume information?"
-+msgstr "Gespeicherten Zeitpunkt der letzten Wiedergabe löschen?"
++msgstr "Poista tallenteen paluutiedot?"
+
+msgid "File transfer started"
-+msgstr "Dateiübertragung gestartet"
++msgstr "Tiedoston siirto aloitettu"
+
+msgid "Can't start file transfer!"
-+msgstr "Dateiübertragung kann nicht gestartet werden!"
++msgstr "Tiedoston siirron aloitus epäonnistui!"
+
+msgid "File transfer already active!"
-+msgstr "Dateiübertragung bereits aktiv!"
++msgstr "Tiedoston siirto on jo käynnissä!"
+
+#. TRANSLATORS: note the leading blank!
+msgid " Cancel file transfer"
-+msgstr " Dateiübertragung beenden"
++msgstr " Peru tiedoston siirto"
+
+msgid "Cancel file transfer?"
-+msgstr "Dateiübertragung beenden?"
++msgstr "Perutaanko tiedoston siirto?"
+
+msgid "Transfering file - shut down anyway?"
-+msgstr "Übertrage Datei - trotzdem ausschalten?"
++msgstr "Tiedoston siirto kesken - sammutetaanko?"
+
+msgid "Transfering file - restart anyway?"
-+msgstr "Übertrage Datei - trotzdem neustarten?"
++msgstr "Tiedoston siirto kesken - käynnistetäänkö uudelleen?"
+
+msgid "File transfer failed!"
-+msgstr "Dateiübertragung fehlgeschlagen!"
++msgstr "Tiedoston siirto epäonnistui!"
+
+msgid "File transfer finished"
-+msgstr "Dateiübertragung fertiggestellt"
++msgstr "Tiedoston siirto valmis"
+
+msgid "File already exists - overwrite?"
-+msgstr "Datei besteht bereits - überschreiben?"
-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"
- msgstr "VDR sammuu %s minuutin kuluttua"
++msgstr "Tiedosto on jo olemassa - ylikirjoitetaanko?"
+Index: vdr/po/fi_FI.po
+===================================================================
+--- vdr.orig/po/fi_FI.po 2012-06-06 21:30:58.000000000 +0200
++++ vdr/po/fi_FI.po 2012-06-06 22:50:29.000000000 +0200
+@@ -1362,3 +1362,70 @@
+
+ msgid "free"
+ msgstr "vapaana"
+
+msgid "Edit recording"
+msgstr "Muokkaa tallennetta"
@@ -1184,10 +1197,11 @@ diff -Nru vdr-1.7.27-vanilla/po/fi_FI.po vdr-1.7.27-liemikuutio/po/fi_FI.po
+
+msgid "File already exists - overwrite?"
+msgstr "Tiedosto on jo olemassa - ylikirjoitetaanko?"
-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 @@
+Index: vdr/recording.c
+===================================================================
+--- vdr.orig/recording.c 2012-06-06 22:47:37.000000000 +0200
++++ vdr/recording.c 2012-06-06 22:47:49.000000000 +0200
+@@ -936,6 +936,16 @@
return NULL;
}
@@ -1204,7 +1218,7 @@ diff -Nru vdr-1.7.27-vanilla/recording.c vdr-1.7.27-liemikuutio/recording.c
int cRecording::HierarchyLevels(void) const
{
const char *s = name;
-@@ -1215,7 +1225,7 @@
+@@ -1226,7 +1236,7 @@
}
}
@@ -1213,7 +1227,7 @@ diff -Nru vdr-1.7.27-vanilla/recording.c vdr-1.7.27-liemikuutio/recording.c
{
LOCK_THREAD;
cRecording *recording = GetByName(FileName);
-@@ -1223,7 +1233,7 @@
+@@ -1234,7 +1244,7 @@
cThreadLock DeletedRecordingsLock(&DeletedRecordings);
Del(recording, false);
char *ext = strrchr(recording->fileName, '.');
@@ -1222,10 +1236,11 @@ diff -Nru vdr-1.7.27-vanilla/recording.c vdr-1.7.27-liemikuutio/recording.c
strncpy(ext, DELEXT, strlen(ext));
if (access(recording->FileName(), F_OK) == 0) {
recording->deleted = time(NULL);
-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 @@
+Index: vdr/recording.h
+===================================================================
+--- vdr.orig/recording.h 2012-06-06 21:30:58.000000000 +0200
++++ vdr/recording.h 2012-06-06 22:47:49.000000000 +0200
+@@ -117,6 +117,7 @@
const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const;
const cRecordingInfo *Info(void) const { return info; }
const char *PrefixFileName(char Prefix);
@@ -1233,7 +1248,7 @@ diff -Nru vdr-1.7.27-vanilla/recording.h vdr-1.7.27-liemikuutio/recording.h
int HierarchyLevels(void) const;
void ResetResume(void) const;
double FramesPerSecond(void) const { return framesPerSecond; }
-@@ -191,7 +192,7 @@
+@@ -188,7 +189,7 @@
void ResetResume(const char *ResumeFileName = NULL);
cRecording *GetByName(const char *FileName);
void AddByName(const char *FileName, bool TriggerUpdate = true);
@@ -1242,9 +1257,10 @@ diff -Nru vdr-1.7.27-vanilla/recording.h vdr-1.7.27-liemikuutio/recording.h
void UpdateByName(const char *FileName);
int TotalFileSizeMB(void);
double MBperMinute(void);
-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
+Index: vdr/shutdown.c
+===================================================================
+--- vdr.orig/shutdown.c 2012-03-28 21:56:44.000000000 +0200
++++ vdr/shutdown.c 2012-06-06 22:47:49.000000000 +0200
@@ -17,6 +17,7 @@
#include "channels.h"
#include "config.h"
@@ -1275,9 +1291,10 @@ diff -Nru vdr-1.7.27-vanilla/shutdown.c vdr-1.7.27-liemikuutio/shutdown.c
cTimer *timer = Timers.GetNextActiveTimer();
time_t Next = timer ? timer->StartTime() : 0;
-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
+Index: vdr/svdrp.c
+===================================================================
+--- vdr.orig/svdrp.c 2012-06-06 21:30:58.000000000 +0200
++++ vdr/svdrp.c 2012-06-06 22:47:49.000000000 +0200
@@ -31,6 +31,7 @@
#include "cutter.h"
#include "device.h"
@@ -1392,9 +1409,10 @@ diff -Nru vdr-1.7.27-vanilla/svdrp.c vdr-1.7.27-liemikuutio/svdrp.c
else if (CMD("NEWC")) CmdNEWC(s);
else if (CMD("NEWT")) CmdNEWT(s);
else if (CMD("NEXT")) CmdNEXT(s);
-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
+Index: vdr/svdrp.h
+===================================================================
+--- vdr.orig/svdrp.h 2012-06-06 21:30:58.000000000 +0200
++++ vdr/svdrp.h 2012-06-06 22:47:49.000000000 +0200
@@ -56,6 +56,7 @@
void PrintHelpTopics(const char **hp);
void CmdCHAN(const char *Option);
@@ -1411,9 +1429,10 @@ diff -Nru vdr-1.7.27-vanilla/svdrp.h vdr-1.7.27-liemikuutio/svdrp.h
void CmdNEWC(const char *Option);
void CmdNEWT(const char *Option);
void CmdNEXT(const char *Option);
-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
+Index: vdr/vdr.c
+===================================================================
+--- vdr.orig/vdr.c 2012-06-06 22:47:37.000000000 +0200
++++ vdr/vdr.c 2012-06-06 22:47:49.000000000 +0200
@@ -45,6 +45,7 @@
#include "dvbdevice.h"
#include "eitscan.h"
@@ -1422,7 +1441,7 @@ diff -Nru vdr-1.7.27-vanilla/vdr.c vdr-1.7.27-liemikuutio/vdr.c
#include "i18n.h"
#include "interface.h"
#include "keys.h"
-@@ -1223,6 +1224,12 @@
+@@ -1235,6 +1236,12 @@
else
Skins.Message(mtInfo, tr("Editing process finished"));
}
@@ -1435,7 +1454,7 @@ diff -Nru vdr-1.7.27-vanilla/vdr.c vdr-1.7.27-liemikuutio/vdr.c
}
// SIGHUP shall cause a restart:
-@@ -1238,7 +1245,7 @@
+@@ -1250,7 +1257,7 @@
ShutdownHandler.countdown.Cancel();
}
@@ -1444,7 +1463,7 @@ diff -Nru vdr-1.7.27-vanilla/vdr.c vdr-1.7.27-liemikuutio/vdr.c
// Handle housekeeping tasks
// Shutdown:
-@@ -1285,6 +1292,7 @@
+@@ -1297,6 +1304,7 @@
PluginManager.StopPlugins();
cRecordControls::Shutdown();
@@ -1452,9 +1471,10 @@ diff -Nru vdr-1.7.27-vanilla/vdr.c vdr-1.7.27-liemikuutio/vdr.c
cCutter::Stop();
delete Menu;
cControl::Shutdown();
-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
+Index: vdr/videodir.c
+===================================================================
+--- vdr.orig/videodir.c 2012-06-06 21:30:58.000000000 +0200
++++ vdr/videodir.c 2012-06-06 22:47:49.000000000 +0200
@@ -224,6 +224,22 @@
return NULL;
}
@@ -1478,9 +1498,10 @@ diff -Nru vdr-1.7.27-vanilla/videodir.c vdr-1.7.27-liemikuutio/videodir.c
void RemoveEmptyVideoDirectories(void)
{
cVideoDirectory Dir;
-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
+Index: vdr/videodir.h
+===================================================================
+--- vdr.orig/videodir.h 2012-06-06 21:30:58.000000000 +0200
++++ vdr/videodir.h 2012-06-06 22:47:49.000000000 +0200
@@ -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-43-x_recordshowfree.patch b/debian/patches/opt-43-x_recordshowfree.patch
deleted file mode 100644
index 092b34d..0000000
--- a/debian/patches/opt-43-x_recordshowfree.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Shows remaining recording capacity in recordings menu.
- (Requires timer-info patch)
-Author: Walter Koch <koch at u32.de>
-
-Index: vdr/menu.c
-===================================================================
---- vdr.orig/menu.c 2012-03-28 20:18:39.000000000 +0200
-+++ vdr/menu.c 2012-03-28 20:18:40.000000000 +0200
-@@ -2594,6 +2594,19 @@
- }
- }
- free(LastItemText);
-+
-+//kw
-+ char *buffer = NULL;
-+ int FreeMB;
-+ int Percent = VideoDiskSpace(&FreeMB);
-+ int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
-+ int Hours = Minutes / 60;
-+ Minutes %= 60;
-+ asprintf(&buffer, "%s %d%% %2d:%02d %s (%.1f GB)", tr("Disk"), Percent, Hours, Minutes, tr("free"), FreeMB / 1024.0 );
-+ SetTitle(buffer);
-+ free(buffer);
-+//kw
-+
- Refresh |= SetFreeDiskDisplay(Refresh);
- if (Refresh)
- Display();
diff --git a/debian/patches/opt-50_graphtft.patch b/debian/patches/opt-50_graphtft.patch
index 3d94c50..f229485 100644
--- a/debian/patches/opt-50_graphtft.patch
+++ b/debian/patches/opt-50_graphtft.patch
@@ -4,9 +4,9 @@ Origin: https://vdr-graphtft.svn.sourceforge.net/svnroot/vdr-graphtft
Index: vdr/menu.c
===================================================================
---- vdr.orig/menu.c 2012-03-28 20:18:40.000000000 +0200
-+++ vdr/menu.c 2012-03-28 20:18:42.000000000 +0200
-@@ -210,6 +210,7 @@
+--- vdr.orig/menu.c 2012-06-06 23:02:31.000000000 +0200
++++ vdr/menu.c 2012-06-06 23:02:39.000000000 +0200
+@@ -169,6 +169,7 @@
public:
cMenuEditChannel(cChannel *Channel, bool New = false);
virtual eOSState ProcessKey(eKeys Key);
@@ -14,7 +14,7 @@ Index: vdr/menu.c
};
cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
-@@ -387,6 +388,7 @@
+@@ -347,6 +348,7 @@
cMenuChannels(void);
~cMenuChannels();
virtual eOSState ProcessKey(eKeys Key);
@@ -22,7 +22,7 @@ Index: vdr/menu.c
};
cMenuChannels::cMenuChannels(void)
-@@ -1161,6 +1163,7 @@
+@@ -1127,6 +1129,7 @@
virtual ~cMenuTimers();
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -30,7 +30,7 @@ Index: vdr/menu.c
};
cMenuTimers::cMenuTimers(void)
-@@ -1387,6 +1390,7 @@
+@@ -1355,6 +1358,7 @@
{
cOsdMenu::Display();
DisplayMenu()->SetEvent(event);
@@ -38,7 +38,7 @@ Index: vdr/menu.c
if (event->Description())
cStatus::MsgOsdTextItem(event->Description());
}
-@@ -1509,6 +1513,8 @@
+@@ -1477,6 +1481,8 @@
static void SetCurrentChannel(int ChannelNr) { currentChannel = ChannelNr; }
static const cEvent *ScheduleEvent(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -47,7 +47,7 @@ Index: vdr/menu.c
};
int cMenuWhatsOn::currentChannel = 0;
-@@ -1536,6 +1542,18 @@
+@@ -1505,6 +1511,18 @@
SetHelpKeys();
}
@@ -66,7 +66,7 @@ Index: vdr/menu.c
bool cMenuWhatsOn::Update(void)
{
bool result = false;
-@@ -1676,6 +1694,8 @@
+@@ -1645,6 +1663,8 @@
cMenuSchedule(void);
virtual ~cMenuSchedule();
virtual eOSState ProcessKey(eKeys Key);
@@ -75,7 +75,7 @@ Index: vdr/menu.c
};
cMenuSchedule::cMenuSchedule(void)
-@@ -1701,6 +1721,18 @@
+@@ -1671,6 +1691,18 @@
cMenuWhatsOn::ScheduleEvent(); // makes sure any posted data is cleared
}
@@ -94,7 +94,7 @@ Index: vdr/menu.c
void cMenuSchedule::PrepareScheduleAllThis(const cEvent *Event, const cChannel *Channel)
{
Clear();
-@@ -2062,6 +2094,7 @@
+@@ -2033,6 +2065,7 @@
cMenuCam(cCamSlot *CamSlot);
virtual ~cMenuCam();
virtual eOSState ProcessKey(eKeys Key);
@@ -102,7 +102,7 @@ Index: vdr/menu.c
};
cMenuCam::cMenuCam(cCamSlot *CamSlot)
-@@ -2241,6 +2274,7 @@
+@@ -2213,6 +2246,7 @@
cMenuRecording(const cRecording *Recording, bool WithButtons = false);
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -110,7 +110,7 @@ Index: vdr/menu.c
};
cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons)
-@@ -2256,6 +2290,7 @@
+@@ -2229,6 +2263,7 @@
{
cOsdMenu::Display();
DisplayMenu()->SetRecording(recording);
@@ -118,7 +118,7 @@ Index: vdr/menu.c
if (recording->Info()->Description())
cStatus::MsgOsdTextItem(recording->Info()->Description());
}
-@@ -2850,6 +2885,7 @@
+@@ -2797,6 +2832,7 @@
cMenuSetupOSD(void);
virtual ~cMenuSetupOSD();
virtual eOSState ProcessKey(eKeys Key);
@@ -126,7 +126,7 @@ Index: vdr/menu.c
};
cMenuSetupOSD::cMenuSetupOSD(void)
-@@ -2991,6 +3027,7 @@
+@@ -2938,6 +2974,7 @@
public:
cMenuSetupEPG(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -134,7 +134,7 @@ Index: vdr/menu.c
};
cMenuSetupEPG::cMenuSetupEPG(void)
-@@ -3086,6 +3123,7 @@
+@@ -3034,6 +3071,7 @@
public:
cMenuSetupDVB(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -142,7 +142,7 @@ Index: vdr/menu.c
};
cMenuSetupDVB::cMenuSetupDVB(void)
-@@ -3228,6 +3266,7 @@
+@@ -3179,6 +3217,7 @@
public:
cMenuSetupLNB(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -150,7 +150,7 @@ Index: vdr/menu.c
};
cMenuSetupLNB::cMenuSetupLNB(void)
-@@ -3330,6 +3369,7 @@
+@@ -3281,6 +3320,7 @@
public:
cMenuSetupCAM(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -158,7 +158,7 @@ Index: vdr/menu.c
};
cMenuSetupCAM::cMenuSetupCAM(void)
-@@ -3508,6 +3548,7 @@
+@@ -3459,6 +3499,7 @@
public:
cMenuSetupPlugins(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -166,7 +166,7 @@ Index: vdr/menu.c
};
cMenuSetupPlugins::cMenuSetupPlugins(void)
-@@ -3557,6 +3598,7 @@
+@@ -3513,6 +3554,7 @@
public:
cMenuSetup(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -176,8 +176,8 @@ Index: vdr/menu.c
cMenuSetup::cMenuSetup(void)
Index: vdr/menu.h
===================================================================
---- vdr.orig/menu.h 2012-03-28 20:18:36.000000000 +0200
-+++ vdr/menu.h 2012-03-28 20:18:42.000000000 +0200
+--- vdr.orig/menu.h 2012-06-06 23:02:31.000000000 +0200
++++ vdr/menu.h 2012-06-06 23:02:39.000000000 +0200
@@ -29,6 +29,7 @@
void SetText(const char *Text);
virtual void Display(void);
@@ -218,7 +218,7 @@ Index: vdr/menu.h
};
class cDisplayChannel : public cOsdObject {
-@@ -213,6 +218,7 @@
+@@ -212,6 +217,7 @@
cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
~cMenuRecordings();
virtual eOSState ProcessKey(eKeys Key);
@@ -228,8 +228,8 @@ Index: vdr/menu.h
class cRecordControl {
Index: vdr/menuitems.h
===================================================================
---- vdr.orig/menuitems.h 2012-03-28 20:18:24.000000000 +0200
-+++ vdr/menuitems.h 2012-03-28 20:18:42.000000000 +0200
+--- vdr.orig/menuitems.h 2012-05-10 00:01:35.000000000 +0200
++++ vdr/menuitems.h 2012-06-06 23:02:39.000000000 +0200
@@ -209,6 +209,7 @@
cMenuSetupPage(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -240,9 +240,9 @@ Index: vdr/menuitems.h
#endif //__MENUITEMS_H
Index: vdr/osdbase.c
===================================================================
---- vdr.orig/osdbase.c 2012-03-28 20:18:36.000000000 +0200
-+++ vdr/osdbase.c 2012-03-28 20:18:42.000000000 +0200
-@@ -100,6 +100,7 @@
+--- vdr.orig/osdbase.c 2012-06-06 23:02:31.000000000 +0200
++++ vdr/osdbase.c 2012-06-06 23:08:26.000000000 +0200
+@@ -101,6 +101,7 @@
free(status);
displayMenu->Clear();
cStatus::MsgOsdClear();
@@ -250,19 +250,19 @@ Index: vdr/osdbase.c
if (!--displayMenuCount)
DELETENULL(displayMenu);
}
-@@ -213,6 +214,7 @@
+@@ -218,6 +219,7 @@
displayMenu->SetMessage(mtStatus, NULL);
displayMenu->Clear();
cStatus::MsgOsdClear();
+ cStatus::MsgOsdMenuDisplay(MenuKind());
- displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX
- displayMenu->SetTitle(title);
- cStatus::MsgOsdTitle(title);
+ if (menuCategory != displayMenu->MenuCategory())
+ displayMenu->SetMenuCategory(menuCategory);
+ displayMenuItems = displayMenu->MaxItems();
Index: vdr/osdbase.h
===================================================================
---- vdr.orig/osdbase.h 2012-03-28 20:18:36.000000000 +0200
-+++ vdr/osdbase.h 2012-03-28 20:18:42.000000000 +0200
-@@ -136,6 +136,7 @@
+--- vdr.orig/osdbase.h 2012-06-06 23:02:31.000000000 +0200
++++ vdr/osdbase.h 2012-06-06 23:02:39.000000000 +0200
+@@ -138,6 +138,7 @@
void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -272,9 +272,9 @@ Index: vdr/osdbase.h
#endif //__OSDBASE_H
Index: vdr/recording.h
===================================================================
---- vdr.orig/recording.h 2012-03-28 20:18:36.000000000 +0200
-+++ vdr/recording.h 2012-03-28 20:18:42.000000000 +0200
-@@ -70,6 +70,7 @@
+--- vdr.orig/recording.h 2012-06-06 23:02:31.000000000 +0200
++++ vdr/recording.h 2012-06-06 23:02:39.000000000 +0200
+@@ -68,6 +68,7 @@
const cEvent *GetEvent(void) const { return event; }
const char *Title(void) const { return event->Title(); }
const char *ShortText(void) const { return event->ShortText(); }
@@ -284,8 +284,8 @@ Index: vdr/recording.h
const char *Aux(void) const { return aux; }
Index: vdr/status.c
===================================================================
---- vdr.orig/status.c 2012-03-28 20:18:24.000000000 +0200
-+++ vdr/status.c 2012-03-28 20:18:42.000000000 +0200
+--- vdr.orig/status.c 2012-04-26 21:27:40.000000000 +0200
++++ vdr/status.c 2012-06-06 23:02:39.000000000 +0200
@@ -124,3 +124,32 @@
for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
sm->OsdProgramme(PresentTime, PresentTitle, PresentSubtitle, FollowingTime, FollowingTitle, FollowingSubtitle);
@@ -321,8 +321,8 @@ Index: vdr/status.c
+}
Index: vdr/status.h
===================================================================
---- vdr.orig/status.h 2012-03-28 20:18:24.000000000 +0200
-+++ vdr/status.h 2012-03-28 20:18:42.000000000 +0200
+--- vdr.orig/status.h 2012-04-26 21:27:40.000000000 +0200
++++ vdr/status.h 2012-06-06 23:02:39.000000000 +0200
@@ -81,6 +81,17 @@
// The OSD displays the single line Text with the current channel information.
virtual void OsdProgramme(time_t PresentTime, const char *PresentTitle, const char *PresentSubtitle, time_t FollowingTime, const char *FollowingTitle, const char *FollowingSubtitle) {}
diff --git a/debian/patches/series b/debian/patches/series
index ca45a75..6b213eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,10 +39,6 @@ opt-41-x_timer-info.patch
# Patch to allow plugins to replace the VDR mainmenus
opt-42-x_MainMenuHooks.patch
-# Shows remaining recording capacity in recordings menu.
-# (Requires opt-41-x_timer-info !)
-opt-43-x_recordshowfree.patch
-
# Patch needed for the yaepg plugin.
opt-45_yaepg.patch
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list