Updated patch-set

6 files changed, 145 insertions, 145 deletions

diff --git a/patches/patch-set.1.7.21/0001-Record-teletext-subtitles.patch b/patches/patch-set.1.7.38/0001-Record-teletext-subtitles.patch
index 775c3b7..77f5bdd 100644
--- a/patches/patch-set.1.7.21/0001-Record-teletext-subtitles.patch
+++ b/patches/patch-set.1.7.38/0001-Record-teletext-subtitles.patch
@@ -1,4 +1,4 @@
-From be0b774e54f1bf208e5d2316cc47c806d30e36a8 Mon Sep 17 00:00:00 2001
+From a932f6d2b2569e64d7fc56b5f128917709ff5a8c 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 b9204f2..5ab31bb 100644
+index 4c04608..3eb31ce 100644
 --- a/channels.c
 +++ b/channels.c
-@@ -378,6 +378,26 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
+@@ -408,6 +408,26 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
       }
  }
  
@@ -44,7 +44,7 @@ index b9204f2..5ab31bb 100644
  {
    if (caids[0] && caids[0] <= CA_USER_MAX)
 diff --git a/channels.h b/channels.h
-index 51f9830..3fc443c 100644
+index 815cb47..dbdcb17 100644
 --- a/channels.h
 +++ b/channels.h
 @@ -35,6 +35,7 @@
@@ -81,7 +81,7 @@ index 51f9830..3fc443c 100644
    int caids[MAXCAIDS + 1]; // list is zero-terminated
    int nid;
    int tid;
-@@ -164,6 +177,8 @@ public:
+@@ -166,6 +179,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,7 +90,7 @@ index 51f9830..3fc443c 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; }
-@@ -190,6 +205,7 @@ public:
+@@ -192,6 +207,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, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
@@ -99,7 +99,7 @@ index 51f9830..3fc443c 100644
    void SetCaDescriptors(int Level);
    void SetLinkChannels(cLinkChannels *LinkChannels);
 diff --git a/pat.c b/pat.c
-index b7493ec..d2b8ce8 100644
+index a7791e2..3f89258 100644
 --- a/pat.c
 +++ b/pat.c
 @@ -343,6 +343,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
@@ -134,7 +134,7 @@ index b7493ec..d2b8ce8 100644
                                   break;
                              case SI::ISO639LanguageDescriptorTag: {
                                   SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-@@ -537,6 +552,7 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -547,6 +562,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, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
@@ -143,10 +143,10 @@ index b7493ec..d2b8ce8 100644
             Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
             }
 diff --git a/receiver.c b/receiver.c
-index 6a9ba04..1312b9b 100644
+index bde60e4..8a27b99 100644
 --- a/receiver.c
 +++ b/receiver.c
-@@ -81,7 +81,8 @@ bool cReceiver::SetPids(const cChannel *Channel)
+@@ -67,7 +67,8 @@ bool cReceiver::SetPids(const cChannel *Channel)
              (Channel->Ppid() == Channel->Vpid() || AddPid(Channel->Ppid())) &&
              AddPids(Channel->Apids()) &&
              AddPids(Channel->Dpids()) &&
@@ -154,13 +154,13 @@ index 6a9ba04..1312b9b 100644
 +            AddPids(Channel->Spids()) &&
 +            AddPid(Channel->Tpid());
       }
- return true;
+   return true;
  }
 diff --git a/remux.c b/remux.c
-index 78ab294..adec265 100644
+index 9be3078..2e31012 100644
 --- a/remux.c
 +++ b/remux.c
-@@ -219,6 +219,29 @@ int cPatPmtGenerator::MakeSubtitlingDescriptor(uchar *Target, const char *Langua
+@@ -385,6 +385,29 @@ int cPatPmtGenerator::MakeSubtitlingDescriptor(uchar *Target, const char *Langua
    return i;
  }
  
@@ -190,7 +190,7 @@ index 78ab294..adec265 100644
  int cPatPmtGenerator::MakeLanguageDescriptor(uchar *Target, const char *Language)
  {
    int i = 0;
-@@ -306,6 +329,7 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
+@@ -472,6 +495,7 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
    if (Channel) {
       int Vpid = Channel->Vpid();
       int Ppid = Channel->Ppid();
@@ -198,7 +198,7 @@ index 78ab294..adec265 100644
       uchar *p = buf;
       int i = 0;
       p[i++] = 0x02; // table id
-@@ -338,6 +362,10 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
+@@ -504,6 +528,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 78ab294..adec265 100644
  
       int sl = i - SectionLength - 2 + 4; // -2 = SectionLength storage, +4 = length of CRC
       buf[SectionLength] |= (sl >> 8) & 0x0F;
-@@ -501,6 +529,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+@@ -670,6 +698,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
       spids[0] = 0;
       atypes[0] = 0;
       dtypes[0] = 0;
@@ -218,10 +218,10 @@ index 78ab294..adec265 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 b882279..80d6afd 100644
+index 67eda4c..4cef4da 100644
 --- a/remux.h
 +++ b/remux.h
-@@ -174,6 +174,7 @@ protected:
+@@ -294,6 +294,7 @@ protected:
    int MakeStream(uchar *Target, uchar Type, int Pid);
    int MakeAC3Descriptor(uchar *Target, uchar Type);
    int MakeSubtitlingDescriptor(uchar *Target, const char *Language, uchar SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId);
@@ -229,7 +229,7 @@ index b882279..80d6afd 100644
    int MakeLanguageDescriptor(uchar *Target, const char *Language);
    int MakeCRC(uchar *Target, const uchar *Data, int Length);
    void GeneratePmtPid(const cChannel *Channel);
-@@ -231,6 +232,8 @@ private:
+@@ -353,6 +354,8 @@ private:
    uint16_t compositionPageIds[MAXSPIDS];
    uint16_t ancillaryPageIds[MAXSPIDS];
    bool updatePrimaryDevice;
@@ -239,5 +239,5 @@ index b882279..80d6afd 100644
    int SectionLength(const uchar *Data, int Length) { return (Length >= 3) ? ((int(Data[1]) & 0x0F) << 8)| Data[2] : 0; }
  public:
 -- 
-1.7.6.3
+1.7.10.4
 
diff --git a/patches/patch-set.1.7.21/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch b/patches/patch-set.1.7.38/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch
index da73b30..08a39b8 100644
--- a/patches/patch-set.1.7.21/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch
+++ b/patches/patch-set.1.7.38/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch
@@ -1,4 +1,4 @@
-From 2b3cb0d3fd76c6f4d2beb299d291cb7c0933d9e5 Mon Sep 17 00:00:00 2001
+From 380361f9a1844403ee4620748b7d971a71f14b54 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
@@ -34,27 +34,27 @@ Subject: [PATCH 2/6] Added setup option to enable teletext subtitle recording
  po/uk_UA.po |    3 +++
  po/zh_CN.po |    3 +++
  receiver.c  |    2 +-
- 30 files changed, 84 insertions(+), 1 deletions(-)
+ 30 files changed, 84 insertions(+), 1 deletion(-)
 
 diff --git a/MANUAL b/MANUAL
-index 54e166e..57b687f 100644
+index e8321a4..acd2e51 100644
 --- a/MANUAL
 +++ b/MANUAL
-@@ -730,6 +730,9 @@ Version 1.6
+@@ -756,6 +756,9 @@ Version 1.6
                           background transparency. By default the values as broadcast
                           are used.
  
-+  Record Teletext Subtitles = no
-+                         If set to 'yes', teletext subtitles will be recorded.
++  Enable teletext support = no
++                         If set to 'yes', enables teletext subtitles.
 +
    LNB:
  
-   SLOF               = 11700  The switching frequency (in MHz) between low and
+   Use DiSEqC = no        Generally turns DiSEqC support on or off.
 diff --git a/config.c b/config.c
-index 73bb00d..982bd78 100644
+index 2c87985..f105baf 100644
 --- a/config.c
 +++ b/config.c
-@@ -333,6 +333,7 @@ cSetup::cSetup(void)
+@@ -397,6 +397,7 @@ cSetup::cSetup(void)
    MarginStop = 10;
    AudioLanguages[0] = -1;
    DisplaySubtitles = 0;
@@ -62,7 +62,7 @@ index 73bb00d..982bd78 100644
    SubtitleLanguages[0] = -1;
    SubtitleOffset = 0;
    SubtitleFgTransparency = 0;
-@@ -525,6 +526,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
+@@ -601,6 +602,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 73bb00d..982bd78 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);
-@@ -621,6 +623,7 @@ bool cSetup::Save(void)
+@@ -709,6 +711,7 @@ bool cSetup::Save(void)
    Store("MarginStop",         MarginStop);
    StoreLanguages("AudioLanguages", AudioLanguages);
    Store("DisplaySubtitles",   DisplaySubtitles);
@@ -79,10 +79,10 @@ index 73bb00d..982bd78 100644
    Store("SubtitleOffset",     SubtitleOffset);
    Store("SubtitleFgTransparency", SubtitleFgTransparency);
 diff --git a/config.h b/config.h
-index c51e3df..e46b4bd 100644
+index 693e927..b5ca1a5 100644
 --- a/config.h
 +++ b/config.h
-@@ -235,6 +235,7 @@ public:
+@@ -273,6 +273,7 @@ public:
    int MarginStart, MarginStop;
    int AudioLanguages[I18N_MAX_LANGUAGES + 1];
    int DisplaySubtitles;
@@ -91,10 +91,10 @@ index c51e3df..e46b4bd 100644
    int SubtitleOffset;
    int SubtitleFgTransparency, SubtitleBgTransparency;
 diff --git a/menu.c b/menu.c
-index ef2bb46..3548ccd 100644
+index 69fe6d5..5df7fbb 100644
 --- a/menu.c
 +++ b/menu.c
-@@ -2798,6 +2798,7 @@ void cMenuSetupDVB::Setup(void)
+@@ -2840,6 +2840,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 ef2bb46..3548ccd 100644
    SetCurrent(Get(current));
    Display();
 diff --git a/po/ca_ES.po b/po/ca_ES.po
-index b104fea..1c09d79 100644
+index f1a24fc..c2e0379 100644
 --- a/po/ca_ES.po
 +++ b/po/ca_ES.po
-@@ -950,6 +950,9 @@ msgstr "Transpar
+@@ -971,6 +971,9 @@ msgstr "Transpar
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Transpar�ncia fons subt�tols"
  
@@ -117,10 +117,10 @@ index b104fea..1c09d79 100644
  msgstr "Configuraci� de l'LNB"
  
 diff --git a/po/cs_CZ.po b/po/cs_CZ.po
-index bcafac7..370609f 100644
+index a4f2515..02360b3 100644
 --- a/po/cs_CZ.po
 +++ b/po/cs_CZ.po
-@@ -949,6 +949,9 @@ msgstr "Průhlednost písma titulků"
+@@ -970,6 +970,9 @@ msgstr "Průhlednost písma titulků"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Průhlednost pozadí titulků"
  
@@ -131,10 +131,10 @@ index bcafac7..370609f 100644
  msgstr "LNB"
  
 diff --git a/po/da_DK.po b/po/da_DK.po
-index 81b11eb..5daca8d 100644
+index 511e03f..4b6b9bb 100644
 --- a/po/da_DK.po
 +++ b/po/da_DK.po
-@@ -947,6 +947,9 @@ msgstr "Undertekst forgrundsgennemsigtighed"
+@@ -968,6 +968,9 @@ msgstr "Undertekst forgrundsgennemsigtighed"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Undertekst baggrundsgennemsigtighed"
  
@@ -145,10 +145,10 @@ index 81b11eb..5daca8d 100644
  msgstr "LNB"
  
 diff --git a/po/de_DE.po b/po/de_DE.po
-index 6d5b822..0a00a5a 100644
+index 77af04a..a8c28c5 100644
 --- a/po/de_DE.po
 +++ b/po/de_DE.po
-@@ -947,6 +947,9 @@ msgstr "Untertitel-Transparenz Vordergrund"
+@@ -968,6 +968,9 @@ msgstr "Untertitel-Transparenz Vordergrund"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Untertitel-Transparenz Hintergrund"
  
@@ -159,10 +159,10 @@ index 6d5b822..0a00a5a 100644
  msgstr "LNB"
  
 diff --git a/po/el_GR.po b/po/el_GR.po
-index 9756ea7..5d4d6ea 100644
+index d0c1c7d..7d32ec6 100644
 --- a/po/el_GR.po
 +++ b/po/el_GR.po
-@@ -947,6 +947,9 @@ msgstr ""
+@@ -968,6 +968,9 @@ msgstr ""
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr ""
  
@@ -173,10 +173,10 @@ index 9756ea7..5d4d6ea 100644
  msgstr "LNB"
  
 diff --git a/po/es_ES.po b/po/es_ES.po
-index 193e75e..1f36b60 100644
+index 9e120e7..7e03fdf 100644
 --- a/po/es_ES.po
 +++ b/po/es_ES.po
-@@ -948,6 +948,9 @@ msgstr "Transparencia primer plano subt
+@@ -969,6 +969,9 @@ msgstr "Transparencia primer plano subt
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Transparencia fondo subt�tulos"
  
@@ -187,12 +187,12 @@ index 193e75e..1f36b60 100644
  msgstr "LNB"
  
 diff --git a/po/et_EE.po b/po/et_EE.po
-index 49794dd..83ff319 100644
+index ffb3c91..397d0d5 100644
 --- a/po/et_EE.po
 +++ b/po/et_EE.po
-@@ -947,6 +947,9 @@ msgstr "Subtiitri l
+@@ -968,6 +968,9 @@ msgstr "Subtiitri läbipaistvus"
  msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Subtiitri tausta l�bipaistvus"
+ msgstr "Subtiitri tausta läbipaistvus"
  
 +msgid "Setup.DVB$Enable teletext support"
 +msgstr "Teleteksti tugi"
@@ -201,10 +201,10 @@ index 49794dd..83ff319 100644
  msgstr "LNB"
  
 diff --git a/po/fi_FI.po b/po/fi_FI.po
-index b093e88..4abf6a8 100644
+index 164a376..db4b455 100644
 --- a/po/fi_FI.po
 +++ b/po/fi_FI.po
-@@ -950,6 +950,9 @@ msgstr "Tekstityksen läpinäkyvyys"
+@@ -971,6 +971,9 @@ msgstr "Tekstityksen läpinäkyvyys"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Tekstityksen taustan läpinäkyvyys"
  
@@ -215,12 +215,12 @@ index b093e88..4abf6a8 100644
  msgstr "LNB"
  
 diff --git a/po/fr_FR.po b/po/fr_FR.po
-index b5c5120..86a961a 100644
+index eaf31b1..a6a2433 100644
 --- a/po/fr_FR.po
 +++ b/po/fr_FR.po
-@@ -953,6 +953,9 @@ msgstr "Transparence de l'avant-plan"
+@@ -978,6 +978,9 @@ msgstr "Transparence de l'avant-plan des sous-titres"
  msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transparence du fond"
+ msgstr "Transparence du fond des sous-titres"
  
 +msgid "Setup.DVB$Enable teletext support"
 +msgstr ""
@@ -229,10 +229,10 @@ index b5c5120..86a961a 100644
  msgstr "LNB"
  
 diff --git a/po/hr_HR.po b/po/hr_HR.po
-index ed519a2..43f2ea5 100644
+index af63cc1..65a644a 100644
 --- a/po/hr_HR.po
 +++ b/po/hr_HR.po
-@@ -949,6 +949,9 @@ msgstr "Transparentnost titla"
+@@ -970,6 +970,9 @@ msgstr "Transparentnost titla"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Transparentnost pozadine titla"
  
@@ -243,10 +243,10 @@ index ed519a2..43f2ea5 100644
  msgstr "LNB"
  
 diff --git a/po/hu_HU.po b/po/hu_HU.po
-index 17b905f..06f4505 100644
+index a2cc9d0..00637e7 100644
 --- a/po/hu_HU.po
 +++ b/po/hu_HU.po
-@@ -950,6 +950,9 @@ msgstr "Felirat transzparenci
+@@ -971,6 +971,9 @@ msgstr "Felirat transzparenci
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Felirat h�tter�nek transzparenci�ja"
  
@@ -257,10 +257,10 @@ index 17b905f..06f4505 100644
  msgstr "LNB"
  
 diff --git a/po/it_IT.po b/po/it_IT.po
-index 501300e..e0227d3 100644
+index e6c848b..dd92b7c 100644
 --- a/po/it_IT.po
 +++ b/po/it_IT.po
-@@ -954,6 +954,9 @@ msgstr "Trasparenza sottotitoli"
+@@ -975,6 +975,9 @@ msgstr "Trasparenza sottotitoli"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Trasparenza sfondo sottotitoli"
  
@@ -271,10 +271,10 @@ index 501300e..e0227d3 100644
  msgstr "LNB"
  
 diff --git a/po/lt_LT.po b/po/lt_LT.po
-index 6cb1faa..4efc707 100644
+index e9f24ca..2e881ad 100644
 --- a/po/lt_LT.po
 +++ b/po/lt_LT.po
-@@ -947,6 +947,9 @@ msgstr "Subtitrų fonto permatomumas"
+@@ -968,6 +968,9 @@ msgstr "Subtitrų fonto permatomumas"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Subtitrų fono permatomumas"
  
@@ -285,10 +285,10 @@ index 6cb1faa..4efc707 100644
  msgstr "Konverteris (LNB)"
  
 diff --git a/po/nl_NL.po b/po/nl_NL.po
-index ae2b85e..34a71e9 100644
+index ab16a2a..ce4938d 100644
 --- a/po/nl_NL.po
 +++ b/po/nl_NL.po
-@@ -951,6 +951,9 @@ msgstr "Transparantie voorgrond ondertiteling"
+@@ -972,6 +972,9 @@ msgstr "Transparantie voorgrond ondertiteling"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Transparantie achtergrond ondertiteling"
  
@@ -299,10 +299,10 @@ index ae2b85e..34a71e9 100644
  msgstr "LNB"
  
 diff --git a/po/nn_NO.po b/po/nn_NO.po
-index 8ec8dfb..9c129ee 100644
+index 664018b..2a8df35 100644
 --- a/po/nn_NO.po
 +++ b/po/nn_NO.po
-@@ -948,6 +948,9 @@ msgstr ""
+@@ -969,6 +969,9 @@ msgstr ""
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr ""
  
@@ -313,10 +313,10 @@ index 8ec8dfb..9c129ee 100644
  msgstr "LNB"
  
 diff --git a/po/pl_PL.po b/po/pl_PL.po
-index a5c1b47..9645eca 100644
+index 1580b0b..b0ecc72 100644
 --- a/po/pl_PL.po
 +++ b/po/pl_PL.po
-@@ -948,6 +948,9 @@ msgstr "Prze
+@@ -969,6 +969,9 @@ msgstr "Prze
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Prze�rocze podtytu��w: T�o"
  
@@ -327,10 +327,10 @@ index a5c1b47..9645eca 100644
  msgstr "LNB"
  
 diff --git a/po/pt_PT.po b/po/pt_PT.po
-index c443312..3c108ea 100644
+index 9dec287..4947fb0 100644
 --- a/po/pt_PT.po
 +++ b/po/pt_PT.po
-@@ -948,6 +948,9 @@ msgstr "Transpar
+@@ -969,6 +969,9 @@ msgstr "Transpar
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Transpar�ncia de fundo das legendas"
  
@@ -341,12 +341,12 @@ index c443312..3c108ea 100644
  msgstr "LNB"
  
 diff --git a/po/ro_RO.po b/po/ro_RO.po
-index f8c5a1e..35ec9ec 100644
+index 4c257ad..77e47f8 100644
 --- a/po/ro_RO.po
 +++ b/po/ro_RO.po
-@@ -950,6 +950,9 @@ msgstr "Transparen
+@@ -970,6 +970,9 @@ msgstr "Transparenţa prim-planului subtitrării"
  msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transparen�a fundalului subtitr�rii"
+ msgstr "Transparenţa fundalului subtitrării"
  
 +msgid "Setup.DVB$Enable teletext support"
 +msgstr ""
@@ -355,10 +355,10 @@ index f8c5a1e..35ec9ec 100644
  msgstr "LNB"
  
 diff --git a/po/ru_RU.po b/po/ru_RU.po
-index e683b8b..b90e565 100644
+index 9bcf571..194c232 100644
 --- a/po/ru_RU.po
 +++ b/po/ru_RU.po
-@@ -948,6 +948,9 @@ msgstr "
+@@ -969,6 +969,9 @@ msgstr "
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "������������ ���� ���������"
  
@@ -369,10 +369,10 @@ index e683b8b..b90e565 100644
  msgstr "���������"
  
 diff --git a/po/sk_SK.po b/po/sk_SK.po
-index 46edef5..aabb641 100644
+index 6aea45c..26fbe99 100644
 --- a/po/sk_SK.po
 +++ b/po/sk_SK.po
-@@ -947,6 +947,9 @@ msgstr "Prieh
+@@ -968,6 +968,9 @@ msgstr "Prieh
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Prieh�adnos� pozadia titulkov"
  
@@ -383,10 +383,10 @@ index 46edef5..aabb641 100644
  msgstr "LNB"
  
 diff --git a/po/sl_SI.po b/po/sl_SI.po
-index 89c6923..8ef4387 100644
+index 6c6abb5..248894d 100644
 --- a/po/sl_SI.po
 +++ b/po/sl_SI.po
-@@ -948,6 +948,9 @@ msgstr "Transparentnost podnapisov"
+@@ -969,6 +969,9 @@ msgstr "Transparentnost podnapisov"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Transparentnost ozadja podnapisov"
  
@@ -397,10 +397,10 @@ index 89c6923..8ef4387 100644
  msgstr "LNB"
  
 diff --git a/po/sv_SE.po b/po/sv_SE.po
-index 150f95e..020c64d 100644
+index b5df87d..b7cbf83 100644
 --- a/po/sv_SE.po
 +++ b/po/sv_SE.po
-@@ -950,6 +950,9 @@ msgstr "Transparent f
+@@ -971,6 +971,9 @@ msgstr "Transparent f
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Transparent bakgrund textremsa"
  
@@ -411,10 +411,10 @@ index 150f95e..020c64d 100644
  msgstr "LNB"
  
 diff --git a/po/tr_TR.po b/po/tr_TR.po
-index 194943b..338c649 100644
+index 30e3fbd..45c79a5 100644
 --- a/po/tr_TR.po
 +++ b/po/tr_TR.po
-@@ -947,6 +947,9 @@ msgstr "Altyaz
+@@ -968,6 +968,9 @@ msgstr "Altyaz
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Altyaz� arka �effafl�k"
  
@@ -425,10 +425,10 @@ index 194943b..338c649 100644
  msgstr "LNB"
  
 diff --git a/po/uk_UA.po b/po/uk_UA.po
-index 433ec70..c0a7947 100644
+index 82b8d2a..5484634 100644
 --- a/po/uk_UA.po
 +++ b/po/uk_UA.po
-@@ -947,6 +947,9 @@ msgstr "Прозорість переднього плану субтитрів"
+@@ -969,6 +969,9 @@ msgstr "Прозорість переднього плану субтитрів"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "Прозорість заднього плану субтитрів"
  
@@ -439,10 +439,10 @@ index 433ec70..c0a7947 100644
  msgstr "Конвертер"
  
 diff --git a/po/zh_CN.po b/po/zh_CN.po
-index c28fe88..8a594e3 100644
+index 3f4a6c6..6724c9c 100644
 --- a/po/zh_CN.po
 +++ b/po/zh_CN.po
-@@ -950,6 +950,9 @@ msgstr "字幕前景透明度"
+@@ -971,6 +971,9 @@ msgstr "字幕前景透明度"
  msgid "Setup.DVB$Subtitle background transparency"
  msgstr "字幕背景透明度"
  
@@ -453,18 +453,18 @@ index c28fe88..8a594e3 100644
  msgstr "切换器设置"
  
 diff --git a/receiver.c b/receiver.c
-index 1312b9b..a5c8967 100644
+index 8a27b99..fa9c436 100644
 --- a/receiver.c
 +++ b/receiver.c
-@@ -82,7 +82,7 @@ bool cReceiver::SetPids(const cChannel *Channel)
+@@ -68,7 +68,7 @@ bool cReceiver::SetPids(const cChannel *Channel)
              AddPids(Channel->Apids()) &&
              AddPids(Channel->Dpids()) &&
              AddPids(Channel->Spids()) &&
 -            AddPid(Channel->Tpid());
 +            (!Setup.SupportTeletext || AddPid(Channel->Tpid()));
       }
- return true;
+   return true;
  }
 -- 
-1.7.6.3
+1.7.10.4
 
diff --git a/patches/patch-set.1.7.21/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch b/patches/patch-set.1.7.38/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch
index e772f77..5c6879c 100644
--- a/patches/patch-set.1.7.21/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch
+++ b/patches/patch-set.1.7.38/0003-Allow-manual-configuration-of-teletetxt-subtitle-pag.patch
@@ -1,4 +1,4 @@
-From 88c023f4fc9025de7b1d98ae1bd4523378b012fb Mon Sep 17 00:00:00 2001
+From 81f20bc05af9fc4a6d79aeb028c2e3f2aad22685 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
@@ -11,10 +11,10 @@ Subject: [PATCH 3/6] Allow manual configuration of teletetxt subtitle pages
  3 files changed, 43 insertions(+), 3 deletions(-)
 
 diff --git a/channels.c b/channels.c
-index 5ab31bb..44d4be2 100644
+index 3eb31ce..a7f69a9 100644
 --- a/channels.c
 +++ b/channels.c
-@@ -381,9 +381,9 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
+@@ -411,9 +411,9 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
  void cChannel::SetTeletextSubtitlePages(tTeletextSubtitlePage pages[], int numberOfPages)
  {
    int mod = CHANNELMOD_NONE;
@@ -26,7 +26,7 @@ index 5ab31bb..44d4be2 100644
    for (int i = 0; (i < numberOfPages) && (totalTtxtSubtitlePages < MAXTXTPAGES); i++) {
        if (teletextSubtitlePages[totalTtxtSubtitlePages].ttxtMagazine != pages[i].ttxtMagazine ||
            teletextSubtitlePages[totalTtxtSubtitlePages].ttxtPage != pages[i].ttxtPage ||
-@@ -526,10 +526,17 @@ cString cChannel::ToText(const cChannel *Channel)
+@@ -556,10 +556,17 @@ cString cChannel::ToText(const cChannel *Channel)
          q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs, Channel->dtypes);
          }
       *q = 0;
@@ -45,7 +45,7 @@ index 5ab31bb..44d4be2 100644
       if (Channel->spids[0]) {
          *q++ = ';';
          q += IntArrayToString(q, Channel->spids, 10, Channel->slangs);
-@@ -698,6 +705,32 @@ bool cChannel::Parse(const char *s)
+@@ -730,6 +737,32 @@ bool cChannel::Parse(const char *s)
                      }
                spids[NumSpids] = 0;
                }
@@ -79,7 +79,7 @@ index 5ab31bb..44d4be2 100644
                return false;
             if (caidbuf) {
 diff --git a/channels.h b/channels.h
-index 3fc443c..6e7367f 100644
+index dbdcb17..b407672 100644
 --- a/channels.h
 +++ b/channels.h
 @@ -126,6 +126,7 @@ private:
@@ -91,10 +91,10 @@ index 3fc443c..6e7367f 100644
    tTeletextSubtitlePage teletextSubtitlePages[MAXTXTPAGES];
    int caids[MAXCAIDS + 1]; // list is zero-terminated
 diff --git a/vdr.5 b/vdr.5
-index c46a2bf..96e142a 100644
+index 4003a5e..cb1552d 100644
 --- a/vdr.5
 +++ b/vdr.5
-@@ -225,6 +225,12 @@ by an '=' sign, as in
+@@ -233,6 +233,12 @@ by an '=' sign, as in
  
  .B ...:201;2001=deu,2002=eng:...
  
@@ -108,5 +108,5 @@ index c46a2bf..96e142a 100644
  .B Conditional access
  A hexadecimal integer defining how this channel can be accessed:
 -- 
-1.7.6.3
+1.7.10.4
 
diff --git a/patches/patch-set.1.7.21/0004-Decrypt-teletext-stream.patch b/patches/patch-set.1.7.38/0004-Decrypt-teletext-stream.patch
index 9abaede..c79667d 100644
--- a/patches/patch-set.1.7.21/0004-Decrypt-teletext-stream.patch
+++ b/patches/patch-set.1.7.38/0004-Decrypt-teletext-stream.patch
@@ -1,17 +1,17 @@
-From e2833f1f09f24154b664e956ae31bcae6d101ce9 Mon Sep 17 00:00:00 2001
+From 71d770ce0c87238044a34dfc6fd4d25846e2eeb6 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
 
 ---
  ci.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
 
 diff --git a/ci.c b/ci.c
-index 59d62ef..b024f67 100644
+index 9a4a829..ec84027 100644
 --- a/ci.c
 +++ b/ci.c
-@@ -1913,6 +1913,8 @@ void cCamSlot::AddChannel(const cChannel *Channel)
+@@ -1914,6 +1914,8 @@ void cCamSlot::AddChannel(const cChannel *Channel)
           AddPid(Channel->Sid(), *Dpid, STREAM_TYPE_PRIVATE);
       for (const int *Spid = Channel->Spids(); *Spid; Spid++)
           AddPid(Channel->Sid(), *Spid, STREAM_TYPE_PRIVATE);
@@ -20,10 +20,10 @@ index 59d62ef..b024f67 100644
       }
  }
  
-@@ -1936,6 +1938,9 @@ bool cCamSlot::CanDecrypt(const cChannel *Channel)
+@@ -1937,6 +1939,9 @@ bool cCamSlot::CanDecrypt(const cChannel *Channel)
           CaPmt.AddPid(*Dpid, STREAM_TYPE_PRIVATE);
       for (const int *Spid = Channel->Spids(); *Spid; Spid++)
-          CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE); 
+          CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE);
 +     if (Channel->Tpid() && Setup.SupportTeletext) {
 +        CaPmt.AddPid(Channel->Tpid(), STREAM_TYPE_PRIVATE);
 +        }
@@ -31,5 +31,5 @@ index 59d62ef..b024f67 100644
       cTimeMs Timeout(QUERY_REPLY_TIMEOUT);
       do {
 -- 
-1.7.6.3
+1.7.10.4
 
diff --git a/patches/patch-set.1.7.21/0005-Capture-teletext-subtitle-pages-from-PMT.patch b/patches/patch-set.1.7.38/0005-Capture-teletext-subtitle-pages-from-PMT.patch
index 1600431..e2c088a 100644
--- a/patches/patch-set.1.7.21/0005-Capture-teletext-subtitle-pages-from-PMT.patch
+++ b/patches/patch-set.1.7.38/0005-Capture-teletext-subtitle-pages-from-PMT.patch
@@ -1,4 +1,4 @@
-From 9960c81bed0689a397f8a3b9e3de91a3f75e5237 Mon Sep 17 00:00:00 2001
+From 8061253a177218ffea0b7a823a8a2f742a033290 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
@@ -6,21 +6,21 @@ Subject: [PATCH 5/6] Capture teletext subtitle pages from PMT
 ---
  remux.c |   24 ++++++++++++++++++++++++
  remux.h |    5 +++++
- 2 files changed, 29 insertions(+), 0 deletions(-)
+ 2 files changed, 29 insertions(+)
 
 diff --git a/remux.c b/remux.c
-index adec265..4f9950f 100644
+index 2e31012..3c7a156 100644
 --- a/remux.c
 +++ b/remux.c
-@@ -439,6 +439,7 @@ void cPatPmtParser::Reset(void)
-   pmtPid = -1;
+@@ -605,6 +605,7 @@ void cPatPmtParser::Reset(void)
+   pmtPids[0] = 0;
    vpid = vtype = 0;
    ppid = 0;
 +  tpid = 0;
  }
  
  void cPatPmtParser::ParsePat(const uchar *Data, int Length)
-@@ -524,6 +525,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+@@ -693,6 +694,7 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
       int NumSpids = 0;
       vpid = vtype = 0;
       ppid = 0;
@@ -28,7 +28,7 @@ index adec265..4f9950f 100644
       apids[0] = 0;
       dpids[0] = 0;
       spids[0] = 0;
-@@ -628,6 +630,28 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+@@ -797,6 +799,28 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
                                      spids[NumSpids]= 0;
                                      }
                                   break;
@@ -58,10 +58,10 @@ index adec265..4f9950f 100644
                                   SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
                                   dbgpatpmt(" '%s'", ld->languageCode);
 diff --git a/remux.h b/remux.h
-index 80d6afd..5f15dfe 100644
+index 4cef4da..203ed34 100644
 --- a/remux.h
 +++ b/remux.h
-@@ -220,6 +220,7 @@ private:
+@@ -342,6 +342,7 @@ private:
    int vpid;
    int ppid;
    int vtype;
@@ -69,7 +69,7 @@ index 80d6afd..5f15dfe 100644
    int apids[MAXAPIDS + 1]; // list is zero-terminated
    int atypes[MAXAPIDS + 1]; // list is zero-terminated
    char alangs[MAXAPIDS][MAXLANGCODE2];
-@@ -266,6 +267,9 @@ public:
+@@ -392,6 +393,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 80d6afd..5f15dfe 100644
    const int *Apids(void) const { return apids; }
    const int *Dpids(void) const { return dpids; }
    const int *Spids(void) const { return spids; }
-@@ -280,6 +284,7 @@ public:
+@@ -406,6 +410,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 80d6afd..5f15dfe 100644
  
  // TS to PES converter:
 -- 
-1.7.6.3
+1.7.10.4
 
diff --git a/patches/patch-set.1.7.21/0006-Ttxtsubs-plugin-hook.patch b/patches/patch-set.1.7.38/0006-Ttxtsubs-plugin-hook.patch
index a650660..5a0f2ed 100644
--- a/patches/patch-set.1.7.21/0006-Ttxtsubs-plugin-hook.patch
+++ b/patches/patch-set.1.7.38/0006-Ttxtsubs-plugin-hook.patch
@@ -1,35 +1,35 @@
-From a87fe8b8dbc21e308d2cd0d3547b77133ac0e149 Mon Sep 17 00:00:00 2001
+From 65dd31959d30d9427f9427d7fd5f2e991ddd64d8 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
 
 ---
- Makefile           |    2 +
- device.c           |   20 ++++++++++++++++
+ Makefile           |    2 ++
+ device.c           |   20 +++++++++++++++++
  device.h           |    1 +
  pat.c              |    6 +++++
- remux.h            |    3 +-
+ remux.h            |    3 ++-
  vdrttxtsubshooks.c |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  vdrttxtsubshooks.h |   46 ++++++++++++++++++++++++++++++++++++++
- 7 files changed, 140 insertions(+), 1 deletions(-)
+ 7 files changed, 140 insertions(+), 1 deletion(-)
  create mode 100644 vdrttxtsubshooks.c
  create mode 100644 vdrttxtsubshooks.h
 
 diff --git a/Makefile b/Makefile
-index 18d7eb9..3da4382 100644
+index db59754..d6afb7e 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -45,6 +45,8 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
-        skinclassic.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
+@@ -73,6 +73,8 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
+        skinclassic.o skinlcars.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
         timers.o tools.o transfer.o vdr.o videodir.o
  
 +OBJS += vdrttxtsubshooks.o
 +
- ifndef NO_KBD
- DEFINES += -DREMOTE_KBD
- endif
+ DEFINES  += $(CDEFINES)
+ INCLUDES += $(CINCLUDES)
+ 
 diff --git a/device.c b/device.c
-index ba098d8..84bdd30 100644
+index ca897b0..f22c6eb 100644
 --- a/device.c
 +++ b/device.c
 @@ -18,6 +18,7 @@
@@ -40,7 +40,7 @@ index ba098d8..84bdd30 100644
  
  // --- cLiveSubtitle ---------------------------------------------------------
  
-@@ -1250,6 +1251,13 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
+@@ -1313,6 +1314,13 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
                    }
                 break;
            case 0xBD: { // private stream 1
@@ -54,7 +54,7 @@ index ba098d8..84bdd30 100644
                 int PayloadOffset = Data[8] + 9;
  
                 // Compatibility mode for old subtitles plugin:
-@@ -1409,6 +1417,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
+@@ -1472,6 +1480,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
       tsToPesVideo.Reset();
       tsToPesAudio.Reset();
       tsToPesSubtitle.Reset();
@@ -62,7 +62,7 @@ index ba098d8..84bdd30 100644
       }
    else if (Length < TS_SIZE) {
       esyslog("ERROR: skipped %d bytes of TS fragment", Length);
-@@ -1454,6 +1463,17 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
+@@ -1517,6 +1526,17 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
                      if (!VideoOnly || HasIBPTrickSpeed())
                         PlayTsSubtitle(Data, TS_SIZE);
                      }
@@ -81,10 +81,10 @@ index ba098d8..84bdd30 100644
                }
             else if (Pid == patPmtParser.Ppid()) {
 diff --git a/device.h b/device.h
-index fd587a8..078f080 100644
+index fd010d4..41d410c 100644
 --- a/device.h
 +++ b/device.h
-@@ -538,6 +538,7 @@ private:
+@@ -584,6 +584,7 @@ private:
    cTsToPes tsToPesVideo;
    cTsToPes tsToPesAudio;
    cTsToPes tsToPesSubtitle;
@@ -93,7 +93,7 @@ index fd587a8..078f080 100644
  protected:
    const cPatPmtParser *PatPmtParser(void) const { return &patPmtParser; }
 diff --git a/pat.c b/pat.c
-index d2b8ce8..9262491 100644
+index 3f89258..d9731f8 100644
 --- a/pat.c
 +++ b/pat.c
 @@ -13,6 +13,7 @@
@@ -104,7 +104,7 @@ index d2b8ce8..9262491 100644
  
  #define PMT_SCAN_TIMEOUT  10 // seconds
  
-@@ -552,6 +553,11 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -562,6 +563,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, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
@@ -117,10 +117,10 @@ index d2b8ce8..9262491 100644
             Channel->SetCaIds(CaDescriptors->CaIds());
             Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
 diff --git a/remux.h b/remux.h
-index 5f15dfe..4af51e5 100644
+index 203ed34..396f41d 100644
 --- a/remux.h
 +++ b/remux.h
-@@ -284,7 +284,8 @@ public:
+@@ -410,7 +410,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); }
@@ -136,7 +136,7 @@ index 0000000..2471788
 --- /dev/null
 +++ b/vdrttxtsubshooks.c
 @@ -0,0 +1,63 @@
-+/*                                                                  -*- c++ -*-
++/*
 + * vdr-ttxtsubs - A plugin for the Linux Video Disk Recorder
 + * Copyright (c) 2003 - 2008 Ragnar Sundblad <ragge@nada.kth.se>
 + *
@@ -204,8 +204,8 @@ new file mode 100644
 index 0000000..2f97969
 --- /dev/null
 +++ b/vdrttxtsubshooks.h
-@@ -0,1 +1,46 @@
-+/*                                                                  -*- c++ -*-
+@@ -0,0 +1,46 @@
++/*
 + * vdr-ttxtsubs - A plugin for the Linux Video Disk Recorder
 + * Copyright (c) 2003 - 2008 Ragnar Sundblad <ragge@nada.kth.se>
 + *
@@ -252,5 +252,5 @@ index 0000000..2f97969
 +
 +#endif
 -- 
-1.7.6.3
+1.7.10.4