This is an automated email from the git hooks/post-receive script. tiber-guest pushed a commit to annotated tag debian/2.3.2-1_etobi1 in repository vdr.
commit 235fd7a097c4b117b024887253bc8b5c8dc0d170 Author: Tobias Grimm <[email protected]> Date: Sat Jan 7 19:54:58 2017 +0100 Updated patches --- debian/patches/opt-27_ttxtsubs.patch | 386 +++++++++++----------------- debian/patches/opt-37-x_menuorg.patch | 28 +- debian/patches/opt-42-x_MainMenuHooks.patch | 28 +- debian/patches/opt-45_yaepg.patch | 70 ++--- debian/patches/opt-60_power-saving.patch | 26 +- 5 files changed, 202 insertions(+), 336 deletions(-) diff --git a/debian/patches/opt-27_ttxtsubs.patch b/debian/patches/opt-27_ttxtsubs.patch index c7493e7..916003d 100644 --- a/debian/patches/opt-27_ttxtsubs.patch +++ b/debian/patches/opt-27_ttxtsubs.patch @@ -2,11 +2,9 @@ Description: This patch is needed for the ttxtsubs plugin. Author: Tobias Grimm <[email protected]> Origin: ttxsubs plugin -Index: vdr/MANUAL -=================================================================== ---- vdr.orig/MANUAL 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/MANUAL 2015-02-19 12:30:27.425069126 +0100 -@@ -810,6 +810,9 @@ +--- a/MANUAL ++++ b/MANUAL +@@ -818,6 +818,9 @@ background transparency. By default the values as broadcast are used. @@ -16,10 +14,8 @@ Index: vdr/MANUAL LNB: Use DiSEqC = no Generally turns DiSEqC support on or off. -Index: vdr/Makefile -=================================================================== ---- vdr.orig/Makefile 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/Makefile 2015-02-19 12:30:27.425069126 +0100 +--- a/Makefile ++++ b/Makefile @@ -74,6 +74,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 @@ -29,15 +25,13 @@ Index: vdr/Makefile DEFINES += $(CDEFINES) INCLUDES += $(CINCLUDES) -Index: vdr/channels.c -=================================================================== ---- vdr.orig/channels.c 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/channels.c 2015-02-19 12:30:27.425069126 +0100 -@@ -426,6 +426,26 @@ - seen = time(NULL); +--- a/channels.c ++++ b/channels.c +@@ -443,6 +443,26 @@ + } } -+void cChannel::SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int numberOfPages) ++bool cChannel::SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int numberOfPages) +{ + int mod = CHANNELMOD_NONE; + if (totalTtxtSubtitlePages != (fixedTtxtSubtitlePages + numberOfPages)) @@ -54,13 +48,13 @@ Index: vdr/channels.c + totalTtxtSubtitlePages++; + } + modification |= mod; -+ Channels.SetModified(); ++ return mod != CHANNELMOD_NONE; +} + - void cChannel::SetCaIds(const int *CaIds) + bool cChannel::SetCaIds(const int *CaIds) { if (caids[0] && caids[0] <= CA_USER_MAX) -@@ -556,10 +576,17 @@ +@@ -576,10 +596,17 @@ q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs, Channel->dtypes); } *q = 0; @@ -79,7 +73,7 @@ Index: vdr/channels.c if (Channel->spids[0]) { *q++ = ';'; q += IntArrayToString(q, Channel->spids, 10, Channel->slangs); -@@ -730,6 +757,32 @@ +@@ -750,6 +777,32 @@ } spids[NumSpids] = 0; } @@ -112,11 +106,9 @@ Index: vdr/channels.c if (sscanf(tpidbuf, "%d", &tpid) != 1) return false; if (caidbuf) { -Index: vdr/channels.h -=================================================================== ---- vdr.orig/channels.h 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/channels.h 2015-02-19 12:30:27.425069126 +0100 -@@ -36,6 +36,7 @@ +--- a/channels.h ++++ b/channels.h +@@ -32,6 +32,7 @@ #define MAXDPIDS 16 // dolby (AC3 + DTS) #define MAXSPIDS 32 // subtitles #define MAXCAIDS 12 // conditional access @@ -124,7 +116,7 @@ Index: vdr/channels.h #define MAXLANGCODE1 4 // a 3 letter language code, zero terminated #define MAXLANGCODE2 8 // up to two 3 letter language codes, separated by '+' and zero terminated -@@ -72,6 +73,16 @@ +@@ -68,6 +69,16 @@ static const tChannelID InvalidID; }; @@ -141,7 +133,7 @@ Index: vdr/channels.h class cChannel; class cLinkChannel : public cListObject { -@@ -116,6 +127,9 @@ +@@ -113,6 +124,9 @@ uint16_t compositionPageIds[MAXSPIDS]; uint16_t ancillaryPageIds[MAXSPIDS]; int tpid; @@ -151,7 +143,7 @@ Index: vdr/channels.h int caids[MAXCAIDS + 1]; // list is zero-terminated int nid; int tid; -@@ -169,6 +183,8 @@ +@@ -166,6 +180,8 @@ uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? compositionPageIds[i] : uint16_t(0); } uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : uint16_t(0); } int Tpid(void) const { return tpid; } @@ -160,19 +152,17 @@ Index: vdr/channels.h const int *Caids(void) const { return caids; } int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; } int Nid(void) const { return nid; } -@@ -198,6 +214,7 @@ - void SetName(const char *Name, const char *ShortName, const char *Provider); - void SetPortalName(const char *PortalName); - void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid); -+ void SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int numberOfPages); - void SetCaIds(const int *CaIds); // list must be zero-terminated - void SetCaDescriptors(int Level); - void SetLinkChannels(cLinkChannels *LinkChannels); -Index: vdr/ci.c -=================================================================== ---- vdr.orig/ci.c 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/ci.c 2015-02-19 12:30:27.425069126 +0100 -@@ -2155,6 +2155,8 @@ +@@ -195,6 +211,7 @@ + bool SetName(const char *Name, const char *ShortName, const char *Provider); + bool SetPortalName(const char *PortalName); + bool SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid); ++ bool SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int numberOfPages); + bool SetCaIds(const int *CaIds); // list must be zero-terminated + bool SetCaDescriptors(int Level); + bool SetLinkChannels(cLinkChannels *LinkChannels); +--- a/ci.c ++++ b/ci.c +@@ -2147,6 +2147,8 @@ AddPid(Channel->Sid(), *Dpid, STREAM_TYPE_PRIVATE); for (const int *Spid = Channel->Spids(); *Spid; Spid++) AddPid(Channel->Sid(), *Spid, STREAM_TYPE_PRIVATE); @@ -181,7 +171,7 @@ Index: vdr/ci.c } } -@@ -2178,6 +2180,9 @@ +@@ -2170,6 +2172,9 @@ CaPmt.AddPid(*Dpid, STREAM_TYPE_PRIVATE); for (const int *Spid = Channel->Spids(); *Spid; Spid++) CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE); @@ -191,10 +181,8 @@ Index: vdr/ci.c cas->SendPMT(&CaPmt); cTimeMs Timeout(QUERY_REPLY_TIMEOUT); do { -Index: vdr/config.c -=================================================================== ---- vdr.orig/config.c 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/config.c 2015-02-19 12:30:27.425069126 +0100 +--- a/config.c ++++ b/config.c @@ -403,6 +403,7 @@ MarginStop = 10; AudioLanguages[0] = -1; @@ -203,7 +191,7 @@ Index: vdr/config.c SubtitleLanguages[0] = -1; SubtitleOffset = 0; SubtitleFgTransparency = 0; -@@ -625,6 +626,7 @@ +@@ -630,6 +631,7 @@ else if (!strcasecmp(Name, "MarginStop")) MarginStop = atoi(Value); else if (!strcasecmp(Name, "AudioLanguages")) return ParseLanguages(Value, AudioLanguages); else if (!strcasecmp(Name, "DisplaySubtitles")) DisplaySubtitles = atoi(Value); @@ -211,7 +199,7 @@ Index: vdr/config.c else if (!strcasecmp(Name, "SubtitleLanguages")) return ParseLanguages(Value, SubtitleLanguages); else if (!strcasecmp(Name, "SubtitleOffset")) SubtitleOffset = atoi(Value); else if (!strcasecmp(Name, "SubtitleFgTransparency")) SubtitleFgTransparency = atoi(Value); -@@ -751,6 +753,7 @@ +@@ -761,6 +763,7 @@ Store("MarginStop", MarginStop); StoreLanguages("AudioLanguages", AudioLanguages); Store("DisplaySubtitles", DisplaySubtitles); @@ -219,10 +207,8 @@ Index: vdr/config.c StoreLanguages("SubtitleLanguages", SubtitleLanguages); Store("SubtitleOffset", SubtitleOffset); Store("SubtitleFgTransparency", SubtitleFgTransparency); -Index: vdr/config.h -=================================================================== ---- vdr.orig/config.h 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/config.h 2015-02-19 12:30:27.425069126 +0100 +--- a/config.h ++++ b/config.h @@ -280,6 +280,7 @@ int MarginStart, MarginStop; int AudioLanguages[I18N_MAX_LANGUAGES + 1]; @@ -231,10 +217,8 @@ Index: vdr/config.h int SubtitleLanguages[I18N_MAX_LANGUAGES + 1]; int SubtitleOffset; int SubtitleFgTransparency, SubtitleBgTransparency; -Index: vdr/device.c -=================================================================== ---- vdr.orig/device.c 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/device.c 2015-02-19 12:30:27.425069126 +0100 +--- a/device.c ++++ b/device.c @@ -19,6 +19,7 @@ #include "receiver.h" #include "status.h" @@ -283,11 +267,9 @@ Index: vdr/device.c } } else if (Pid == patPmtParser.Ppid()) { -Index: vdr/device.h -=================================================================== ---- vdr.orig/device.h 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/device.h 2015-02-19 12:30:27.425069126 +0100 -@@ -602,6 +602,7 @@ +--- a/device.h ++++ b/device.h +@@ -606,6 +606,7 @@ cTsToPes tsToPesVideo; cTsToPes tsToPesAudio; cTsToPes tsToPesSubtitle; @@ -295,11 +277,9 @@ Index: vdr/device.h bool isPlayingVideo; protected: const cPatPmtParser *PatPmtParser(void) const { return &patPmtParser; } -Index: vdr/menu.c -=================================================================== ---- vdr.orig/menu.c 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/menu.c 2015-02-19 12:30:27.429069119 +0100 -@@ -3326,6 +3326,7 @@ +--- a/menu.c ++++ b/menu.c +@@ -3575,6 +3575,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)); } @@ -307,10 +287,8 @@ Index: vdr/menu.c SetCurrent(Get(current)); Display(); -Index: vdr/pat.c -=================================================================== ---- vdr.orig/pat.c 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/pat.c 2015-02-19 12:30:27.429069119 +0100 +--- a/pat.c ++++ b/pat.c @@ -12,6 +12,7 @@ #include "channels.h" #include "libsi/section.h" @@ -319,7 +297,7 @@ Index: vdr/pat.c #define PMT_SCAN_TIMEOUT 1000 // ms -@@ -426,6 +427,8 @@ +@@ -420,6 +421,8 @@ char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" }; char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" }; int Tpid = 0; @@ -328,7 +306,7 @@ Index: vdr/pat.c int NumApids = 0; int NumDpids = 0; int NumSpids = 0; -@@ -517,8 +520,21 @@ +@@ -512,8 +515,21 @@ NumSpids++; } break; @@ -351,24 +329,22 @@ Index: vdr/pat.c break; case SI::ISO639LanguageDescriptorTag: { SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d; -@@ -630,6 +646,12 @@ +@@ -625,6 +641,12 @@ } if (Setup.UpdateChannels >= 2) { - Channel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid); + ChannelsModified |= Channel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid); + if (NumTPages < MAXTXTPAGES) { + int manualPageNumber = cVDRTtxtsubsHookListener::Hook()->ManualPageNumber(Channel); + if (manualPageNumber) + TeletextSubtitlePages[NumTPages++] = tTeletextSubtitlePage(manualPageNumber); + } + Channel->SetTeletextSubtitlePages(TeletextSubtitlePages, NumTPages); - Channel->SetCaIds(CaDescriptors->CaIds()); - Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds); + ChannelsModified |= Channel->SetCaIds(CaDescriptors->CaIds()); + ChannelsModified |= Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds); } -Index: vdr/po/ca_ES.po -=================================================================== ---- vdr.orig/po/ca_ES.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/ca_ES.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1059,6 +1059,9 @@ +--- a/po/ca_ES.po ++++ b/po/ca_ES.po +@@ -1077,6 +1077,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Transpar�ncia fons subt�tols" @@ -378,11 +354,9 @@ Index: vdr/po/ca_ES.po msgid "LNB" msgstr "Configuraci� de l'LNB" -Index: vdr/po/cs_CZ.po -=================================================================== ---- vdr.orig/po/cs_CZ.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/cs_CZ.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1059,6 +1059,9 @@ +--- a/po/cs_CZ.po ++++ b/po/cs_CZ.po +@@ -1077,6 +1077,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Průhlednost pozadí titulků" @@ -392,11 +366,9 @@ Index: vdr/po/cs_CZ.po msgid "LNB" msgstr "LNB" -Index: vdr/po/da_DK.po -=================================================================== ---- vdr.orig/po/da_DK.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/da_DK.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1056,6 +1056,9 @@ +--- a/po/da_DK.po ++++ b/po/da_DK.po +@@ -1074,6 +1074,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Undertekst baggrundsgennemsigtighed" @@ -406,11 +378,9 @@ Index: vdr/po/da_DK.po msgid "LNB" msgstr "LNB" -Index: vdr/po/de_DE.po -=================================================================== ---- vdr.orig/po/de_DE.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/de_DE.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1057,6 +1057,9 @@ +--- a/po/de_DE.po ++++ b/po/de_DE.po +@@ -1075,6 +1075,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Untertitel-Transparenz Hintergrund" @@ -420,11 +390,9 @@ Index: vdr/po/de_DE.po msgid "LNB" msgstr "LNB" -Index: vdr/po/el_GR.po -=================================================================== ---- vdr.orig/po/el_GR.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/el_GR.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1056,6 +1056,9 @@ +--- a/po/el_GR.po ++++ b/po/el_GR.po +@@ -1074,6 +1074,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "" @@ -434,11 +402,9 @@ Index: vdr/po/el_GR.po msgid "LNB" msgstr "LNB" -Index: vdr/po/es_ES.po -=================================================================== ---- vdr.orig/po/es_ES.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/es_ES.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1057,6 +1057,9 @@ +--- a/po/es_ES.po ++++ b/po/es_ES.po +@@ -1075,6 +1075,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Transparencia fondo subt�tulos" @@ -448,11 +414,9 @@ Index: vdr/po/es_ES.po msgid "LNB" msgstr "LNB" -Index: vdr/po/et_EE.po -=================================================================== ---- vdr.orig/po/et_EE.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/et_EE.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1056,6 +1056,9 @@ +--- a/po/et_EE.po ++++ b/po/et_EE.po +@@ -1074,6 +1074,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Subtiitri tausta läbipaistvus" @@ -462,11 +426,9 @@ Index: vdr/po/et_EE.po msgid "LNB" msgstr "LNB" -Index: vdr/po/fi_FI.po -=================================================================== ---- vdr.orig/po/fi_FI.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/fi_FI.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1060,6 +1060,9 @@ +--- a/po/fi_FI.po ++++ b/po/fi_FI.po +@@ -1078,6 +1078,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Tekstityksen taustan läpinäkyvyys" @@ -476,11 +438,9 @@ Index: vdr/po/fi_FI.po msgid "LNB" msgstr "LNB" -Index: vdr/po/fr_FR.po -=================================================================== ---- vdr.orig/po/fr_FR.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/fr_FR.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1067,6 +1067,9 @@ +--- a/po/fr_FR.po ++++ b/po/fr_FR.po +@@ -1085,6 +1085,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Transparence du fond des sous-titres" @@ -490,11 +450,9 @@ Index: vdr/po/fr_FR.po msgid "LNB" msgstr "LNB" -Index: vdr/po/hr_HR.po -=================================================================== ---- vdr.orig/po/hr_HR.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/hr_HR.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1058,6 +1058,9 @@ +--- a/po/hr_HR.po ++++ b/po/hr_HR.po +@@ -1076,6 +1076,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Transparentnost pozadine titla" @@ -504,11 +462,9 @@ Index: vdr/po/hr_HR.po msgid "LNB" msgstr "LNB" -Index: vdr/po/hu_HU.po -=================================================================== ---- vdr.orig/po/hu_HU.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/hu_HU.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1061,6 +1061,9 @@ +--- a/po/hu_HU.po ++++ b/po/hu_HU.po +@@ -1079,6 +1079,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Felirat hátterének transzparenciája" @@ -518,11 +474,9 @@ Index: vdr/po/hu_HU.po msgid "LNB" msgstr "LNB" -Index: vdr/po/it_IT.po -=================================================================== ---- vdr.orig/po/it_IT.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/it_IT.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1062,6 +1062,9 @@ +--- a/po/it_IT.po ++++ b/po/it_IT.po +@@ -1080,6 +1080,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Trasparenza sfondo sottotitoli" @@ -532,11 +486,9 @@ Index: vdr/po/it_IT.po msgid "LNB" msgstr "LNB" -Index: vdr/po/lt_LT.po -=================================================================== ---- vdr.orig/po/lt_LT.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/lt_LT.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1056,6 +1056,9 @@ +--- a/po/lt_LT.po ++++ b/po/lt_LT.po +@@ -1074,6 +1074,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Subtitrų fono permatomumas" @@ -546,11 +498,9 @@ Index: vdr/po/lt_LT.po msgid "LNB" msgstr "Konverteris (LNB)" -Index: vdr/po/nl_NL.po -=================================================================== ---- vdr.orig/po/nl_NL.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/nl_NL.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1062,6 +1062,9 @@ +--- a/po/nl_NL.po ++++ b/po/nl_NL.po +@@ -1080,6 +1080,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Transparantie achtergrond ondertiteling" @@ -560,11 +510,9 @@ Index: vdr/po/nl_NL.po msgid "LNB" msgstr "LNB" -Index: vdr/po/nn_NO.po -=================================================================== ---- vdr.orig/po/nn_NO.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/nn_NO.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1057,6 +1057,9 @@ +--- a/po/nn_NO.po ++++ b/po/nn_NO.po +@@ -1075,6 +1075,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "" @@ -574,11 +522,9 @@ Index: vdr/po/nn_NO.po msgid "LNB" msgstr "LNB" -Index: vdr/po/pl_PL.po -=================================================================== ---- vdr.orig/po/pl_PL.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/pl_PL.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1059,6 +1059,9 @@ +--- a/po/pl_PL.po ++++ b/po/pl_PL.po +@@ -1077,6 +1077,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Prze�rocze podtytu��w: T�o" @@ -588,11 +534,9 @@ Index: vdr/po/pl_PL.po msgid "LNB" msgstr "LNB" -Index: vdr/po/pt_PT.po -=================================================================== ---- vdr.orig/po/pt_PT.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/pt_PT.po 2015-02-19 12:30:27.429069119 +0100 -@@ -1057,6 +1057,9 @@ +--- a/po/pt_PT.po ++++ b/po/pt_PT.po +@@ -1075,6 +1075,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Transpar�ncia de fundo das legendas" @@ -602,11 +546,9 @@ Index: vdr/po/pt_PT.po msgid "LNB" msgstr "LNB" -Index: vdr/po/ro_RO.po -=================================================================== ---- vdr.orig/po/ro_RO.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/ro_RO.po 2015-02-19 12:30:27.433069110 +0100 -@@ -1058,6 +1058,9 @@ +--- a/po/ro_RO.po ++++ b/po/ro_RO.po +@@ -1076,6 +1076,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Transparenţa fundalului subtitrării" @@ -616,11 +558,9 @@ Index: vdr/po/ro_RO.po msgid "LNB" msgstr "LNB" -Index: vdr/po/ru_RU.po -=================================================================== ---- vdr.orig/po/ru_RU.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/ru_RU.po 2015-02-19 12:30:27.433069110 +0100 -@@ -1057,6 +1057,9 @@ +--- a/po/ru_RU.po ++++ b/po/ru_RU.po +@@ -1075,6 +1075,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "������������ ���� ���������" @@ -630,11 +570,9 @@ Index: vdr/po/ru_RU.po msgid "LNB" msgstr "���������" -Index: vdr/po/sk_SK.po -=================================================================== ---- vdr.orig/po/sk_SK.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/sk_SK.po 2015-02-19 12:30:27.433069110 +0100 -@@ -1057,6 +1057,9 @@ +--- a/po/sk_SK.po ++++ b/po/sk_SK.po +@@ -1075,6 +1075,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Prieh�adnos� pozadia titulkov" @@ -644,11 +582,9 @@ Index: vdr/po/sk_SK.po msgid "LNB" msgstr "LNB (n�zko �umov� jednotka)" -Index: vdr/po/sl_SI.po -=================================================================== ---- vdr.orig/po/sl_SI.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/sl_SI.po 2015-02-19 12:30:27.433069110 +0100 -@@ -1057,6 +1057,9 @@ +--- a/po/sl_SI.po ++++ b/po/sl_SI.po +@@ -1075,6 +1075,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Transparentnost ozadja podnapisov" @@ -658,11 +594,9 @@ Index: vdr/po/sl_SI.po msgid "LNB" msgstr "LNB" -Index: vdr/po/sv_SE.po -=================================================================== ---- vdr.orig/po/sv_SE.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/sv_SE.po 2015-02-19 12:30:27.433069110 +0100 -@@ -1061,6 +1061,9 @@ +--- a/po/sv_SE.po ++++ b/po/sv_SE.po +@@ -1079,6 +1079,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Transparent bakgrund textremsa" @@ -672,11 +606,9 @@ Index: vdr/po/sv_SE.po msgid "LNB" msgstr "LNB" -Index: vdr/po/tr_TR.po -=================================================================== ---- vdr.orig/po/tr_TR.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/tr_TR.po 2015-02-19 12:30:27.433069110 +0100 -@@ -1056,6 +1056,9 @@ +--- a/po/tr_TR.po ++++ b/po/tr_TR.po +@@ -1074,6 +1074,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Altyaz� arka �effafl�k" @@ -686,11 +618,9 @@ Index: vdr/po/tr_TR.po msgid "LNB" msgstr "LNB" -Index: vdr/po/uk_UA.po -=================================================================== ---- vdr.orig/po/uk_UA.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/uk_UA.po 2015-02-19 12:30:27.433069110 +0100 -@@ -1057,6 +1057,9 @@ +--- a/po/uk_UA.po ++++ b/po/uk_UA.po +@@ -1075,6 +1075,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "Прозорість заднього плану субтитрів" @@ -700,11 +630,9 @@ Index: vdr/po/uk_UA.po msgid "LNB" msgstr "Конвертер" -Index: vdr/po/zh_CN.po -=================================================================== ---- vdr.orig/po/zh_CN.po 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/po/zh_CN.po 2015-02-19 12:30:27.433069110 +0100 -@@ -1058,6 +1058,9 @@ +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -1076,6 +1076,9 @@ msgid "Setup.DVB$Subtitle background transparency" msgstr "字幕背景透明度" @@ -714,11 +642,9 @@ Index: vdr/po/zh_CN.po msgid "LNB" msgstr "切换器设置" -Index: vdr/receiver.c -=================================================================== ---- vdr.orig/receiver.c 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/receiver.c 2015-02-19 12:30:27.433069110 +0100 -@@ -72,7 +72,8 @@ +--- a/receiver.c ++++ b/receiver.c +@@ -74,7 +74,8 @@ (Channel->Ppid() == Channel->Vpid() || AddPid(Channel->Ppid())) && AddPids(Channel->Apids()) && AddPids(Channel->Dpids()) && @@ -728,10 +654,8 @@ Index: vdr/receiver.c } return true; } -Index: vdr/remux.c -=================================================================== ---- vdr.orig/remux.c 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/remux.c 2015-02-19 12:30:27.433069110 +0100 +--- a/remux.c ++++ b/remux.c @@ -416,6 +416,29 @@ return i; } @@ -781,7 +705,7 @@ Index: vdr/remux.c int sl = i - SectionLength - 2 + 4; // -2 = SectionLength storage, +4 = length of CRC buf[SectionLength] |= (sl >> 8) & 0x0F; -@@ -608,6 +636,7 @@ +@@ -609,6 +637,7 @@ pmtPids[0] = 0; vpid = vtype = 0; ppid = 0; @@ -789,7 +713,7 @@ Index: vdr/remux.c } void cPatPmtParser::ParsePat(const uchar *Data, int Length) -@@ -696,11 +725,13 @@ +@@ -697,11 +726,13 @@ int NumSpids = 0; vpid = vtype = 0; ppid = 0; @@ -803,7 +727,7 @@ Index: vdr/remux.c SI::PMT::Stream stream; for (SI::Loop::Iterator it; Pmt.streamLoop.getNext(stream, it); ) { dbgpatpmt(" stream type = %02X, pid = %d", stream.getStreamType(), stream.getPid()); -@@ -799,6 +830,28 @@ +@@ -801,6 +832,28 @@ spids[NumSpids] = 0; } break; @@ -832,10 +756,8 @@ Index: vdr/remux.c case SI::ISO639LanguageDescriptorTag: { SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d; dbgpatpmt(" '%s'", ld->languageCode); -Index: vdr/remux.h -=================================================================== ---- vdr.orig/remux.h 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/remux.h 2015-02-19 12:30:27.433069110 +0100 +--- a/remux.h ++++ b/remux.h @@ -302,6 +302,7 @@ int MakeStream(uchar *Target, uchar Type, int Pid); int MakeAC3Descriptor(uchar *Target, uchar Type); @@ -852,26 +774,26 @@ Index: vdr/remux.h int apids[MAXAPIDS + 1]; // list is zero-terminated int atypes[MAXAPIDS + 1]; // list is zero-terminated char alangs[MAXAPIDS][MAXLANGCODE2]; -@@ -361,6 +363,8 @@ - uint16_t compositionPageIds[MAXSPIDS]; +@@ -362,6 +364,8 @@ uint16_t ancillaryPageIds[MAXSPIDS]; bool updatePrimaryDevice; + bool completed; + int totalTtxtSubtitlePages; + tTeletextSubtitlePage teletextSubtitlePages[MAXTXTPAGES]; protected: int SectionLength(const uchar *Data, int Length) { return (Length >= 3) ? ((int(Data[1]) & 0x0F) << 8)| Data[2] : 0; } public: -@@ -397,6 +401,9 @@ +@@ -398,6 +402,9 @@ int Vtype(void) const { return vtype; } ///< Returns the video stream type as defined by the current PMT, or 0 if no video ///< stream type has been detected, yet. + int Tpid(void) { return tpid; } + ///< Returns the teletext pid as defined by the current PMT, or 0 if no teletext + ///< pid has been detected, yet. + bool Completed(void) { return completed; } + ///< Returns true if the PMT has been completely parsed. const int *Apids(void) const { return apids; } - const int *Dpids(void) const { return dpids; } - const int *Spids(void) const { return spids; } -@@ -411,6 +418,8 @@ +@@ -414,6 +421,8 @@ uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS) ? subtitlingTypes[i] : uchar(0); } uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? compositionPageIds[i] : uint16_t(0); } uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : uint16_t(0); } @@ -880,10 +802,8 @@ Index: vdr/remux.h }; // TS to PES converter: -Index: vdr/vdr.5 -=================================================================== ---- vdr.orig/vdr.5 2015-02-19 12:30:27.437069103 +0100 -+++ vdr/vdr.5 2015-02-19 12:30:27.433069110 +0100 +--- a/vdr.5 ++++ b/vdr.5 @@ -249,6 +249,12 @@ .B ...:201;2001=deu,2002=eng:... @@ -897,10 +817,8 @@ Index: vdr/vdr.5 .TP .B Conditional access A hexadecimal integer defining how this channel can be accessed: -Index: vdr/vdrttxtsubshooks.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ vdr/vdrttxtsubshooks.c 2015-02-19 12:30:27.433069110 +0100 +--- /dev/null ++++ b/vdrttxtsubshooks.c @@ -0,0 +1,63 @@ +/* + * vdr-ttxtsubs - A plugin for the Linux Video Disk Recorder @@ -965,10 +883,8 @@ Index: vdr/vdrttxtsubshooks.c + return &gProxy; +} + -Index: vdr/vdrttxtsubshooks.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ vdr/vdrttxtsubshooks.h 2015-02-19 12:30:27.433069110 +0100 +--- /dev/null ++++ b/vdrttxtsubshooks.h @@ -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 d37b313..0e84dbb 100644 --- a/debian/patches/opt-37-x_menuorg.patch +++ b/debian/patches/opt-37-x_menuorg.patch @@ -5,10 +5,8 @@ Description: This patch is required by the MenuOrg plugin. It adds a service This is version 0.4.s of the patch Author: Tobias Grimm <[email protected]> -Index: vdr/mainmenuitemsprovider.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ vdr/mainmenuitemsprovider.h 2015-02-12 18:47:25.502258240 +0100 +--- /dev/null ++++ b/mainmenuitemsprovider.h @@ -0,0 +1,60 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder @@ -70,11 +68,9 @@ Index: vdr/mainmenuitemsprovider.h +}; + +#endif //__MAINMENUITEMSPROVIDER_H -Index: vdr/menu.c -=================================================================== ---- vdr.orig/menu.c 2015-02-12 18:47:25.510258395 +0100 -+++ vdr/menu.c 2015-02-12 18:47:25.506258317 +0100 -@@ -31,6 +31,7 @@ +--- a/menu.c ++++ b/menu.c +@@ -32,6 +32,7 @@ #include "timers.h" #include "transfer.h" #include "videodir.h" @@ -82,7 +78,7 @@ Index: vdr/menu.c #define MAXWAIT4EPGINFO 3 // seconds #define MODETIMEOUT 3 // seconds -@@ -3944,6 +3945,9 @@ +@@ -4251,6 +4252,9 @@ cancelEditingItem = NULL; stopRecordingItem = NULL; recordControlsState = 0; @@ -92,7 +88,7 @@ Index: vdr/menu.c Set(); // Initial submenus: -@@ -3972,6 +3976,29 @@ +@@ -4279,6 +4283,29 @@ SetTitle("VDR"); SetHasHotkeys(); @@ -122,7 +118,7 @@ Index: vdr/menu.c // Basic menu items: Add(new cOsdItem(hk(tr("Schedule")), osSchedule)); -@@ -3998,6 +4025,8 @@ +@@ -4305,6 +4332,8 @@ if (Commands.Count()) Add(new cOsdItem(hk(tr("Commands")), osCommands)); @@ -131,7 +127,7 @@ Index: vdr/menu.c Update(true); Display(); -@@ -4103,6 +4132,41 @@ +@@ -4409,6 +4438,41 @@ state = osEnd; } break; @@ -173,10 +169,8 @@ Index: vdr/menu.c default: switch (Key) { case kRecord: case kRed: if (!HadSubMenu) -Index: vdr/menuorgpatch.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ vdr/menuorgpatch.h 2015-02-12 18:47:25.506258317 +0100 +--- /dev/null ++++ b/menuorgpatch.h @@ -0,0 +1,100 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder diff --git a/debian/patches/opt-42-x_MainMenuHooks.patch b/debian/patches/opt-42-x_MainMenuHooks.patch index 0cb12d9..578c313 100644 --- a/debian/patches/opt-42-x_MainMenuHooks.patch +++ b/debian/patches/opt-42-x_MainMenuHooks.patch @@ -2,11 +2,9 @@ Description: This patch allows plugins to replace the VDR mainmenus "Schedule", "Channels", "Timers" and "Recordings" by a different implementation. Author: Frank Schmirler <[email protected]> -Index: vdr/menu.c -=================================================================== ---- vdr.orig/menu.c 2015-02-12 18:47:32.042384630 +0100 -+++ vdr/menu.c 2015-02-12 18:47:32.042384630 +0100 -@@ -4078,15 +4078,30 @@ +--- a/menu.c ++++ b/menu.c +@@ -4259,15 +4259,30 @@ // Initial submenus: @@ -43,7 +41,7 @@ Index: vdr/menu.c } cOsdObject *cMenuMain::PluginOsdObject(void) -@@ -4219,13 +4234,34 @@ +@@ -4400,13 +4415,34 @@ eOSState state = cOsdMenu::ProcessKey(Key); HadSubMenu |= HasSubMenu(); @@ -82,9 +80,9 @@ Index: vdr/menu.c + case osSetup: menu = new cMenuSetup; break; + case osCommands: menu = new cMenuCommands(tr("Commands"), &Commands); break; case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) { - cOsdItem *item = Get(Current()); - if (item) { -@@ -4312,6 +4348,8 @@ + if (cOsdItem *item = Get(Current())) { + cRecordControls::Stop(item->Text() + strlen(tr(STOP_RECORDING))); +@@ -4492,6 +4528,8 @@ default: break; } } @@ -93,10 +91,8 @@ Index: vdr/menu.c if (!HasSubMenu() && Update(HadSubMenu)) Display(); if (Key != kNone) { -Index: vdr/config.h -=================================================================== ---- vdr.orig/config.h 2015-02-12 18:47:32.042384630 +0100 -+++ vdr/config.h 2015-02-12 18:47:32.042384630 +0100 +--- a/config.h ++++ b/config.h @@ -36,6 +36,8 @@ // plugins to work with newer versions of the core VDR as long as no // VDR header files have changed. @@ -106,10 +102,8 @@ Index: vdr/config.h #define MAXPRIORITY 99 #define MINPRIORITY (-MAXPRIORITY) #define LIVEPRIORITY 0 // priority used when selecting a device for live viewing -Index: vdr/README.MainMenuHooks -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ vdr/README.MainMenuHooks 2015-02-12 18:47:32.042384630 +0100 +--- /dev/null ++++ b/README.MainMenuHooks @@ -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 a02ec92..14d11d5 100644 --- a/debian/patches/opt-45_yaepg.patch +++ b/debian/patches/opt-45_yaepg.patch @@ -2,48 +2,10 @@ Description: This patch is needed for the yaepg plugin. Author: [email protected] Origin: http://www.hoochvdr.info/yaepg/vdr-1.3.19-core-yaepg.diff -Index: vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c +Index: b/device.h =================================================================== ---- vdr.orig/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2015-02-12 18:47:44.802630668 +0100 -+++ vdr/PLUGINS/src/dvbsddevice/dvbsdffosd.c 2015-02-12 18:47:44.798630591 +0100 -@@ -77,6 +77,10 @@ - Cmd(OSD_SetWindow, 0, i + 1); - Cmd(OSD_Close); - } -+ if (vidWin.bpp != 0) { -+ Cmd(OSD_SetWindow, 0, MAXNUMWINDOWS); -+ Cmd(OSD_Close); -+ } - shown = false; - } - } -@@ -111,6 +115,10 @@ - Cmd(OSD_SetWindow, 0, i + 1); - Cmd(OSD_Close); - } -+ if (vidWin.bpp != 0) { -+ Cmd(OSD_SetWindow, 0, MAXNUMWINDOWS); -+ Cmd(OSD_Close); -+ } - shown = false; - } - return cOsd::SetAreas(Areas, NumAreas); -@@ -194,6 +202,11 @@ - Cmd(OSD_SetWindow, 0, i + 1); - Cmd(OSD_MoveWindow, 0, Left() + Bitmap->X0(), Top() + Bitmap->Y0()); - } -+ if (vidWin.bpp != 0) { -+ Cmd(OSD_SetWindow, 0, MAXNUMWINDOWS); -+ Cmd(OSD_OpenRaw, vidWin.bpp, vidWin.x1, vidWin.y1, -+ vidWin.x2, vidWin.y2, (void *)0); -+ } - shown = true; - } - } -Index: vdr/device.h -=================================================================== ---- vdr.orig/device.h 2015-02-12 18:47:44.802630668 +0100 -+++ vdr/device.h 2015-02-12 18:47:44.798630591 +0100 +--- a/device.h ++++ b/device.h @@ -314,12 +314,12 @@ ///< Direction (only the sign of Direction is evaluated, positive values ///< switch to higher channel numbers). @@ -58,12 +20,12 @@ Index: vdr/device.h + ///< Sets the device to the given channel (general setup). static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; } ///< Returns the number of the current channel on the primary device. - static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; } -Index: vdr/osd.c + #define DEPRECATED_SETCURRENTCHANNEL +Index: b/osd.c =================================================================== ---- vdr.orig/osd.c 2015-02-12 18:47:44.802630668 +0100 -+++ vdr/osd.c 2015-02-12 18:47:44.798630591 +0100 -@@ -1663,6 +1663,7 @@ +--- a/osd.c ++++ b/osd.c +@@ -1664,6 +1664,7 @@ } } Osds.Append(this); @@ -71,15 +33,15 @@ Index: vdr/osd.c } cOsd::~cOsd() -Index: vdr/osd.h +Index: b/osd.h =================================================================== ---- vdr.orig/osd.h 2015-02-12 18:47:44.802630668 +0100 -+++ vdr/osd.h 2015-02-12 18:48:43.191747160 +0100 -@@ -941,6 +941,7 @@ +--- a/osd.h ++++ b/osd.h +@@ -949,6 +949,7 @@ + ///< MyOsdDrawPixmap(Left() + pm->ViewPort().X(), Top() + pm->ViewPort().Y(), pm->Data(), w, h, h * d); + ///< DestroyPixmap(pm); + ///< } ++ tArea vidWin; ///< ///< If a plugin uses a derived cPixmap implementation, it needs to use that ///< type instead of cPixmapMemory. -+ tArea vidWin; - }; - - #define MAXOSDIMAGES 64 diff --git a/debian/patches/opt-60_power-saving.patch b/debian/patches/opt-60_power-saving.patch index cbde3a6..8e80224 100644 --- a/debian/patches/opt-60_power-saving.patch +++ b/debian/patches/opt-60_power-saving.patch @@ -13,7 +13,7 @@ Author: Sergey Chernyavskiy <[email protected]> SetSystemTime = 0; TimeSource = 0; TimeTransponder = 0; -@@ -618,6 +621,9 @@ +@@ -623,6 +626,9 @@ else if (!strcasecmp(Name, "PositionerSpeed")) PositionerSpeed = atoi(Value); else if (!strcasecmp(Name, "PositionerSwing")) PositionerSwing = atoi(Value); else if (!strcasecmp(Name, "PositionerLastLon")) PositionerLastLon = atoi(Value); @@ -23,7 +23,7 @@ Author: Sergey Chernyavskiy <[email protected]> else if (!strcasecmp(Name, "SetSystemTime")) SetSystemTime = atoi(Value); else if (!strcasecmp(Name, "TimeSource")) TimeSource = cSource::FromString(Value); else if (!strcasecmp(Name, "TimeTransponder")) TimeTransponder = atoi(Value); -@@ -745,6 +751,9 @@ +@@ -755,6 +761,9 @@ Store("PositionerSpeed", PositionerSpeed); Store("PositionerSwing", PositionerSwing); Store("PositionerLastLon", PositionerLastLon); @@ -57,7 +57,7 @@ Author: Sergey Chernyavskiy <[email protected]> for (int i = 0; i < MAXRECEIVERS; i++) receiver[i] = NULL; -@@ -745,6 +748,11 @@ +@@ -746,6 +749,11 @@ return result; } @@ -70,9 +70,9 @@ Author: Sergey Chernyavskiy <[email protected]> { cStatus::MsgChannelSwitch(this, 0, LiveView); @@ -779,6 +787,8 @@ + Result = scrNotAvailable; } else { - Channels.Lock(false); + // Power up the device + PowerUp(CHANNEL_SWITCH_POWERUP_TIMEOUT); // Stop section handling: @@ -196,7 +196,7 @@ Author: Sergey Chernyavskiy <[email protected]> cTSBuffer::cTSBuffer(int File, int Size, int CardIndex) --- a/device.h +++ b/device.h -@@ -822,6 +822,35 @@ +@@ -826,6 +826,35 @@ ///< Detaches all receivers from this device for this pid. virtual void DetachAllReceivers(void); ///< Detaches all receivers from this device. @@ -288,7 +288,7 @@ Author: Sergey Chernyavskiy <[email protected]> // --- cDvbSourceParam ------------------------------------------------------- class cDvbSourceParam : public cSourceParam { -@@ -1711,6 +1737,19 @@ +@@ -1712,6 +1738,19 @@ needsDetachBondedReceivers = false; } @@ -310,7 +310,7 @@ Author: Sergey Chernyavskiy <[email protected]> cList<cDvbDeviceProbe> DvbDeviceProbes; --- a/dvbdevice.h +++ b/dvbdevice.h -@@ -289,6 +289,13 @@ +@@ -290,6 +290,13 @@ virtual void CloseDvr(void); virtual bool GetTSPacket(uchar *&Data); virtual void DetachAllReceivers(void); @@ -326,7 +326,7 @@ Author: Sergey Chernyavskiy <[email protected]> // A plugin that implements a DVB device derived from cDvbDevice needs to create --- a/eitscan.c +++ b/eitscan.c -@@ -142,7 +142,8 @@ +@@ -144,7 +144,8 @@ bool AnyDeviceSwitched = false; for (int i = 0; i < cDevice::NumDevices(); i++) { cDevice *Device = cDevice::GetDevice(i); @@ -336,7 +336,7 @@ Author: Sergey Chernyavskiy <[email protected]> for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) { const cChannel *Channel = ScanData->GetChannel(); if (Channel) { -@@ -159,6 +160,10 @@ +@@ -165,6 +166,10 @@ } } //dsyslog("EIT scan: device %d source %-8s tp %5d", Device->DeviceNumber() + 1, *cSource::ToString(Channel->Source()), Channel->Transponder()); @@ -349,7 +349,7 @@ Author: Sergey Chernyavskiy <[email protected]> AnyDeviceSwitched = true; --- a/menu.c +++ b/menu.c -@@ -3631,6 +3631,12 @@ +@@ -3715,6 +3715,12 @@ Add(new cMenuEditIntxItem(tr("Setup.LNB$Positioner speed (degrees/s)"), &data.PositionerSpeed, 1, 1800, 10)); } @@ -362,7 +362,7 @@ Author: Sergey Chernyavskiy <[email protected]> SetCurrent(Get(current)); Display(); } -@@ -3639,6 +3645,7 @@ +@@ -3723,6 +3729,7 @@ { int oldDiSEqC = data.DiSEqC; int oldUsePositioner = data.UsePositioner; @@ -370,7 +370,7 @@ Author: Sergey Chernyavskiy <[email protected]> bool DeviceBondingsChanged = false; if (Key == kOk) { cString NewDeviceBondings = satCableNumbers.ToString(); -@@ -3647,7 +3654,7 @@ +@@ -3731,7 +3738,7 @@ } eOSState state = cMenuSetupBase::ProcessKey(Key); @@ -381,7 +381,7 @@ Author: Sergey Chernyavskiy <[email protected]> cDvbDevice::BondDevices(data.DeviceBondings); --- a/vdr.c +++ b/vdr.c -@@ -1444,6 +1444,12 @@ +@@ -1537,6 +1537,12 @@ ReportEpgBugFixStats(); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git _______________________________________________ pkg-vdr-dvb-changes mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-vdr-dvb-changes
