summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--patches/patch-set.1.7.15/0001-Record-teletext-subtitles.patch (renamed from patches/patch-set.1.7.14/0001-Record-teletext-subtitles.patch)44
-rw-r--r--patches/patch-set.1.7.15/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch (renamed from patches/patch-set.1.7.14/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch)124
-rw-r--r--patches/patch-set.1.7.15/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch (renamed from patches/patch-set.1.7.14/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch)28
-rw-r--r--patches/patch-set.1.7.15/0004-Decrypt-teletext-stream.patch (renamed from patches/patch-set.1.7.14/0004-Decrypt-teletext-stream.patch)4
-rw-r--r--patches/patch-set.1.7.15/0005-Capture-teletext-subtitle-pages-from-PMT.patch (renamed from patches/patch-set.1.7.14/0005-Capture-teletext-subtitle-pages-from-PMT.patch)20
-rw-r--r--patches/patch-set.1.7.15/0006-Ttxtsubs-plugin-hook.patch (renamed from patches/patch-set.1.7.14/0006-Ttxtsubs-plugin-hook.patch)22
-rw-r--r--patches/vdr-1.7.15-ttxtsubs.patch (renamed from patches/vdr-1.7.14-ttxtsubs.patch)194
7 files changed, 218 insertions, 218 deletions
diff --git a/patches/patch-set.1.7.14/0001-Record-teletext-subtitles.patch b/patches/patch-set.1.7.15/0001-Record-teletext-subtitles.patch
index a6aca63..09fd1c0 100644
--- a/patches/patch-set.1.7.14/0001-Record-teletext-subtitles.patch
+++ b/patches/patch-set.1.7.15/0001-Record-teletext-subtitles.patch
@@ -1,4 +1,4 @@
-From fd637029c261367a1112c29bbe991b7b991384f8 Mon Sep 17 00:00:00 2001
+From 067f957830a04977e090ece6bee0c188871fae7c Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Fri, 12 Feb 2010 21:55:04 +0100
Subject: [PATCH 1/6] Record teletext subtitles
@@ -13,10 +13,10 @@ Subject: [PATCH 1/6] Record teletext subtitles
6 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/channels.c b/channels.c
-index a694d54..f0b8a13 100644
+index ebc7eb1..ebb6665 100644
--- a/channels.c
+++ b/channels.c
-@@ -365,6 +365,26 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
+@@ -376,6 +376,26 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
}
}
@@ -44,7 +44,7 @@ index a694d54..f0b8a13 100644
{
if (caids[0] && caids[0] <= CA_USER_MAX)
diff --git a/channels.h b/channels.h
-index 5c9727f..905a9b4 100644
+index b867297..f9ff774 100644
--- a/channels.h
+++ b/channels.h
@@ -35,6 +35,7 @@
@@ -72,7 +72,7 @@ index 5c9727f..905a9b4 100644
class cChannel;
class cLinkChannel : public cListObject {
-@@ -113,6 +124,8 @@ private:
+@@ -115,6 +126,8 @@ private:
uint16_t compositionPageIds[MAXSPIDS];
uint16_t ancillaryPageIds[MAXSPIDS];
int tpid;
@@ -81,7 +81,7 @@ index 5c9727f..905a9b4 100644
int caids[MAXCAIDS + 1]; // list is zero-terminated
int nid;
int tid;
-@@ -160,6 +173,8 @@ public:
+@@ -164,6 +177,8 @@ public:
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; }
@@ -90,19 +90,19 @@ index 5c9727f..905a9b4 100644
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; }
-@@ -186,6 +201,7 @@ public:
+@@ -190,6 +205,7 @@ public:
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, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
+ 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);
diff --git a/pat.c b/pat.c
-index 0d084e5..684ba81 100644
+index 56ad5ae..2172729 100644
--- a/pat.c
+++ b/pat.c
-@@ -341,6 +341,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -343,6 +343,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
int Tpid = 0;
@@ -111,7 +111,7 @@ index 0d084e5..684ba81 100644
int NumApids = 0;
int NumDpids = 0;
int NumSpids = 0;
-@@ -426,8 +428,21 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -434,8 +436,21 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
NumSpids++;
}
break;
@@ -134,10 +134,10 @@ index 0d084e5..684ba81 100644
break;
case SI::ISO639LanguageDescriptorTag: {
SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-@@ -481,6 +496,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -490,6 +505,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
if (Setup.UpdateChannels >= 2) {
- Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+ Channel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
+ Channel->SetTeletextSubtitlePages(TeletextSubtitlePages, NumTPages);
Channel->SetCaIds(CaDescriptors->CaIds());
Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
@@ -157,7 +157,7 @@ index 58dda78..a2c6781 100644
return true;
}
diff --git a/remux.c b/remux.c
-index 2532c63..33b744a 100644
+index 5206544..024c7c9 100644
--- a/remux.c
+++ b/remux.c
@@ -215,6 +215,29 @@ int cPatPmtGenerator::MakeSubtitlingDescriptor(uchar *Target, const char *Langua
@@ -190,7 +190,7 @@ index 2532c63..33b744a 100644
int cPatPmtGenerator::MakeLanguageDescriptor(uchar *Target, const char *Language)
{
int i = 0;
-@@ -296,6 +319,7 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
+@@ -302,6 +325,7 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
if (Channel) {
int Vpid = Channel->Vpid();
int Ppid = Channel->Ppid();
@@ -198,7 +198,7 @@ index 2532c63..33b744a 100644
uchar *p = buf;
int i = 0;
p[i++] = 0x02; // table id
-@@ -330,6 +354,10 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
+@@ -334,6 +358,10 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
i += MakeStream(buf + i, 0x06, Channel->Spid(n));
i += MakeSubtitlingDescriptor(buf + i, Channel->Slang(n), Channel->SubtitlingType(n), Channel->CompositionPageId(n), Channel->AncillaryPageId(n));
}
@@ -209,7 +209,7 @@ index 2532c63..33b744a 100644
int sl = i - SectionLength - 2 + 4; // -2 = SectionLength storage, +4 = length of CRC
buf[SectionLength] |= (sl >> 8) & 0x0F;
-@@ -493,6 +521,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+@@ -497,6 +525,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
spids[0] = 0;
atypes[0] = 0;
dtypes[0] = 0;
@@ -218,18 +218,18 @@ index 2532c63..33b744a 100644
for (SI::Loop::Iterator it; Pmt.streamLoop.getNext(stream, it); ) {
dbgpatpmt(" stream type = %02X, pid = %d", stream.getStreamType(), stream.getPid());
diff --git a/remux.h b/remux.h
-index 1115c4a..5ee6722 100644
+index 7b62187..9cb8a7e 100644
--- a/remux.h
+++ b/remux.h
-@@ -170,6 +170,7 @@ protected:
+@@ -171,6 +171,7 @@ protected:
int MakeStream(uchar *Target, uchar Type, int Pid);
- int MakeAC3Descriptor(uchar *Target);
+ int MakeAC3Descriptor(uchar *Target, uchar Type);
int MakeSubtitlingDescriptor(uchar *Target, const char *Language, uchar SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId);
+ int MakeTeletextDescriptor(uchar *Target, const tTeletextSubtitlePage *pages, int pageCount);
int MakeLanguageDescriptor(uchar *Target, const char *Language);
int MakeCRC(uchar *Target, const uchar *Data, int Length);
void GeneratePmtPid(const cChannel *Channel);
-@@ -227,6 +228,8 @@ private:
+@@ -228,6 +229,8 @@ private:
uint16_t compositionPageIds[MAXSPIDS];
uint16_t ancillaryPageIds[MAXSPIDS];
bool updatePrimaryDevice;
@@ -239,5 +239,5 @@ index 1115c4a..5ee6722 100644
int SectionLength(const uchar *Data, int Length) { return (Length >= 3) ? ((int(Data[1]) & 0x0F) << 8)| Data[2] : 0; }
public:
--
-1.7.0
+1.7.1
diff --git a/patches/patch-set.1.7.14/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch b/patches/patch-set.1.7.15/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch
index 3571972..812a99e 100644
--- a/patches/patch-set.1.7.14/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch
+++ b/patches/patch-set.1.7.15/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch
@@ -1,4 +1,4 @@
-From e7aefd8eb168fc435318a99f267a6de4ec3281bf Mon Sep 17 00:00:00 2001
+From 4ede25d08ba25bee414020ff2b4c76590ad3f92c Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Sat, 13 Feb 2010 14:42:30 +0100
Subject: [PATCH 2/6] Added setup option to enable teletext subtitle recording
@@ -37,10 +37,10 @@ Subject: [PATCH 2/6] Added setup option to enable teletext subtitle recording
30 files changed, 84 insertions(+), 1 deletions(-)
diff --git a/MANUAL b/MANUAL
-index 3fd528f..01c98b9 100644
+index 7fae53b..6b0ae57 100644
--- a/MANUAL
+++ b/MANUAL
-@@ -725,6 +725,9 @@ Version 1.6
+@@ -730,6 +730,9 @@ Version 1.6
background transparency. By default the values as broadcast
are used.
@@ -51,7 +51,7 @@ index 3fd528f..01c98b9 100644
SLOF = 11700 The switching frequency (in MHz) between low and
diff --git a/config.c b/config.c
-index aa18ebc..351f56d 100644
+index 73b11b1..f2eebe6 100644
--- a/config.c
+++ b/config.c
@@ -333,6 +333,7 @@ cSetup::cSetup(void)
@@ -62,7 +62,7 @@ index aa18ebc..351f56d 100644
SubtitleLanguages[0] = -1;
SubtitleOffset = 0;
SubtitleFgTransparency = 0;
-@@ -523,6 +524,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
+@@ -524,6 +525,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
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);
@@ -70,7 +70,7 @@ index aa18ebc..351f56d 100644
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);
-@@ -618,6 +620,7 @@ bool cSetup::Save(void)
+@@ -620,6 +622,7 @@ bool cSetup::Save(void)
Store("MarginStop", MarginStop);
StoreLanguages("AudioLanguages", AudioLanguages);
Store("DisplaySubtitles", DisplaySubtitles);
@@ -79,7 +79,7 @@ index aa18ebc..351f56d 100644
Store("SubtitleOffset", SubtitleOffset);
Store("SubtitleFgTransparency", SubtitleFgTransparency);
diff --git a/config.h b/config.h
-index f4996bb..ed355dd 100644
+index 7041eb7..289d4b6 100644
--- a/config.h
+++ b/config.h
@@ -235,6 +235,7 @@ public:
@@ -91,10 +91,10 @@ index f4996bb..ed355dd 100644
int SubtitleOffset;
int SubtitleFgTransparency, SubtitleBgTransparency;
diff --git a/menu.c b/menu.c
-index e3b49ce..493d6ed 100644
+index 19cfabb..d2deeb3 100644
--- a/menu.c
+++ b/menu.c
-@@ -2788,6 +2788,7 @@ void cMenuSetupDVB::Setup(void)
+@@ -2790,6 +2790,7 @@ void cMenuSetupDVB::Setup(void)
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));
}
@@ -103,10 +103,10 @@ index e3b49ce..493d6ed 100644
SetCurrent(Get(current));
Display();
diff --git a/po/ca_ES.po b/po/ca_ES.po
-index 1dd35e3..af5627d 100644
+index 247113b..aba1ae3 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
-@@ -937,6 +937,9 @@ msgstr "Transpar
+@@ -943,6 +943,9 @@ msgstr "Transpar
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparncia fons subttols"
@@ -117,12 +117,12 @@ index 1dd35e3..af5627d 100644
msgstr "Configuraci de l'LNB"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
-index e8c6687..68c5202 100644
+index f6313ba..aec6f4e 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
-@@ -935,6 +935,9 @@ msgstr "Pr
+@@ -942,6 +942,9 @@ msgstr "Průhlednost písma titulků"
msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Prhlednost pozad titulk"
+ msgstr "Průhlednost pozadí titulků"
+msgid "Setup.DVB$Enable teletext support"
+msgstr ""
@@ -131,10 +131,10 @@ index e8c6687..68c5202 100644
msgstr "LNB"
diff --git a/po/da_DK.po b/po/da_DK.po
-index 580d82a..44bb590 100644
+index 40cdebd..192173d 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
-@@ -934,6 +934,9 @@ msgstr "Undertekst forgrundsgennemsigtighed"
+@@ -940,6 +940,9 @@ msgstr "Undertekst forgrundsgennemsigtighed"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Undertekst baggrundsgennemsigtighed"
@@ -145,10 +145,10 @@ index 580d82a..44bb590 100644
msgstr "LNB"
diff --git a/po/de_DE.po b/po/de_DE.po
-index 42caadc..07e96f6 100644
+index 4d4f3df..a3227a0 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
-@@ -934,6 +934,9 @@ msgstr "Untertitel-Transparenz Vordergrund"
+@@ -940,6 +940,9 @@ msgstr "Untertitel-Transparenz Vordergrund"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Untertitel-Transparenz Hintergrund"
@@ -159,10 +159,10 @@ index 42caadc..07e96f6 100644
msgstr "LNB"
diff --git a/po/el_GR.po b/po/el_GR.po
-index 344b641..4206815 100644
+index 5414ebc..913f39e 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
-@@ -934,6 +934,9 @@ msgstr ""
+@@ -940,6 +940,9 @@ msgstr ""
msgid "Setup.DVB$Subtitle background transparency"
msgstr ""
@@ -173,10 +173,10 @@ index 344b641..4206815 100644
msgstr "LNB"
diff --git a/po/es_ES.po b/po/es_ES.po
-index 4630a3b..a15e452 100644
+index 217f775..78a9491 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
-@@ -935,6 +935,9 @@ msgstr "Transparencia primer plano subt
+@@ -941,6 +941,9 @@ msgstr "Transparencia primer plano subt
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparencia fondo subttulos"
@@ -187,10 +187,10 @@ index 4630a3b..a15e452 100644
msgstr "LNB"
diff --git a/po/et_EE.po b/po/et_EE.po
-index 803a539..f834e16 100644
+index 5010dc4..af2e2d3 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
-@@ -934,6 +934,9 @@ msgstr "Subtiitri l
+@@ -940,6 +940,9 @@ msgstr "Subtiitri l
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Subtiitri tausta lbipaistvus"
@@ -201,12 +201,12 @@ index 803a539..f834e16 100644
msgstr "LNB"
diff --git a/po/fi_FI.po b/po/fi_FI.po
-index 70e4d58..f07e5f7 100644
+index cd57e7c..e6a22bf 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
-@@ -937,6 +937,9 @@ msgstr "Tekstityksen l
+@@ -943,6 +943,9 @@ msgstr "Tekstityksen läpinäkyvyys"
msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Tekstityksen taustan lpinkyvyys"
+ msgstr "Tekstityksen taustan läpinäkyvyys"
+msgid "Setup.DVB$Enable teletext support"
+msgstr "Salli teksti-TV-tuki"
@@ -215,10 +215,10 @@ index 70e4d58..f07e5f7 100644
msgstr "LNB"
diff --git a/po/fr_FR.po b/po/fr_FR.po
-index 74d8ceb..9437bb4 100644
+index 0d4cb7c..770038e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
-@@ -940,6 +940,9 @@ msgstr "Transparence de l'avant-plan"
+@@ -946,6 +946,9 @@ msgstr "Transparence de l'avant-plan"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparence du fond"
@@ -229,10 +229,10 @@ index 74d8ceb..9437bb4 100644
msgstr "LNB"
diff --git a/po/hr_HR.po b/po/hr_HR.po
-index 55912e5..60f6483 100644
+index 96ee695..51f596c 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
-@@ -936,6 +936,9 @@ msgstr "Transparentnost titla"
+@@ -942,6 +942,9 @@ msgstr "Transparentnost titla"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparentnost pozadine titla"
@@ -243,10 +243,10 @@ index 55912e5..60f6483 100644
msgstr "LNB"
diff --git a/po/hu_HU.po b/po/hu_HU.po
-index ccc10cc..51e7c0f 100644
+index a17b209..2f70812 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
-@@ -937,6 +937,9 @@ msgstr "Felirat transzparenci
+@@ -943,6 +943,9 @@ msgstr "Felirat transzparenci
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Felirat htternek transzparencija"
@@ -257,10 +257,10 @@ index ccc10cc..51e7c0f 100644
msgstr "LNB"
diff --git a/po/it_IT.po b/po/it_IT.po
-index c478284..25684ef 100644
+index 89d4237..5a055b2 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
-@@ -941,6 +941,9 @@ msgstr "Trasparenza sottotitoli"
+@@ -947,6 +947,9 @@ msgstr "Trasparenza sottotitoli"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Trasparenza sfondo sottotitoli"
@@ -271,10 +271,10 @@ index c478284..25684ef 100644
msgstr "LNB"
diff --git a/po/lt_LT.po b/po/lt_LT.po
-index d79f03f..31b2457 100644
+index 02465e6..8b5d996 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
-@@ -934,6 +934,9 @@ msgstr "Subtitrų priekinio vaizdo permatomumas"
+@@ -940,6 +940,9 @@ msgstr "Subtitrų priekinio vaizdo permatomumas"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Subtitrų fono permatomumas"
@@ -285,10 +285,10 @@ index d79f03f..31b2457 100644
msgstr "Konverteris (LNB)"
diff --git a/po/nl_NL.po b/po/nl_NL.po
-index f4d9120..e9a3679 100644
+index f570337..73a02b3 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
-@@ -938,6 +938,9 @@ msgstr "Transparantie voorgrond ondertiteling"
+@@ -944,6 +944,9 @@ msgstr "Transparantie voorgrond ondertiteling"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparantie achtergrond ondertiteling"
@@ -299,10 +299,10 @@ index f4d9120..e9a3679 100644
msgstr "LNB"
diff --git a/po/nn_NO.po b/po/nn_NO.po
-index e739b35..82b64be 100644
+index 2f40cfe..0934c9a 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
-@@ -935,6 +935,9 @@ msgstr ""
+@@ -941,6 +941,9 @@ msgstr ""
msgid "Setup.DVB$Subtitle background transparency"
msgstr ""
@@ -313,10 +313,10 @@ index e739b35..82b64be 100644
msgstr "LNB"
diff --git a/po/pl_PL.po b/po/pl_PL.po
-index 9af0227..83a4748 100644
+index 9620e1b..39057fd 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
-@@ -935,6 +935,9 @@ msgstr "Prze
+@@ -941,6 +941,9 @@ msgstr "Prze
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Przerocze podtytuw: To"
@@ -327,10 +327,10 @@ index 9af0227..83a4748 100644
msgstr "LNB"
diff --git a/po/pt_PT.po b/po/pt_PT.po
-index edea421..b1158e3 100644
+index 0510d9d..3bea1f1 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
-@@ -934,6 +934,9 @@ msgstr "Transpar
+@@ -940,6 +940,9 @@ msgstr "Transpar
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparncia de background das legendas"
@@ -341,10 +341,10 @@ index edea421..b1158e3 100644
msgstr "LNB"
diff --git a/po/ro_RO.po b/po/ro_RO.po
-index ffac7e9..32061de 100644
+index e0a2119..1d4a412 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
-@@ -937,6 +937,9 @@ msgstr "Transparen
+@@ -943,6 +943,9 @@ msgstr "Transparen
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparena fundalului subtitrrii"
@@ -355,10 +355,10 @@ index ffac7e9..32061de 100644
msgstr "LNB"
diff --git a/po/ru_RU.po b/po/ru_RU.po
-index 4409394..0182ee7 100644
+index 889b98b..89029e1 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
-@@ -935,6 +935,9 @@ msgstr "
+@@ -941,6 +941,9 @@ msgstr "
msgid "Setup.DVB$Subtitle background transparency"
msgstr " "
@@ -369,10 +369,10 @@ index 4409394..0182ee7 100644
msgstr ""
diff --git a/po/sk_SK.po b/po/sk_SK.po
-index bedb133..b240231 100644
+index 129fad3..eff0bd1 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
-@@ -935,6 +935,9 @@ msgstr "Prieh
+@@ -941,6 +941,9 @@ msgstr "Prieh
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Priehadnos pozadia titulkov"
@@ -383,10 +383,10 @@ index bedb133..b240231 100644
msgstr "LNB"
diff --git a/po/sl_SI.po b/po/sl_SI.po
-index 7f45b02..869d99b 100644
+index 9f1e806..7f2bdd7 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
-@@ -935,6 +935,9 @@ msgstr "Transparentnost podnapisov"
+@@ -941,6 +941,9 @@ msgstr "Transparentnost podnapisov"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparentnost ozadja podnapisov"
@@ -397,10 +397,10 @@ index 7f45b02..869d99b 100644
msgstr "LNB"
diff --git a/po/sv_SE.po b/po/sv_SE.po
-index 732e179..263c7ff 100644
+index e9d39dd..9c366d2 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
-@@ -937,6 +937,9 @@ msgstr "Transparent f
+@@ -943,6 +943,9 @@ msgstr "Transparent f
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparent bakgrund textremsa"
@@ -411,10 +411,10 @@ index 732e179..263c7ff 100644
msgstr "LNB"
diff --git a/po/tr_TR.po b/po/tr_TR.po
-index 1a3382c..4e2c68f 100644
+index 9acd1c1..50a6295 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
-@@ -934,6 +934,9 @@ msgstr "Altyaz
+@@ -940,6 +940,9 @@ msgstr "Altyaz
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Altyaz arka effaflk"
@@ -425,10 +425,10 @@ index 1a3382c..4e2c68f 100644
msgstr "LNB"
diff --git a/po/uk_UA.po b/po/uk_UA.po
-index a373fb5..5cec5c1 100644
+index b62fca7..25e7095 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
-@@ -934,6 +934,9 @@ msgstr "Прозорість переднього плану субтитрів"
+@@ -940,6 +940,9 @@ msgstr "Прозорість переднього плану субтитрів"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Прозорість заднього плану субтитрів"
@@ -439,10 +439,10 @@ index a373fb5..5cec5c1 100644
msgstr "Конвертер"
diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 48c4a38..580c190 100644
+index bffa301..141c362 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
-@@ -937,6 +937,9 @@ msgstr "字幕前景透明度"
+@@ -943,6 +943,9 @@ msgstr "字幕前景透明度"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "字幕背景透明度"
@@ -466,5 +466,5 @@ index a2c6781..ed28f1b 100644
return true;
}
--
-1.7.0
+1.7.1
diff --git a/patches/patch-set.1.7.14/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch b/patches/patch-set.1.7.15/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch
index f90a658..3964267 100644
--- a/patches/patch-set.1.7.14/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch
+++ b/patches/patch-set.1.7.15/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch
@@ -1,4 +1,4 @@
-From 7bcbfa881c63c68e7c9bc35132891ae8d7929d75 Mon Sep 17 00:00:00 2001
+From 261f539f0dc1d84fe7a032bac2ec16434d9851e7 Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Fri, 12 Feb 2010 21:56:41 +0100
Subject: [PATCH 3/6] Allow manual configuration of teletetxt subtitle pages in channels.conf
@@ -10,10 +10,10 @@ Subject: [PATCH 3/6] Allow manual configuration of teletetxt subtitle pages in c
3 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/channels.c b/channels.c
-index f0b8a13..878c5ef 100644
+index ebb6665..8e7e1a1 100644
--- a/channels.c
+++ b/channels.c
-@@ -368,9 +368,9 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
+@@ -379,9 +379,9 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
void cChannel::SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int numberOfPages)
{
int mod = CHANNELMOD_NONE;
@@ -25,8 +25,8 @@ index f0b8a13..878c5ef 100644
for (int i = 0; (i < numberOfPages) && (totalTtxtSubtitlePages < MAXTXTPAGES); i++) {
if (teletextSubtitlePages[totalTtxtSubtitlePages].ttxtMagazine != pages[i].ttxtMagazine ||
teletextSubtitlePages[totalTtxtSubtitlePages].ttxtPage != pages[i].ttxtPage ||
-@@ -513,11 +513,22 @@ cString cChannel::ToText(const cChannel *Channel)
- q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs);
+@@ -524,11 +524,22 @@ cString cChannel::ToText(const cChannel *Channel)
+ q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs, Channel->dtypes);
}
*q = 0;
+ const int TBufferSize = 5 + 1 + (MAXTXTPAGES * (3 + 1 + MAXLANGCODE1 + 1)) + 10; // '12345;150=deu,151=fin,...', +10: paranoia
@@ -49,7 +49,7 @@ index f0b8a13..878c5ef 100644
}
return buffer;
}
-@@ -551,8 +562,9 @@ bool cChannel::Parse(const char *s)
+@@ -562,8 +573,9 @@ bool cChannel::Parse(const char *s)
char *parambuf = NULL;
char *vpidbuf = NULL;
char *apidbuf = NULL;
@@ -60,9 +60,9 @@ index f0b8a13..878c5ef 100644
if (fields >= 9) {
if (fields == 9) {
// allow reading of old format
-@@ -635,7 +647,37 @@ bool cChannel::Parse(const char *s)
- }
+@@ -662,7 +674,37 @@ bool cChannel::Parse(const char *s)
dpids[NumDpids] = 0;
+ dtypes[NumDpids] = 0;
}
-
+ if (tpidbuf) {
@@ -99,7 +99,7 @@ index f0b8a13..878c5ef 100644
if (caidbuf) {
char *p = caidbuf;
char *q;
-@@ -672,6 +714,7 @@ bool cChannel::Parse(const char *s)
+@@ -699,6 +741,7 @@ bool cChannel::Parse(const char *s)
free(sourcebuf);
free(vpidbuf);
free(apidbuf);
@@ -108,10 +108,10 @@ index f0b8a13..878c5ef 100644
free(namebuf);
if (!GetChannelID().Valid()) {
diff --git a/channels.h b/channels.h
-index 905a9b4..be94422 100644
+index f9ff774..63c8b9c 100644
--- a/channels.h
+++ b/channels.h
-@@ -124,6 +124,7 @@ private:
+@@ -126,6 +126,7 @@ private:
uint16_t compositionPageIds[MAXSPIDS];
uint16_t ancillaryPageIds[MAXSPIDS];
int tpid;
@@ -120,10 +120,10 @@ index 905a9b4..be94422 100644
tTeletextSubtitlePage teletextSubtitlePages[MAXTXTPAGES];
int caids[MAXCAIDS + 1]; // list is zero-terminated
diff --git a/vdr.5 b/vdr.5
-index dbef7dc..001dfc3 100644
+index 68711b5..9b8ed05 100644
--- a/vdr.5
+++ b/vdr.5
-@@ -207,6 +207,13 @@ can be indicated by adding a second language code, delimited by a '+' sign, as i
+@@ -214,6 +214,13 @@ if there is an audio type.
.TP
.B TPID
The teletext PID.
@@ -138,5 +138,5 @@ index dbef7dc..001dfc3 100644
.B Conditional access
A hexadecimal integer defining how this channel can be accessed:
--
-1.7.0
+1.7.1
diff --git a/patches/patch-set.1.7.14/0004-Decrypt-teletext-stream.patch b/patches/patch-set.1.7.15/0004-Decrypt-teletext-stream.patch
index bb85adc..2a94c3e 100644
--- a/patches/patch-set.1.7.14/0004-Decrypt-teletext-stream.patch
+++ b/patches/patch-set.1.7.15/0004-Decrypt-teletext-stream.patch
@@ -1,4 +1,4 @@
-From 1f4d9228ae8b7b615c347acc3f5903fb038eb380 Mon Sep 17 00:00:00 2001
+From 30a1f608efb5dbe511b3bf0c38ab2d2ba61e2818 Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Sun, 14 Feb 2010 01:30:34 +0100
Subject: [PATCH 4/6] Decrypt teletext stream
@@ -31,5 +31,5 @@ index 6c7b031..22fda9f 100644
cTimeMs Timeout(QUERY_REPLY_TIMEOUT);
do {
--
-1.7.0
+1.7.1
diff --git a/patches/patch-set.1.7.14/0005-Capture-teletext-subtitle-pages-from-PMT.patch b/patches/patch-set.1.7.15/0005-Capture-teletext-subtitle-pages-from-PMT.patch
index 7446aed..627a327 100644
--- a/patches/patch-set.1.7.14/0005-Capture-teletext-subtitle-pages-from-PMT.patch
+++ b/patches/patch-set.1.7.15/0005-Capture-teletext-subtitle-pages-from-PMT.patch
@@ -1,4 +1,4 @@
-From 62912232e2b38a1857c0ff279bd61579b1ab85ae Mon Sep 17 00:00:00 2001
+From e4224634d1f8a3a07cf5f2c3f6e43333f0c376c7 Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Fri, 12 Feb 2010 22:06:19 +0100
Subject: [PATCH 5/6] Capture teletext subtitle pages from PMT
@@ -9,10 +9,10 @@ Subject: [PATCH 5/6] Capture teletext subtitle pages from PMT
2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/remux.c b/remux.c
-index 33b744a..31367a1 100644
+index 024c7c9..eea5c07 100644
--- a/remux.c
+++ b/remux.c
-@@ -431,6 +431,7 @@ void cPatPmtParser::Reset(void)
+@@ -435,6 +435,7 @@ void cPatPmtParser::Reset(void)
pmtPid = -1;
vpid = vtype = 0;
ppid = 0;
@@ -20,7 +20,7 @@ index 33b744a..31367a1 100644
}
void cPatPmtParser::ParsePat(const uchar *Data, int Length)
-@@ -516,6 +517,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+@@ -520,6 +521,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
int NumSpids = 0;
vpid = vtype = 0;
ppid = 0;
@@ -28,7 +28,7 @@ index 33b744a..31367a1 100644
apids[0] = 0;
dpids[0] = 0;
spids[0] = 0;
-@@ -615,6 +617,28 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+@@ -624,6 +626,28 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
spids[NumSpids]= 0;
}
break;
@@ -58,10 +58,10 @@ index 33b744a..31367a1 100644
SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
dbgpatpmt(" '%s'", ld->languageCode);
diff --git a/remux.h b/remux.h
-index 5ee6722..390236a 100644
+index 9cb8a7e..511d604 100644
--- a/remux.h
+++ b/remux.h
-@@ -216,6 +216,7 @@ private:
+@@ -217,6 +217,7 @@ private:
int vpid;
int ppid;
int vtype;
@@ -69,7 +69,7 @@ index 5ee6722..390236a 100644
int apids[MAXAPIDS + 1]; // list is zero-terminated
int atypes[MAXAPIDS + 1]; // list is zero-terminated
char alangs[MAXAPIDS][MAXLANGCODE2];
-@@ -262,6 +263,9 @@ public:
+@@ -263,6 +264,9 @@ public:
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.
@@ -79,7 +79,7 @@ index 5ee6722..390236a 100644
const int *Apids(void) const { return apids; }
const int *Dpids(void) const { return dpids; }
const int *Spids(void) const { return spids; }
-@@ -276,6 +280,7 @@ public:
+@@ -277,6 +281,7 @@ public:
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); }
@@ -88,5 +88,5 @@ index 5ee6722..390236a 100644
// TS to PES converter:
--
-1.7.0
+1.7.1
diff --git a/patches/patch-set.1.7.14/0006-Ttxtsubs-plugin-hook.patch b/patches/patch-set.1.7.15/0006-Ttxtsubs-plugin-hook.patch
index c0023cd..3bbdf82 100644
--- a/patches/patch-set.1.7.14/0006-Ttxtsubs-plugin-hook.patch
+++ b/patches/patch-set.1.7.15/0006-Ttxtsubs-plugin-hook.patch
@@ -1,4 +1,4 @@
-From 2f325a640f1d71222d3d7082776b7e1c55489bbd Mon Sep 17 00:00:00 2001
+From 4cf2bdca0d81dc419315657cea0087bd905e078f Mon Sep 17 00:00:00 2001
From: etobi <git@e-tobi.net>
Date: Sat, 13 Feb 2010 00:28:21 +0100
Subject: [PATCH 6/6] Ttxtsubs plugin hook
@@ -16,7 +16,7 @@ Subject: [PATCH 6/6] Ttxtsubs plugin hook
create mode 100644 vdrttxtsubshooks.h
diff --git a/Makefile b/Makefile
-index 31f05b0..a45b189 100644
+index d788484..f854b2e 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,8 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
@@ -29,7 +29,7 @@ index 31f05b0..a45b189 100644
DEFINES += -DREMOTE_KBD
endif
diff --git a/device.c b/device.c
-index ac4d6d4..773cf21 100644
+index 681049b..4dbd920 100644
--- a/device.c
+++ b/device.c
@@ -18,6 +18,7 @@
@@ -81,10 +81,10 @@ index ac4d6d4..773cf21 100644
}
else if (Pid == patPmtParser.Ppid()) {
diff --git a/device.h b/device.h
-index 9ce814a..426dc8f 100644
+index cb3bc2c..f531e70 100644
--- a/device.h
+++ b/device.h
-@@ -519,6 +519,7 @@ private:
+@@ -522,6 +522,7 @@ private:
cTsToPes tsToPesVideo;
cTsToPes tsToPesAudio;
cTsToPes tsToPesSubtitle;
@@ -93,7 +93,7 @@ index 9ce814a..426dc8f 100644
protected:
const cPatPmtParser *PatPmtParser(void) const { return &patPmtParser; }
diff --git a/pat.c b/pat.c
-index 684ba81..4541682 100644
+index 2172729..e313e23 100644
--- a/pat.c
+++ b/pat.c
@@ -13,6 +13,7 @@
@@ -104,10 +104,10 @@ index 684ba81..4541682 100644
#define PMT_SCAN_TIMEOUT 10 // seconds
-@@ -496,6 +497,11 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -505,6 +506,11 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
if (Setup.UpdateChannels >= 2) {
- Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+ 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)
@@ -117,10 +117,10 @@ index 684ba81..4541682 100644
Channel->SetCaIds(CaDescriptors->CaIds());
Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
diff --git a/remux.h b/remux.h
-index 390236a..7bf712e 100644
+index 511d604..6f816dc 100644
--- a/remux.h
+++ b/remux.h
-@@ -280,7 +280,8 @@ public:
+@@ -281,7 +281,8 @@ public:
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); }
@@ -252,5 +252,5 @@ index 0000000..2f97969
+
+#endif
--
-1.7.0
+1.7.1
diff --git a/patches/vdr-1.7.14-ttxtsubs.patch b/patches/vdr-1.7.15-ttxtsubs.patch
index 1c5171e..b7753a3 100644
--- a/patches/vdr-1.7.14-ttxtsubs.patch
+++ b/patches/vdr-1.7.15-ttxtsubs.patch
@@ -1,8 +1,8 @@
diff --git a/MANUAL b/MANUAL
-index 3fd528f..01c98b9 100644
+index 7fae53b..6b0ae57 100644
--- a/MANUAL
+++ b/MANUAL
-@@ -725,6 +725,9 @@ Version 1.6
+@@ -730,6 +730,9 @@ Version 1.6
background transparency. By default the values as broadcast
are used.
@@ -13,7 +13,7 @@ index 3fd528f..01c98b9 100644
SLOF = 11700 The switching frequency (in MHz) between low and
diff --git a/Makefile b/Makefile
-index 31f05b0..a45b189 100644
+index d788484..f854b2e 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,8 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
@@ -26,10 +26,10 @@ index 31f05b0..a45b189 100644
DEFINES += -DREMOTE_KBD
endif
diff --git a/channels.c b/channels.c
-index a694d54..878c5ef 100644
+index ebc7eb1..8e7e1a1 100644
--- a/channels.c
+++ b/channels.c
-@@ -365,6 +365,26 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
+@@ -376,6 +376,26 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
}
}
@@ -56,8 +56,8 @@ index a694d54..878c5ef 100644
void cChannel::SetCaIds(const int *CaIds)
{
if (caids[0] && caids[0] <= CA_USER_MAX)
-@@ -493,11 +513,22 @@ cString cChannel::ToText(const cChannel *Channel)
- q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs);
+@@ -504,11 +524,22 @@ cString cChannel::ToText(const cChannel *Channel)
+ q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs, Channel->dtypes);
}
*q = 0;
+ const int TBufferSize = 5 + 1 + (MAXTXTPAGES * (3 + 1 + MAXLANGCODE1 + 1)) + 10; // '12345;150=deu,151=fin,...', +10: paranoia
@@ -80,7 +80,7 @@ index a694d54..878c5ef 100644
}
return buffer;
}
-@@ -531,8 +562,9 @@ bool cChannel::Parse(const char *s)
+@@ -542,8 +573,9 @@ bool cChannel::Parse(const char *s)
char *parambuf = NULL;
char *vpidbuf = NULL;
char *apidbuf = NULL;
@@ -91,9 +91,9 @@ index a694d54..878c5ef 100644
if (fields >= 9) {
if (fields == 9) {
// allow reading of old format
-@@ -615,7 +647,37 @@ bool cChannel::Parse(const char *s)
- }
+@@ -642,7 +674,37 @@ bool cChannel::Parse(const char *s)
dpids[NumDpids] = 0;
+ dtypes[NumDpids] = 0;
}
-
+ if (tpidbuf) {
@@ -130,7 +130,7 @@ index a694d54..878c5ef 100644
if (caidbuf) {
char *p = caidbuf;
char *q;
-@@ -652,6 +714,7 @@ bool cChannel::Parse(const char *s)
+@@ -679,6 +741,7 @@ bool cChannel::Parse(const char *s)
free(sourcebuf);
free(vpidbuf);
free(apidbuf);
@@ -139,7 +139,7 @@ index a694d54..878c5ef 100644
free(namebuf);
if (!GetChannelID().Valid()) {
diff --git a/channels.h b/channels.h
-index 5c9727f..be94422 100644
+index b867297..63c8b9c 100644
--- a/channels.h
+++ b/channels.h
@@ -35,6 +35,7 @@
@@ -167,7 +167,7 @@ index 5c9727f..be94422 100644
class cChannel;
class cLinkChannel : public cListObject {
-@@ -113,6 +124,9 @@ private:
+@@ -115,6 +126,9 @@ private:
uint16_t compositionPageIds[MAXSPIDS];
uint16_t ancillaryPageIds[MAXSPIDS];
int tpid;
@@ -177,7 +177,7 @@ index 5c9727f..be94422 100644
int caids[MAXCAIDS + 1]; // list is zero-terminated
int nid;
int tid;
-@@ -160,6 +174,8 @@ public:
+@@ -164,6 +178,8 @@ public:
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; }
@@ -186,10 +186,10 @@ index 5c9727f..be94422 100644
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; }
-@@ -186,6 +202,7 @@ public:
+@@ -190,6 +206,7 @@ public:
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, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
+ 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);
@@ -218,7 +218,7 @@ index 6c7b031..22fda9f 100644
cTimeMs Timeout(QUERY_REPLY_TIMEOUT);
do {
diff --git a/config.c b/config.c
-index aa18ebc..351f56d 100644
+index 73b11b1..f2eebe6 100644
--- a/config.c
+++ b/config.c
@@ -333,6 +333,7 @@ cSetup::cSetup(void)
@@ -229,7 +229,7 @@ index aa18ebc..351f56d 100644
SubtitleLanguages[0] = -1;
SubtitleOffset = 0;
SubtitleFgTransparency = 0;
-@@ -523,6 +524,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
+@@ -524,6 +525,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
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);
@@ -237,7 +237,7 @@ index aa18ebc..351f56d 100644
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);
-@@ -618,6 +620,7 @@ bool cSetup::Save(void)
+@@ -620,6 +622,7 @@ bool cSetup::Save(void)
Store("MarginStop", MarginStop);
StoreLanguages("AudioLanguages", AudioLanguages);
Store("DisplaySubtitles", DisplaySubtitles);
@@ -246,7 +246,7 @@ index aa18ebc..351f56d 100644
Store("SubtitleOffset", SubtitleOffset);
Store("SubtitleFgTransparency", SubtitleFgTransparency);
diff --git a/config.h b/config.h
-index f4996bb..ed355dd 100644
+index 7041eb7..289d4b6 100644
--- a/config.h
+++ b/config.h
@@ -235,6 +235,7 @@ public:
@@ -258,7 +258,7 @@ index f4996bb..ed355dd 100644
int SubtitleOffset;
int SubtitleFgTransparency, SubtitleBgTransparency;
diff --git a/device.c b/device.c
-index ac4d6d4..773cf21 100644
+index 681049b..4dbd920 100644
--- a/device.c
+++ b/device.c
@@ -18,6 +18,7 @@
@@ -310,10 +310,10 @@ index ac4d6d4..773cf21 100644
}
else if (Pid == patPmtParser.Ppid()) {
diff --git a/device.h b/device.h
-index 9ce814a..426dc8f 100644
+index cb3bc2c..f531e70 100644
--- a/device.h
+++ b/device.h
-@@ -519,6 +519,7 @@ private:
+@@ -522,6 +522,7 @@ private:
cTsToPes tsToPesVideo;
cTsToPes tsToPesAudio;
cTsToPes tsToPesSubtitle;
@@ -322,10 +322,10 @@ index 9ce814a..426dc8f 100644
protected:
const cPatPmtParser *PatPmtParser(void) const { return &patPmtParser; }
diff --git a/menu.c b/menu.c
-index e3b49ce..493d6ed 100644
+index 19cfabb..d2deeb3 100644
--- a/menu.c
+++ b/menu.c
-@@ -2788,6 +2788,7 @@ void cMenuSetupDVB::Setup(void)
+@@ -2790,6 +2790,7 @@ void cMenuSetupDVB::Setup(void)
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));
}
@@ -334,7 +334,7 @@ index e3b49ce..493d6ed 100644
SetCurrent(Get(current));
Display();
diff --git a/pat.c b/pat.c
-index 0d084e5..4541682 100644
+index 56ad5ae..e313e23 100644
--- a/pat.c
+++ b/pat.c
@@ -13,6 +13,7 @@
@@ -345,7 +345,7 @@ index 0d084e5..4541682 100644
#define PMT_SCAN_TIMEOUT 10 // seconds
-@@ -341,6 +342,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -343,6 +344,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
int Tpid = 0;
@@ -354,7 +354,7 @@ index 0d084e5..4541682 100644
int NumApids = 0;
int NumDpids = 0;
int NumSpids = 0;
-@@ -426,8 +429,21 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -434,8 +437,21 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
NumSpids++;
}
break;
@@ -377,10 +377,10 @@ index 0d084e5..4541682 100644
break;
case SI::ISO639LanguageDescriptorTag: {
SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-@@ -481,6 +497,12 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -490,6 +506,12 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
}
if (Setup.UpdateChannels >= 2) {
- Channel->SetPids(Vpid, Ppid, Vtype, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
+ 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)
@@ -391,10 +391,10 @@ index 0d084e5..4541682 100644
Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
}
diff --git a/po/ca_ES.po b/po/ca_ES.po
-index 1dd35e3..af5627d 100644
+index 247113b..aba1ae3 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
-@@ -937,6 +937,9 @@ msgstr "Transpar
+@@ -943,6 +943,9 @@ msgstr "Transpar
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparncia fons subttols"
@@ -405,12 +405,12 @@ index 1dd35e3..af5627d 100644
msgstr "Configuraci de l'LNB"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
-index e8c6687..68c5202 100644
+index f6313ba..aec6f4e 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
-@@ -935,6 +935,9 @@ msgstr "Pr
+@@ -942,6 +942,9 @@ msgstr "Průhlednost písma titulků"
msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Prhlednost pozad titulk"
+ msgstr "Průhlednost pozadí titulků"
+msgid "Setup.DVB$Enable teletext support"
+msgstr ""
@@ -419,10 +419,10 @@ index e8c6687..68c5202 100644
msgstr "LNB"
diff --git a/po/da_DK.po b/po/da_DK.po
-index 580d82a..44bb590 100644
+index 40cdebd..192173d 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
-@@ -934,6 +934,9 @@ msgstr "Undertekst forgrundsgennemsigtighed"
+@@ -940,6 +940,9 @@ msgstr "Undertekst forgrundsgennemsigtighed"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Undertekst baggrundsgennemsigtighed"
@@ -433,10 +433,10 @@ index 580d82a..44bb590 100644
msgstr "LNB"
diff --git a/po/de_DE.po b/po/de_DE.po
-index 42caadc..07e96f6 100644
+index 4d4f3df..a3227a0 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
-@@ -934,6 +934,9 @@ msgstr "Untertitel-Transparenz Vordergrund"
+@@ -940,6 +940,9 @@ msgstr "Untertitel-Transparenz Vordergrund"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Untertitel-Transparenz Hintergrund"
@@ -447,10 +447,10 @@ index 42caadc..07e96f6 100644
msgstr "LNB"
diff --git a/po/el_GR.po b/po/el_GR.po
-index 344b641..4206815 100644
+index 5414ebc..913f39e 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
-@@ -934,6 +934,9 @@ msgstr ""
+@@ -940,6 +940,9 @@ msgstr ""
msgid "Setup.DVB$Subtitle background transparency"
msgstr ""
@@ -461,10 +461,10 @@ index 344b641..4206815 100644
msgstr "LNB"
diff --git a/po/es_ES.po b/po/es_ES.po
-index 4630a3b..a15e452 100644
+index 217f775..78a9491 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
-@@ -935,6 +935,9 @@ msgstr "Transparencia primer plano subt
+@@ -941,6 +941,9 @@ msgstr "Transparencia primer plano subt
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparencia fondo subttulos"
@@ -475,10 +475,10 @@ index 4630a3b..a15e452 100644
msgstr "LNB"
diff --git a/po/et_EE.po b/po/et_EE.po
-index 803a539..f834e16 100644
+index 5010dc4..af2e2d3 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
-@@ -934,6 +934,9 @@ msgstr "Subtiitri l
+@@ -940,6 +940,9 @@ msgstr "Subtiitri l
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Subtiitri tausta lbipaistvus"
@@ -489,12 +489,12 @@ index 803a539..f834e16 100644
msgstr "LNB"
diff --git a/po/fi_FI.po b/po/fi_FI.po
-index 70e4d58..f07e5f7 100644
+index cd57e7c..e6a22bf 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
-@@ -937,6 +937,9 @@ msgstr "Tekstityksen l
+@@ -943,6 +943,9 @@ msgstr "Tekstityksen läpinäkyvyys"
msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Tekstityksen taustan lpinkyvyys"
+ msgstr "Tekstityksen taustan läpinäkyvyys"
+msgid "Setup.DVB$Enable teletext support"
+msgstr "Salli teksti-TV-tuki"
@@ -503,10 +503,10 @@ index 70e4d58..f07e5f7 100644
msgstr "LNB"
diff --git a/po/fr_FR.po b/po/fr_FR.po
-index 74d8ceb..9437bb4 100644
+index 0d4cb7c..770038e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
-@@ -940,6 +940,9 @@ msgstr "Transparence de l'avant-plan"
+@@ -946,6 +946,9 @@ msgstr "Transparence de l'avant-plan"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparence du fond"
@@ -517,10 +517,10 @@ index 74d8ceb..9437bb4 100644
msgstr "LNB"
diff --git a/po/hr_HR.po b/po/hr_HR.po
-index 55912e5..60f6483 100644
+index 96ee695..51f596c 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
-@@ -936,6 +936,9 @@ msgstr "Transparentnost titla"
+@@ -942,6 +942,9 @@ msgstr "Transparentnost titla"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparentnost pozadine titla"
@@ -531,10 +531,10 @@ index 55912e5..60f6483 100644
msgstr "LNB"
diff --git a/po/hu_HU.po b/po/hu_HU.po
-index ccc10cc..51e7c0f 100644
+index a17b209..2f70812 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
-@@ -937,6 +937,9 @@ msgstr "Felirat transzparenci
+@@ -943,6 +943,9 @@ msgstr "Felirat transzparenci
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Felirat htternek transzparencija"
@@ -545,10 +545,10 @@ index ccc10cc..51e7c0f 100644
msgstr "LNB"
diff --git a/po/it_IT.po b/po/it_IT.po
-index c478284..25684ef 100644
+index 89d4237..5a055b2 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
-@@ -941,6 +941,9 @@ msgstr "Trasparenza sottotitoli"
+@@ -947,6 +947,9 @@ msgstr "Trasparenza sottotitoli"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Trasparenza sfondo sottotitoli"
@@ -559,10 +559,10 @@ index c478284..25684ef 100644
msgstr "LNB"
diff --git a/po/lt_LT.po b/po/lt_LT.po
-index d79f03f..31b2457 100644
+index 02465e6..8b5d996 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
-@@ -934,6 +934,9 @@ msgstr "Subtitrų priekinio vaizdo permatomumas"
+@@ -940,6 +940,9 @@ msgstr "Subtitrų priekinio vaizdo permatomumas"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Subtitrų fono permatomumas"
@@ -573,10 +573,10 @@ index d79f03f..31b2457 100644
msgstr "Konverteris (LNB)"
diff --git a/po/nl_NL.po b/po/nl_NL.po
-index f4d9120..e9a3679 100644
+index f570337..73a02b3 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
-@@ -938,6 +938,9 @@ msgstr "Transparantie voorgrond ondertiteling"
+@@ -944,6 +944,9 @@ msgstr "Transparantie voorgrond ondertiteling"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparantie achtergrond ondertiteling"
@@ -587,10 +587,10 @@ index f4d9120..e9a3679 100644
msgstr "LNB"
diff --git a/po/nn_NO.po b/po/nn_NO.po
-index e739b35..82b64be 100644
+index 2f40cfe..0934c9a 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
-@@ -935,6 +935,9 @@ msgstr ""
+@@ -941,6 +941,9 @@ msgstr ""
msgid "Setup.DVB$Subtitle background transparency"
msgstr ""
@@ -601,10 +601,10 @@ index e739b35..82b64be 100644
msgstr "LNB"
diff --git a/po/pl_PL.po b/po/pl_PL.po
-index 9af0227..83a4748 100644
+index 9620e1b..39057fd 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
-@@ -935,6 +935,9 @@ msgstr "Prze
+@@ -941,6 +941,9 @@ msgstr "Prze
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Przerocze podtytuw: To"
@@ -615,10 +615,10 @@ index 9af0227..83a4748 100644
msgstr "LNB"
diff --git a/po/pt_PT.po b/po/pt_PT.po
-index edea421..b1158e3 100644
+index 0510d9d..3bea1f1 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
-@@ -934,6 +934,9 @@ msgstr "Transpar
+@@ -940,6 +940,9 @@ msgstr "Transpar
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparncia de background das legendas"
@@ -629,10 +629,10 @@ index edea421..b1158e3 100644
msgstr "LNB"
diff --git a/po/ro_RO.po b/po/ro_RO.po
-index ffac7e9..32061de 100644
+index e0a2119..1d4a412 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
-@@ -937,6 +937,9 @@ msgstr "Transparen
+@@ -943,6 +943,9 @@ msgstr "Transparen
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparena fundalului subtitrrii"
@@ -643,10 +643,10 @@ index ffac7e9..32061de 100644
msgstr "LNB"
diff --git a/po/ru_RU.po b/po/ru_RU.po
-index 4409394..0182ee7 100644
+index 889b98b..89029e1 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
-@@ -935,6 +935,9 @@ msgstr "
+@@ -941,6 +941,9 @@ msgstr "
msgid "Setup.DVB$Subtitle background transparency"
msgstr " "
@@ -657,10 +657,10 @@ index 4409394..0182ee7 100644
msgstr ""
diff --git a/po/sk_SK.po b/po/sk_SK.po
-index bedb133..b240231 100644
+index 129fad3..eff0bd1 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
-@@ -935,6 +935,9 @@ msgstr "Prieh
+@@ -941,6 +941,9 @@ msgstr "Prieh
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Priehadnos pozadia titulkov"
@@ -671,10 +671,10 @@ index bedb133..b240231 100644
msgstr "LNB"
diff --git a/po/sl_SI.po b/po/sl_SI.po
-index 7f45b02..869d99b 100644
+index 9f1e806..7f2bdd7 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
-@@ -935,6 +935,9 @@ msgstr "Transparentnost podnapisov"
+@@ -941,6 +941,9 @@ msgstr "Transparentnost podnapisov"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparentnost ozadja podnapisov"
@@ -685,10 +685,10 @@ index 7f45b02..869d99b 100644
msgstr "LNB"
diff --git a/po/sv_SE.po b/po/sv_SE.po
-index 732e179..263c7ff 100644
+index e9d39dd..9c366d2 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
-@@ -937,6 +937,9 @@ msgstr "Transparent f
+@@ -943,6 +943,9 @@ msgstr "Transparent f
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparent bakgrund textremsa"
@@ -699,10 +699,10 @@ index 732e179..263c7ff 100644
msgstr "LNB"
diff --git a/po/tr_TR.po b/po/tr_TR.po
-index 1a3382c..4e2c68f 100644
+index 9acd1c1..50a6295 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
-@@ -934,6 +934,9 @@ msgstr "Altyaz
+@@ -940,6 +940,9 @@ msgstr "Altyaz
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Altyaz arka effaflk"
@@ -713,10 +713,10 @@ index 1a3382c..4e2c68f 100644
msgstr "LNB"
diff --git a/po/uk_UA.po b/po/uk_UA.po
-index a373fb5..5cec5c1 100644
+index b62fca7..25e7095 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
-@@ -934,6 +934,9 @@ msgstr "Прозорість переднього плану субтитрів"
+@@ -940,6 +940,9 @@ msgstr "Прозорість переднього плану субтитрів"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Прозорість заднього плану субтитрів"
@@ -727,10 +727,10 @@ index a373fb5..5cec5c1 100644
msgstr "Конвертер"
diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 48c4a38..580c190 100644
+index bffa301..141c362 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
-@@ -937,6 +937,9 @@ msgstr "字幕前景透明度"
+@@ -943,6 +943,9 @@ msgstr "字幕前景透明度"
msgid "Setup.DVB$Subtitle background transparency"
msgstr "字幕背景透明度"
@@ -755,7 +755,7 @@ index 58dda78..ed28f1b 100644
return true;
}
diff --git a/remux.c b/remux.c
-index 2532c63..31367a1 100644
+index 5206544..eea5c07 100644
--- a/remux.c
+++ b/remux.c
@@ -215,6 +215,29 @@ int cPatPmtGenerator::MakeSubtitlingDescriptor(uchar *Target, const char *Langua
@@ -788,7 +788,7 @@ index 2532c63..31367a1 100644
int cPatPmtGenerator::MakeLanguageDescriptor(uchar *Target, const char *Language)
{
int i = 0;
-@@ -296,6 +319,7 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
+@@ -302,6 +325,7 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
if (Channel) {
int Vpid = Channel->Vpid();
int Ppid = Channel->Ppid();
@@ -796,7 +796,7 @@ index 2532c63..31367a1 100644
uchar *p = buf;
int i = 0;
p[i++] = 0x02; // table id
-@@ -330,6 +354,10 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
+@@ -334,6 +358,10 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
i += MakeStream(buf + i, 0x06, Channel->Spid(n));
i += MakeSubtitlingDescriptor(buf + i, Channel->Slang(n), Channel->SubtitlingType(n), Channel->CompositionPageId(n), Channel->AncillaryPageId(n));
}
@@ -807,7 +807,7 @@ index 2532c63..31367a1 100644
int sl = i - SectionLength - 2 + 4; // -2 = SectionLength storage, +4 = length of CRC
buf[SectionLength] |= (sl >> 8) & 0x0F;
-@@ -403,6 +431,7 @@ void cPatPmtParser::Reset(void)
+@@ -407,6 +435,7 @@ void cPatPmtParser::Reset(void)
pmtPid = -1;
vpid = vtype = 0;
ppid = 0;
@@ -815,7 +815,7 @@ index 2532c63..31367a1 100644
}
void cPatPmtParser::ParsePat(const uchar *Data, int Length)
-@@ -488,11 +517,13 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+@@ -492,11 +521,13 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
int NumSpids = 0;
vpid = vtype = 0;
ppid = 0;
@@ -829,7 +829,7 @@ index 2532c63..31367a1 100644
SI::PMT::Stream stream;
for (SI::Loop::Iterator it; Pmt.streamLoop.getNext(stream, it); ) {
dbgpatpmt(" stream type = %02X, pid = %d", stream.getStreamType(), stream.getPid());
-@@ -586,6 +617,28 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+@@ -595,6 +626,28 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
spids[NumSpids]= 0;
}
break;
@@ -859,18 +859,18 @@ index 2532c63..31367a1 100644
SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
dbgpatpmt(" '%s'", ld->languageCode);
diff --git a/remux.h b/remux.h
-index 1115c4a..7bf712e 100644
+index 7b62187..6f816dc 100644
--- a/remux.h
+++ b/remux.h
-@@ -170,6 +170,7 @@ protected:
+@@ -171,6 +171,7 @@ protected:
int MakeStream(uchar *Target, uchar Type, int Pid);
- int MakeAC3Descriptor(uchar *Target);
+ int MakeAC3Descriptor(uchar *Target, uchar Type);
int MakeSubtitlingDescriptor(uchar *Target, const char *Language, uchar SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId);
+ int MakeTeletextDescriptor(uchar *Target, const tTeletextSubtitlePage *pages, int pageCount);
int MakeLanguageDescriptor(uchar *Target, const char *Language);
int MakeCRC(uchar *Target, const uchar *Data, int Length);
void GeneratePmtPid(const cChannel *Channel);
-@@ -215,6 +216,7 @@ private:
+@@ -216,6 +217,7 @@ private:
int vpid;
int ppid;
int vtype;
@@ -878,7 +878,7 @@ index 1115c4a..7bf712e 100644
int apids[MAXAPIDS + 1]; // list is zero-terminated
int atypes[MAXAPIDS + 1]; // list is zero-terminated
char alangs[MAXAPIDS][MAXLANGCODE2];
-@@ -227,6 +229,8 @@ private:
+@@ -228,6 +230,8 @@ private:
uint16_t compositionPageIds[MAXSPIDS];
uint16_t ancillaryPageIds[MAXSPIDS];
bool updatePrimaryDevice;
@@ -887,7 +887,7 @@ index 1115c4a..7bf712e 100644
protected:
int SectionLength(const uchar *Data, int Length) { return (Length >= 3) ? ((int(Data[1]) & 0x0F) << 8)| Data[2] : 0; }
public:
-@@ -259,6 +263,9 @@ public:
+@@ -260,6 +264,9 @@ public:
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.
@@ -897,7 +897,7 @@ index 1115c4a..7bf712e 100644
const int *Apids(void) const { return apids; }
const int *Dpids(void) const { return dpids; }
const int *Spids(void) const { return spids; }
-@@ -273,6 +280,8 @@ public:
+@@ -274,6 +281,8 @@ public:
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); }
@@ -907,10 +907,10 @@ index 1115c4a..7bf712e 100644
// TS to PES converter:
diff --git a/vdr.5 b/vdr.5
-index dbef7dc..001dfc3 100644
+index 68711b5..9b8ed05 100644
--- a/vdr.5
+++ b/vdr.5
-@@ -207,6 +207,13 @@ can be indicated by adding a second language code, delimited by a '+' sign, as i
+@@ -214,6 +214,13 @@ if there is an audio type.
.TP
.B TPID
The teletext PID.
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 07:57:21 +0000