[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.28-1_etobi1-44-ge5e333d
etobi
git at e-tobi.net
Wed Mar 6 21:25:33 UTC 2013
The following commit has been merged in the e-tobi branch:
commit 8c6072847ebb72f7e37ec5738a060e37f42a8bc1
Author: etobi <git at e-tobi.net>
Date: Wed Mar 6 22:14:53 2013 +0100
Refreshed patches
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 632c207..6c1dafb 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -1,10 +1,10 @@
-debian/patches/opt-41-x_timer-info.patch:4c2b204c4bfaaeaecf2d2fde1f141853
-debian/patches/12_osdbase-maxitems.patch:1d642929dad4862e048d708e06eb750b
-debian/patches/opt-45_yaepg.patch:d2201e3789e07a035b18a5c5c8d55901
-debian/patches/04_newplugin.patch:e9f5d4813e87b1bcebb5878409cac72d
-debian/patches/opt-27_ttxtsubs.patch:34695bbf53d9c9e1ceca217654628ffa
-debian/patches/opt-42-x_MainMenuHooks.patch:06caf4f11337d69cdea72d6e6e42afe1
-debian/patches/06_default_svdrp_port_0.patch:ec71e0702cd792605e67175aa542bfd6
-debian/patches/opt-50_graphtft.patch:b81bd650601ce0a5c43b315a7660ce0c
-debian/patches/opt-37-x_menuorg.patch:153108b150c56a383233b4d7e1118e01
-debian/patches/99_ncursesw-include.patch:b5d57e1aaabc4339f60cc031342d3333
+debian/patches/opt-41-x_timer-info.patch:415aa18fc7f2400f5001a7b214c04164
+debian/patches/12_osdbase-maxitems.patch:7aa7360f9c75a23d1fb2cb5cdb12ab10
+debian/patches/opt-45_yaepg.patch:a028d6cbd970660a72241b5948a46f0c
+debian/patches/04_newplugin.patch:1ef4b4fe16ad73193dca00cecf1b51ca
+debian/patches/opt-27_ttxtsubs.patch:f6005824f5c15d5e2f4f618c81b946f9
+debian/patches/opt-42-x_MainMenuHooks.patch:01c3bd247fff0ee6f3530a5e80a608e7
+debian/patches/06_default_svdrp_port_0.patch:0860916fa856d9e905c9855f672e0478
+debian/patches/opt-50_graphtft.patch:79e72730327c802a656a49d25b3d2873
+debian/patches/opt-37-x_menuorg.patch:9068e26643a0ac1a2a9991d42b4a202c
+debian/patches/99_ncursesw-include.patch:244b4795307260d6a25d422d37265a90
diff --git a/debian/patches/04_newplugin.patch b/debian/patches/04_newplugin.patch
index 610d6eb..69ae4e9 100644
--- a/debian/patches/04_newplugin.patch
+++ b/debian/patches/04_newplugin.patch
@@ -4,8 +4,8 @@ Author: Thomas Schmidt <tschmidt at debian.org>
Index: vdr/newplugin
===================================================================
---- vdr.orig/newplugin 2013-01-23 22:15:14.000000000 +0100
-+++ vdr/newplugin 2013-01-23 22:31:57.000000000 +0100
+--- vdr.orig/newplugin 2013-03-06 22:14:27.000000000 +0100
++++ vdr/newplugin 2013-03-06 22:17:39.000000000 +0100
@@ -24,7 +24,7 @@
$PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
$PLUGIN_MAINENTRY = $PLUGIN_CLASS;
diff --git a/debian/patches/06_default_svdrp_port_0.patch b/debian/patches/06_default_svdrp_port_0.patch
index 11f49a2..02c0bee 100644
--- a/debian/patches/06_default_svdrp_port_0.patch
+++ b/debian/patches/06_default_svdrp_port_0.patch
@@ -5,8 +5,8 @@ Author: Thomas Schmidt <tschmidt at debian.org>
Index: vdr/vdr.c
===================================================================
---- vdr.orig/vdr.c 2013-01-23 22:15:14.000000000 +0100
-+++ vdr/vdr.c 2013-01-23 22:32:44.000000000 +0100
+--- vdr.orig/vdr.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/vdr.c 2013-03-06 22:17:41.000000000 +0100
@@ -178,7 +178,7 @@
// Command line options:
diff --git a/debian/patches/12_osdbase-maxitems.patch b/debian/patches/12_osdbase-maxitems.patch
index 8495619..c5b90c0 100644
--- a/debian/patches/12_osdbase-maxitems.patch
+++ b/debian/patches/12_osdbase-maxitems.patch
@@ -4,8 +4,8 @@ Origin: http://vdrportal.de/board/thread.php?postid=343665#post343665
Index: vdr/osdbase.c
===================================================================
---- vdr.orig/osdbase.c 2013-01-23 22:15:14.000000000 +0100
-+++ vdr/osdbase.c 2013-01-23 22:40:05.000000000 +0100
+--- vdr.orig/osdbase.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/osdbase.c 2013-03-06 22:17:41.000000000 +0100
@@ -325,6 +325,7 @@
void cOsdMenu::CursorUp(void)
diff --git a/debian/patches/99_ncursesw-include.patch b/debian/patches/99_ncursesw-include.patch
index 3e62a1a..1b62d23 100644
--- a/debian/patches/99_ncursesw-include.patch
+++ b/debian/patches/99_ncursesw-include.patch
@@ -3,8 +3,8 @@ Author: Tobias Grimm <tg at e-tobi.net>
Index: vdr/PLUGINS/src/skincurses/skincurses.c
===================================================================
---- vdr.orig/PLUGINS/src/skincurses/skincurses.c 2013-01-23 22:15:14.000000000 +0100
-+++ vdr/PLUGINS/src/skincurses/skincurses.c 2013-01-23 22:40:21.000000000 +0100
+--- vdr.orig/PLUGINS/src/skincurses/skincurses.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/PLUGINS/src/skincurses/skincurses.c 2013-03-06 22:17:43.000000000 +0100
@@ -6,7 +6,7 @@
* $Id: skincurses.c 2.11 2013/01/12 14:13:12 kls Exp $
*/
diff --git a/debian/patches/opt-27_ttxtsubs.patch b/debian/patches/opt-27_ttxtsubs.patch
index ac35630..f510bab 100644
--- a/debian/patches/opt-27_ttxtsubs.patch
+++ b/debian/patches/opt-27_ttxtsubs.patch
@@ -3,22 +3,35 @@ Origin: ttxsubs plugin
Index: vdr/MANUAL
===================================================================
---- vdr.orig/MANUAL 2013-03-03 09:21:21.000000000 +0100
-+++ vdr/MANUAL 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/MANUAL 2013-03-06 22:14:27.000000000 +0100
++++ vdr/MANUAL 2013-03-06 22:17:44.000000000 +0100
@@ -756,6 +756,9 @@
background transparency. By default the values as broadcast
are used.
-+ Record Teletext Subtitles = no
-+ If set to 'yes', teletext subtitles will be recorded.
++ Enable teletext support = no
++ If set to 'yes', enables teletext subtitles.
+
LNB:
Use DiSEqC = no Generally turns DiSEqC support on or off.
+Index: vdr/Makefile
+===================================================================
+--- vdr.orig/Makefile 2013-03-06 22:11:24.000000000 +0100
++++ vdr/Makefile 2013-03-06 22:17:44.000000000 +0100
+@@ -73,6 +73,8 @@
+ 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
+
++OBJS += vdrttxtsubshooks.o
++
+ DEFINES += $(CDEFINES)
+ INCLUDES += $(CINCLUDES)
+
Index: vdr/channels.c
===================================================================
---- vdr.orig/channels.c 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/channels.c 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/channels.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/channels.c 2013-03-06 22:17:44.000000000 +0100
@@ -408,6 +408,26 @@
}
}
@@ -100,8 +113,8 @@ Index: vdr/channels.c
if (caidbuf) {
Index: vdr/channels.h
===================================================================
---- vdr.orig/channels.h 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/channels.h 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/channels.h 2013-03-06 22:14:27.000000000 +0100
++++ vdr/channels.h 2013-03-06 22:17:44.000000000 +0100
@@ -35,6 +35,7 @@
#define MAXDPIDS 16 // dolby (AC3 + DTS)
#define MAXSPIDS 32 // subtitles
@@ -156,8 +169,8 @@ Index: vdr/channels.h
void SetLinkChannels(cLinkChannels *LinkChannels);
Index: vdr/ci.c
===================================================================
---- vdr.orig/ci.c 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/ci.c 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/ci.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/ci.c 2013-03-06 22:17:44.000000000 +0100
@@ -1914,6 +1914,8 @@
AddPid(Channel->Sid(), *Dpid, STREAM_TYPE_PRIVATE);
for (const int *Spid = Channel->Spids(); *Spid; Spid++)
@@ -167,10 +180,20 @@ Index: vdr/ci.c
}
}
+@@ -1937,6 +1939,9 @@
+ CaPmt.AddPid(*Dpid, STREAM_TYPE_PRIVATE);
+ for (const int *Spid = Channel->Spids(); *Spid; Spid++)
+ CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE);
++ if (Channel->Tpid() && Setup.SupportTeletext) {
++ CaPmt.AddPid(Channel->Tpid(), STREAM_TYPE_PRIVATE);
++ }
+ cas->SendPMT(&CaPmt);
+ cTimeMs Timeout(QUERY_REPLY_TIMEOUT);
+ do {
Index: vdr/config.c
===================================================================
---- vdr.orig/config.c 2013-03-03 09:21:21.000000000 +0100
-+++ vdr/config.c 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/config.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/config.c 2013-03-06 22:17:44.000000000 +0100
@@ -397,6 +397,7 @@
MarginStop = 10;
AudioLanguages[0] = -1;
@@ -197,8 +220,8 @@ Index: vdr/config.c
Store("SubtitleFgTransparency", SubtitleFgTransparency);
Index: vdr/config.h
===================================================================
---- vdr.orig/config.h 2013-03-03 09:21:21.000000000 +0100
-+++ vdr/config.h 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/config.h 2013-03-06 22:14:27.000000000 +0100
++++ vdr/config.h 2013-03-06 22:17:44.000000000 +0100
@@ -273,6 +273,7 @@
int MarginStart, MarginStop;
int AudioLanguages[I18N_MAX_LANGUAGES + 1];
@@ -209,8 +232,8 @@ Index: vdr/config.h
int SubtitleFgTransparency, SubtitleBgTransparency;
Index: vdr/device.c
===================================================================
---- vdr.orig/device.c 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/device.c 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/device.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/device.c 2013-03-06 22:17:44.000000000 +0100
@@ -18,6 +18,7 @@
#include "receiver.h"
#include "status.h"
@@ -261,8 +284,8 @@ Index: vdr/device.c
else if (Pid == patPmtParser.Ppid()) {
Index: vdr/device.h
===================================================================
---- vdr.orig/device.h 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/device.h 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/device.h 2013-03-06 22:14:27.000000000 +0100
++++ vdr/device.h 2013-03-06 22:17:44.000000000 +0100
@@ -584,6 +584,7 @@
cTsToPes tsToPesVideo;
cTsToPes tsToPesAudio;
@@ -273,8 +296,8 @@ Index: vdr/device.h
const cPatPmtParser *PatPmtParser(void) const { return &patPmtParser; }
Index: vdr/menu.c
===================================================================
---- vdr.orig/menu.c 2013-03-03 09:21:21.000000000 +0100
-+++ vdr/menu.c 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/menu.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/menu.c 2013-03-06 22:17:44.000000000 +0100
@@ -2840,6 +2840,7 @@
Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle foreground transparency"), &data.SubtitleFgTransparency, 0, 9));
Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle background transparency"), &data.SubtitleBgTransparency, 0, 10));
@@ -285,8 +308,8 @@ Index: vdr/menu.c
Display();
Index: vdr/pat.c
===================================================================
---- vdr.orig/pat.c 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/pat.c 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/pat.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/pat.c 2013-03-06 22:17:44.000000000 +0100
@@ -13,6 +13,7 @@
#include "libsi/section.h"
#include "libsi/descriptor.h"
@@ -342,8 +365,8 @@ Index: vdr/pat.c
}
Index: vdr/po/ca_ES.po
===================================================================
---- vdr.orig/po/ca_ES.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/ca_ES.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/ca_ES.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/ca_ES.po 2013-03-06 22:17:44.000000000 +0100
@@ -971,6 +971,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparència fons subtítols"
@@ -356,9 +379,9 @@ Index: vdr/po/ca_ES.po
Index: vdr/po/cs_CZ.po
===================================================================
---- vdr.orig/po/cs_CZ.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/cs_CZ.po 2013-03-03 09:22:06.000000000 +0100
-@@ -970,6 +970,9 @@
+--- vdr.orig/po/cs_CZ.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/cs_CZ.po 2013-03-06 22:17:44.000000000 +0100
+@@ -971,6 +971,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Průhlednost pozadà titulků"
@@ -370,8 +393,8 @@ Index: vdr/po/cs_CZ.po
Index: vdr/po/da_DK.po
===================================================================
---- vdr.orig/po/da_DK.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/da_DK.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/da_DK.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/da_DK.po 2013-03-06 22:17:44.000000000 +0100
@@ -968,6 +968,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Undertekst baggrundsgennemsigtighed"
@@ -384,8 +407,8 @@ Index: vdr/po/da_DK.po
Index: vdr/po/de_DE.po
===================================================================
---- vdr.orig/po/de_DE.po 2013-03-03 09:21:21.000000000 +0100
-+++ vdr/po/de_DE.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/de_DE.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/de_DE.po 2013-03-06 22:17:44.000000000 +0100
@@ -968,6 +968,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Untertitel-Transparenz Hintergrund"
@@ -398,8 +421,8 @@ Index: vdr/po/de_DE.po
Index: vdr/po/el_GR.po
===================================================================
---- vdr.orig/po/el_GR.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/el_GR.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/el_GR.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/el_GR.po 2013-03-06 22:17:44.000000000 +0100
@@ -968,6 +968,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr ""
@@ -412,8 +435,8 @@ Index: vdr/po/el_GR.po
Index: vdr/po/es_ES.po
===================================================================
---- vdr.orig/po/es_ES.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/es_ES.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/es_ES.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/es_ES.po 2013-03-06 22:17:44.000000000 +0100
@@ -969,6 +969,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparencia fondo subtítulos"
@@ -426,8 +449,8 @@ Index: vdr/po/es_ES.po
Index: vdr/po/et_EE.po
===================================================================
---- vdr.orig/po/et_EE.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/et_EE.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/et_EE.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/et_EE.po 2013-03-06 22:17:44.000000000 +0100
@@ -968,6 +968,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Subtiitri tausta läbipaistvus"
@@ -440,8 +463,8 @@ Index: vdr/po/et_EE.po
Index: vdr/po/fi_FI.po
===================================================================
---- vdr.orig/po/fi_FI.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/fi_FI.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/fi_FI.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/fi_FI.po 2013-03-06 22:17:44.000000000 +0100
@@ -971,6 +971,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Tekstityksen taustan läpinäkyvyys"
@@ -454,9 +477,9 @@ Index: vdr/po/fi_FI.po
Index: vdr/po/fr_FR.po
===================================================================
---- vdr.orig/po/fr_FR.po 2013-03-03 09:21:21.000000000 +0100
-+++ vdr/po/fr_FR.po 2013-03-03 09:22:06.000000000 +0100
-@@ -978,6 +978,9 @@
+--- vdr.orig/po/fr_FR.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/fr_FR.po 2013-03-06 22:17:44.000000000 +0100
+@@ -977,6 +977,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparence du fond des sous-titres"
@@ -468,8 +491,8 @@ Index: vdr/po/fr_FR.po
Index: vdr/po/hr_HR.po
===================================================================
---- vdr.orig/po/hr_HR.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/hr_HR.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/hr_HR.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/hr_HR.po 2013-03-06 22:17:44.000000000 +0100
@@ -970,6 +970,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparentnost pozadine titla"
@@ -482,11 +505,11 @@ Index: vdr/po/hr_HR.po
Index: vdr/po/hu_HU.po
===================================================================
---- vdr.orig/po/hu_HU.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/hu_HU.po 2013-03-03 09:22:06.000000000 +0100
-@@ -971,6 +971,9 @@
+--- vdr.orig/po/hu_HU.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/hu_HU.po 2013-03-06 22:17:44.000000000 +0100
+@@ -972,6 +972,9 @@
msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Felirat hátterének transzparenciája"
+ msgstr "Felirat hátterének transzparenciája"
+msgid "Setup.DVB$Enable teletext support"
+msgstr ""
@@ -496,8 +519,8 @@ Index: vdr/po/hu_HU.po
Index: vdr/po/it_IT.po
===================================================================
---- vdr.orig/po/it_IT.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/it_IT.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/it_IT.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/it_IT.po 2013-03-06 22:17:44.000000000 +0100
@@ -975,6 +975,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Trasparenza sfondo sottotitoli"
@@ -510,8 +533,8 @@ Index: vdr/po/it_IT.po
Index: vdr/po/lt_LT.po
===================================================================
---- vdr.orig/po/lt_LT.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/lt_LT.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/lt_LT.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/lt_LT.po 2013-03-06 22:17:44.000000000 +0100
@@ -968,6 +968,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Subtitrų fono permatomumas"
@@ -524,8 +547,8 @@ Index: vdr/po/lt_LT.po
Index: vdr/po/nl_NL.po
===================================================================
---- vdr.orig/po/nl_NL.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/nl_NL.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/nl_NL.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/nl_NL.po 2013-03-06 22:17:44.000000000 +0100
@@ -972,6 +972,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparantie achtergrond ondertiteling"
@@ -538,8 +561,8 @@ Index: vdr/po/nl_NL.po
Index: vdr/po/nn_NO.po
===================================================================
---- vdr.orig/po/nn_NO.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/nn_NO.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/nn_NO.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/nn_NO.po 2013-03-06 22:17:44.000000000 +0100
@@ -969,6 +969,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr ""
@@ -552,9 +575,9 @@ Index: vdr/po/nn_NO.po
Index: vdr/po/pl_PL.po
===================================================================
---- vdr.orig/po/pl_PL.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/pl_PL.po 2013-03-03 09:22:06.000000000 +0100
-@@ -969,6 +969,9 @@
+--- vdr.orig/po/pl_PL.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/pl_PL.po 2013-03-06 22:17:44.000000000 +0100
+@@ -970,6 +970,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Prze¼rocze podtytu³ów: T³o"
@@ -566,8 +589,8 @@ Index: vdr/po/pl_PL.po
Index: vdr/po/pt_PT.po
===================================================================
---- vdr.orig/po/pt_PT.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/pt_PT.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/pt_PT.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/pt_PT.po 2013-03-06 22:17:44.000000000 +0100
@@ -969,6 +969,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparência de fundo das legendas"
@@ -580,8 +603,8 @@ Index: vdr/po/pt_PT.po
Index: vdr/po/ro_RO.po
===================================================================
---- vdr.orig/po/ro_RO.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/ro_RO.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/ro_RO.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/ro_RO.po 2013-03-06 22:17:44.000000000 +0100
@@ -970,6 +970,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "TransparenÅ£a fundalului subtitrÄrii"
@@ -594,8 +617,8 @@ Index: vdr/po/ro_RO.po
Index: vdr/po/ru_RU.po
===================================================================
---- vdr.orig/po/ru_RU.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/ru_RU.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/ru_RU.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/ru_RU.po 2013-03-06 22:17:44.000000000 +0100
@@ -969,6 +969,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "¿àÞ×àÐçÝÞáâì äÞÝÐ áãÑâØâàÞÒ"
@@ -608,8 +631,8 @@ Index: vdr/po/ru_RU.po
Index: vdr/po/sk_SK.po
===================================================================
---- vdr.orig/po/sk_SK.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/sk_SK.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/sk_SK.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/sk_SK.po 2013-03-06 22:17:44.000000000 +0100
@@ -968,6 +968,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Priehµadnos» pozadia titulkov"
@@ -622,8 +645,8 @@ Index: vdr/po/sk_SK.po
Index: vdr/po/sl_SI.po
===================================================================
---- vdr.orig/po/sl_SI.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/sl_SI.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/sl_SI.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/sl_SI.po 2013-03-06 22:17:44.000000000 +0100
@@ -969,6 +969,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparentnost ozadja podnapisov"
@@ -636,9 +659,9 @@ Index: vdr/po/sl_SI.po
Index: vdr/po/sv_SE.po
===================================================================
---- vdr.orig/po/sv_SE.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/sv_SE.po 2013-03-03 09:22:06.000000000 +0100
-@@ -971,6 +971,9 @@
+--- vdr.orig/po/sv_SE.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/sv_SE.po 2013-03-06 22:17:44.000000000 +0100
+@@ -972,6 +972,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparent bakgrund textremsa"
@@ -650,8 +673,8 @@ Index: vdr/po/sv_SE.po
Index: vdr/po/tr_TR.po
===================================================================
---- vdr.orig/po/tr_TR.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/tr_TR.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/tr_TR.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/tr_TR.po 2013-03-06 22:17:44.000000000 +0100
@@ -968,6 +968,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Altyazý arka þeffaflýk"
@@ -664,8 +687,8 @@ Index: vdr/po/tr_TR.po
Index: vdr/po/uk_UA.po
===================================================================
---- vdr.orig/po/uk_UA.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/uk_UA.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/uk_UA.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/uk_UA.po 2013-03-06 22:17:44.000000000 +0100
@@ -969,6 +969,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "ÐÑозоÑÑÑÑÑ Ð·Ð°Ð´Ð½Ñого Ð¿Ð»Ð°Ð½Ñ ÑÑбÑиÑÑÑв"
@@ -678,8 +701,8 @@ Index: vdr/po/uk_UA.po
Index: vdr/po/zh_CN.po
===================================================================
---- vdr.orig/po/zh_CN.po 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/po/zh_CN.po 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/po/zh_CN.po 2013-03-06 22:14:27.000000000 +0100
++++ vdr/po/zh_CN.po 2013-03-06 22:17:44.000000000 +0100
@@ -971,6 +971,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "åå¹èæ¯éæ度"
@@ -692,8 +715,8 @@ Index: vdr/po/zh_CN.po
Index: vdr/receiver.c
===================================================================
---- vdr.orig/receiver.c 2013-01-23 21:58:27.000000000 +0100
-+++ vdr/receiver.c 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/receiver.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/receiver.c 2013-03-06 22:17:44.000000000 +0100
@@ -67,7 +67,8 @@
(Channel->Ppid() == Channel->Vpid() || AddPid(Channel->Ppid())) &&
AddPids(Channel->Apids()) &&
@@ -706,8 +729,8 @@ Index: vdr/receiver.c
}
Index: vdr/remux.c
===================================================================
---- vdr.orig/remux.c 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/remux.c 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/remux.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/remux.c 2013-03-06 22:17:44.000000000 +0100
@@ -385,6 +385,29 @@
return i;
}
@@ -780,7 +803,7 @@ Index: vdr/remux.c
for (SI::Loop::Iterator it; Pmt.streamLoop.getNext(stream, it); ) {
dbgpatpmt(" stream type = %02X, pid = %d", stream.getStreamType(), stream.getPid());
@@ -768,6 +799,28 @@
- spids[NumSpids]= 0;
+ spids[NumSpids] = 0;
}
break;
+ case SI::TeletextDescriptorTag: {
@@ -810,8 +833,8 @@ Index: vdr/remux.c
dbgpatpmt(" '%s'", ld->languageCode);
Index: vdr/remux.h
===================================================================
---- vdr.orig/remux.h 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/remux.h 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/remux.h 2013-03-06 22:14:27.000000000 +0100
++++ vdr/remux.h 2013-03-06 22:17:44.000000000 +0100
@@ -294,6 +294,7 @@
int MakeStream(uchar *Target, uchar Type, int Pid);
int MakeAC3Descriptor(uchar *Target, uchar Type);
@@ -858,8 +881,8 @@ Index: vdr/remux.h
// TS to PES converter:
Index: vdr/vdr.5
===================================================================
---- vdr.orig/vdr.5 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/vdr.5 2013-03-03 09:22:06.000000000 +0100
+--- vdr.orig/vdr.5 2013-03-06 22:14:27.000000000 +0100
++++ vdr/vdr.5 2013-03-06 22:17:44.000000000 +0100
@@ -233,6 +233,12 @@
.B ...:201;2001=deu,2002=eng:...
@@ -876,7 +899,7 @@ Index: vdr/vdr.5
Index: vdr/vdrttxtsubshooks.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/vdrttxtsubshooks.c 2013-03-03 09:22:06.000000000 +0100
++++ vdr/vdrttxtsubshooks.c 2013-03-06 22:17:44.000000000 +0100
@@ -0,0 +1,63 @@
+/*
+ * vdr-ttxtsubs - A plugin for the Linux Video Disk Recorder
@@ -944,7 +967,7 @@ Index: vdr/vdrttxtsubshooks.c
Index: vdr/vdrttxtsubshooks.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/vdrttxtsubshooks.h 2013-03-03 09:22:06.000000000 +0100
++++ vdr/vdrttxtsubshooks.h 2013-03-06 22:17:44.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * vdr-ttxtsubs - A plugin for the Linux Video Disk Recorder
diff --git a/debian/patches/opt-37-x_menuorg.patch b/debian/patches/opt-37-x_menuorg.patch
index 6837889..5540445 100644
--- a/debian/patches/opt-37-x_menuorg.patch
+++ b/debian/patches/opt-37-x_menuorg.patch
@@ -8,7 +8,7 @@ Author: Tobias Grimm <tg at e-tobi.net>
Index: vdr/mainmenuitemsprovider.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/mainmenuitemsprovider.h 2013-03-03 09:22:16.000000000 +0100
++++ vdr/mainmenuitemsprovider.h 2013-03-06 22:17:46.000000000 +0100
@@ -0,0 +1,60 @@
+/*
+ * vdr-menuorg - A plugin for the Linux Video Disk Recorder
@@ -72,8 +72,8 @@ Index: vdr/mainmenuitemsprovider.h
+#endif //__MAINMENUITEMSPROVIDER_H
Index: vdr/menu.c
===================================================================
---- vdr.orig/menu.c 2013-03-03 09:22:06.000000000 +0100
-+++ vdr/menu.c 2013-03-03 09:22:16.000000000 +0100
+--- vdr.orig/menu.c 2013-03-06 22:17:44.000000000 +0100
++++ vdr/menu.c 2013-03-06 22:17:46.000000000 +0100
@@ -31,6 +31,7 @@
#include "timers.h"
#include "transfer.h"
@@ -82,7 +82,7 @@ Index: vdr/menu.c
#define MAXWAIT4EPGINFO 3 // seconds
#define MODETIMEOUT 3 // seconds
-@@ -3371,6 +3372,9 @@
+@@ -3373,6 +3374,9 @@
cancelEditingItem = NULL;
stopRecordingItem = NULL;
recordControlsState = 0;
@@ -92,7 +92,7 @@ Index: vdr/menu.c
Set();
// Initial submenus:
-@@ -3399,6 +3403,29 @@
+@@ -3401,6 +3405,29 @@
SetTitle("VDR");
SetHasHotkeys();
@@ -122,7 +122,7 @@ Index: vdr/menu.c
// Basic menu items:
Add(new cOsdItem(hk(tr("Schedule")), osSchedule));
-@@ -3425,6 +3452,8 @@
+@@ -3427,6 +3454,8 @@
if (Commands.Count())
Add(new cOsdItem(hk(tr("Commands")), osCommands));
@@ -131,7 +131,7 @@ Index: vdr/menu.c
Update(true);
Display();
-@@ -3530,6 +3559,41 @@
+@@ -3532,6 +3561,41 @@
state = osEnd;
}
break;
@@ -176,7 +176,7 @@ Index: vdr/menu.c
Index: vdr/menuorgpatch.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/menuorgpatch.h 2013-03-03 09:22:16.000000000 +0100
++++ vdr/menuorgpatch.h 2013-03-06 22:17:46.000000000 +0100
@@ -0,0 +1,100 @@
+/*
+ * vdr-menuorg - A plugin for the Linux Video Disk Recorder
diff --git a/debian/patches/opt-41-x_timer-info.patch b/debian/patches/opt-41-x_timer-info.patch
index 7076e26..f86caef 100644
--- a/debian/patches/opt-41-x_timer-info.patch
+++ b/debian/patches/opt-41-x_timer-info.patch
@@ -6,7 +6,7 @@ Origin: http://toms-cafe.de/vdr/download/vdr-timer-info-0.5-1.7.13.diff
Index: vdr/README.timer-info
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/README.timer-info 2013-03-03 09:22:22.000000000 +0100
++++ vdr/README.timer-info 2013-03-06 22:17:46.000000000 +0100
@@ -0,0 +1,69 @@
++------------------------------------------------------------------------------+
+| Info about the timer-info-patch by Brougs78 |
@@ -79,8 +79,8 @@ Index: vdr/README.timer-info
+ http://toms-cafe.de/vdr/download/vdr-timer-info-0.5-1.7.13.diff
Index: vdr/menu.c
===================================================================
---- vdr.orig/menu.c 2013-03-03 09:22:16.000000000 +0100
-+++ vdr/menu.c 2013-03-03 09:22:22.000000000 +0100
+--- vdr.orig/menu.c 2013-03-06 22:17:46.000000000 +0100
++++ vdr/menu.c 2013-03-06 22:17:46.000000000 +0100
@@ -1004,8 +1004,10 @@
class cMenuTimerItem : public cOsdItem {
private:
diff --git a/debian/patches/opt-42-x_MainMenuHooks.patch b/debian/patches/opt-42-x_MainMenuHooks.patch
index 85b6c78..7843e6e 100644
--- a/debian/patches/opt-42-x_MainMenuHooks.patch
+++ b/debian/patches/opt-42-x_MainMenuHooks.patch
@@ -4,9 +4,9 @@ Author: Frank Schmirler <vdrdev at schmirler.de>
Index: vdr/menu.c
===================================================================
---- vdr.orig/menu.c 2013-03-03 09:22:22.000000000 +0100
-+++ vdr/menu.c 2013-03-03 09:22:28.000000000 +0100
-@@ -3505,15 +3505,30 @@
+--- vdr.orig/menu.c 2013-03-06 22:17:46.000000000 +0100
++++ vdr/menu.c 2013-03-06 22:17:47.000000000 +0100
+@@ -3507,15 +3507,30 @@
// Initial submenus:
@@ -43,7 +43,7 @@ Index: vdr/menu.c
}
cOsdObject *cMenuMain::PluginOsdObject(void)
-@@ -3646,13 +3661,34 @@
+@@ -3648,13 +3663,34 @@
eOSState state = cOsdMenu::ProcessKey(Key);
HadSubMenu |= HasSubMenu();
@@ -84,7 +84,7 @@ Index: vdr/menu.c
case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) {
cOsdItem *item = Get(Current());
if (item) {
-@@ -3739,6 +3775,8 @@
+@@ -3741,6 +3777,8 @@
default: break;
}
}
@@ -95,8 +95,8 @@ Index: vdr/menu.c
if (Key != kNone) {
Index: vdr/config.h
===================================================================
---- vdr.orig/config.h 2013-03-03 09:22:06.000000000 +0100
-+++ vdr/config.h 2013-03-03 09:22:28.000000000 +0100
+--- vdr.orig/config.h 2013-03-06 22:17:44.000000000 +0100
++++ vdr/config.h 2013-03-06 22:17:47.000000000 +0100
@@ -36,6 +36,8 @@
// plugins to work with newer versions of the core VDR as long as no
// VDR header files have changed.
@@ -109,7 +109,7 @@ Index: vdr/config.h
Index: vdr/README.MainMenuHooks
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vdr/README.MainMenuHooks 2013-03-03 09:22:28.000000000 +0100
++++ vdr/README.MainMenuHooks 2013-03-06 22:17:47.000000000 +0100
@@ -0,0 +1,55 @@
+This is a "patch" for the Video Disk Recorder (VDR).
+
diff --git a/debian/patches/opt-45_yaepg.patch b/debian/patches/opt-45_yaepg.patch
index 9c09859..5c7d066 100644
--- a/debian/patches/opt-45_yaepg.patch
+++ b/debian/patches/opt-45_yaepg.patch
@@ -4,8 +4,8 @@ Origin: http://www.hoochvdr.info/yaepg/vdr-1.3.19-core-yaepg.diff
Index: vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c
===================================================================
---- vdr.orig/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2013-01-23 21:58:28.000000000 +0100
-+++ vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2013-03-03 09:22:33.000000000 +0100
+--- vdr.orig/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2013-03-06 22:17:47.000000000 +0100
@@ -77,6 +77,10 @@
Cmd(OSD_SetWindow, 0, i + 1);
Cmd(OSD_Close);
@@ -42,8 +42,8 @@ Index: vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c
}
Index: vdr/device.h
===================================================================
---- vdr.orig/device.h 2013-03-03 09:22:06.000000000 +0100
-+++ vdr/device.h 2013-03-03 09:22:33.000000000 +0100
+--- vdr.orig/device.h 2013-03-06 22:17:44.000000000 +0100
++++ vdr/device.h 2013-03-06 22:17:47.000000000 +0100
@@ -304,12 +304,12 @@
///< Direction (only the sign of Direction is evaluated, positive values
///< switch to higher channel numbers).
@@ -61,8 +61,8 @@ Index: vdr/device.h
static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; }
Index: vdr/osd.c
===================================================================
---- vdr.orig/osd.c 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/osd.c 2013-03-03 09:22:33.000000000 +0100
+--- vdr.orig/osd.c 2013-03-06 22:14:27.000000000 +0100
++++ vdr/osd.c 2013-03-06 22:17:47.000000000 +0100
@@ -1643,6 +1643,7 @@
}
}
@@ -73,8 +73,8 @@ Index: vdr/osd.c
cOsd::~cOsd()
Index: vdr/osd.h
===================================================================
---- vdr.orig/osd.h 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/osd.h 2013-03-03 09:22:33.000000000 +0100
+--- vdr.orig/osd.h 2013-03-06 22:14:27.000000000 +0100
++++ vdr/osd.h 2013-03-06 22:17:47.000000000 +0100
@@ -926,6 +926,7 @@
///< MyOsdDrawPixmap(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), pm->Data(), w, h, h * d);
///< delete pm;
diff --git a/debian/patches/opt-50_graphtft.patch b/debian/patches/opt-50_graphtft.patch
index 93fa56a..33617c7 100644
--- a/debian/patches/opt-50_graphtft.patch
+++ b/debian/patches/opt-50_graphtft.patch
@@ -4,8 +4,8 @@ Origin: https://vdr-graphtft.svn.sourceforge.net/svnroot/vdr-graphtft
Index: vdr/menu.c
===================================================================
---- vdr.orig/menu.c 2013-03-03 09:22:28.000000000 +0100
-+++ vdr/menu.c 2013-03-03 09:22:37.000000000 +0100
+--- vdr.orig/menu.c 2013-03-06 22:17:47.000000000 +0100
++++ vdr/menu.c 2013-03-06 22:17:48.000000000 +0100
@@ -168,6 +168,7 @@
public:
cMenuEditChannel(cChannel *Channel, bool New = false);
@@ -150,7 +150,7 @@ Index: vdr/menu.c
};
cMenuSetupLNB::cMenuSetupLNB(void)
-@@ -3163,6 +3202,7 @@
+@@ -3165,6 +3204,7 @@
public:
cMenuSetupCAM(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -158,7 +158,7 @@ Index: vdr/menu.c
};
cMenuSetupCAM::cMenuSetupCAM(void)
-@@ -3347,6 +3387,7 @@
+@@ -3349,6 +3389,7 @@
public:
cMenuSetupPlugins(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -166,7 +166,7 @@ Index: vdr/menu.c
};
cMenuSetupPlugins::cMenuSetupPlugins(void)
-@@ -3402,6 +3443,7 @@
+@@ -3404,6 +3445,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 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/menu.h 2013-03-03 09:22:37.000000000 +0100
+--- vdr.orig/menu.h 2013-03-06 22:14:26.000000000 +0100
++++ vdr/menu.h 2013-03-06 22:17:48.000000000 +0100
@@ -29,6 +29,7 @@
void SetText(const char *Text);
virtual void Display(void);
@@ -228,8 +228,8 @@ Index: vdr/menu.h
class cRecordControl {
Index: vdr/menuitems.h
===================================================================
---- vdr.orig/menuitems.h 2013-01-23 21:58:28.000000000 +0100
-+++ vdr/menuitems.h 2013-03-03 09:22:37.000000000 +0100
+--- vdr.orig/menuitems.h 2013-03-06 22:14:26.000000000 +0100
++++ vdr/menuitems.h 2013-03-06 22:17:48.000000000 +0100
@@ -209,6 +209,7 @@
cMenuSetupPage(void);
virtual eOSState ProcessKey(eKeys Key);
@@ -240,8 +240,8 @@ Index: vdr/menuitems.h
#endif //__MENUITEMS_H
Index: vdr/osdbase.c
===================================================================
---- vdr.orig/osdbase.c 2013-03-03 09:12:55.000000000 +0100
-+++ vdr/osdbase.c 2013-03-03 09:22:37.000000000 +0100
+--- vdr.orig/osdbase.c 2013-03-06 22:17:41.000000000 +0100
++++ vdr/osdbase.c 2013-03-06 22:17:48.000000000 +0100
@@ -105,6 +105,7 @@
free(status);
displayMenu->Clear();
@@ -260,8 +260,8 @@ Index: vdr/osdbase.c
displayMenuItems = displayMenu->MaxItems();
Index: vdr/osdbase.h
===================================================================
---- vdr.orig/osdbase.h 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/osdbase.h 2013-03-03 09:22:37.000000000 +0100
+--- vdr.orig/osdbase.h 2013-03-06 22:14:26.000000000 +0100
++++ vdr/osdbase.h 2013-03-06 22:17:48.000000000 +0100
@@ -136,6 +136,7 @@
void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
virtual void Display(void);
@@ -272,8 +272,8 @@ Index: vdr/osdbase.h
#endif //__OSDBASE_H
Index: vdr/recording.h
===================================================================
---- vdr.orig/recording.h 2013-03-03 08:43:26.000000000 +0100
-+++ vdr/recording.h 2013-03-03 09:22:37.000000000 +0100
+--- vdr.orig/recording.h 2013-03-06 22:14:26.000000000 +0100
++++ vdr/recording.h 2013-03-06 22:17:48.000000000 +0100
@@ -68,6 +68,7 @@
const cEvent *GetEvent(void) const { return event; }
const char *Title(void) const { return event->Title(); }
@@ -284,8 +284,8 @@ Index: vdr/recording.h
const char *Aux(void) const { return aux; }
Index: vdr/status.c
===================================================================
---- vdr.orig/status.c 2013-01-23 21:58:28.000000000 +0100
-+++ vdr/status.c 2013-03-03 09:22:37.000000000 +0100
+--- vdr.orig/status.c 2013-03-06 22:14:26.000000000 +0100
++++ vdr/status.c 2013-03-06 22:17:48.000000000 +0100
@@ -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 2013-01-23 21:58:28.000000000 +0100
-+++ vdr/status.h 2013-03-03 09:22:37.000000000 +0100
+--- vdr.orig/status.h 2013-03-06 22:14:26.000000000 +0100
++++ vdr/status.h 2013-03-06 22:17:48.000000000 +0100
@@ -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) {}
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list