Updated patch-set

1 files changed, 0 insertions, 470 deletions

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.21/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch
deleted file mode 100644
index da73b30..0000000
--- a/patches/patch-set.1.7.21/0002-Added-setup-option-to-enable-teletext-subtitle-recor.patch
+++ /dev/null
@@ -1,470 +0,0 @@
-From 2b3cb0d3fd76c6f4d2beb299d291cb7c0933d9e5 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
-
----
- MANUAL      |    3 +++
- config.c    |    3 +++
- config.h    |    1 +
- menu.c      |    1 +
- po/ca_ES.po |    3 +++
- po/cs_CZ.po |    3 +++
- po/da_DK.po |    3 +++
- po/de_DE.po |    3 +++
- po/el_GR.po |    3 +++
- po/es_ES.po |    3 +++
- po/et_EE.po |    3 +++
- po/fi_FI.po |    3 +++
- po/fr_FR.po |    3 +++
- po/hr_HR.po |    3 +++
- po/hu_HU.po |    3 +++
- po/it_IT.po |    3 +++
- po/lt_LT.po |    3 +++
- po/nl_NL.po |    3 +++
- po/nn_NO.po |    3 +++
- po/pl_PL.po |    3 +++
- po/pt_PT.po |    3 +++
- po/ro_RO.po |    3 +++
- po/ru_RU.po |    3 +++
- po/sk_SK.po |    3 +++
- po/sl_SI.po |    3 +++
- po/sv_SE.po |    3 +++
- po/tr_TR.po |    3 +++
- po/uk_UA.po |    3 +++
- po/zh_CN.po |    3 +++
- receiver.c  |    2 +-
- 30 files changed, 84 insertions(+), 1 deletions(-)
-
-diff --git a/MANUAL b/MANUAL
-index 54e166e..57b687f 100644
---- a/MANUAL
-+++ b/MANUAL
-@@ -730,6 +730,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.
-+
-   LNB:
- 
-   SLOF               = 11700  The switching frequency (in MHz) between low and
-diff --git a/config.c b/config.c
-index 73bb00d..982bd78 100644
---- a/config.c
-+++ b/config.c
-@@ -333,6 +333,7 @@ cSetup::cSetup(void)
-   MarginStop = 10;
-   AudioLanguages[0] = -1;
-   DisplaySubtitles = 0;
-+  SupportTeletext = 0;
-   SubtitleLanguages[0] = -1;
-   SubtitleOffset = 0;
-   SubtitleFgTransparency = 0;
-@@ -525,6 +526,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);
-+  else if (!strcasecmp(Name, "SupportTeletext"))     SupportTeletext    = atoi(Value);
-   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)
-   Store("MarginStop",         MarginStop);
-   StoreLanguages("AudioLanguages", AudioLanguages);
-   Store("DisplaySubtitles",   DisplaySubtitles);
-+  Store("SupportTeletext",    SupportTeletext);
-   StoreLanguages("SubtitleLanguages", SubtitleLanguages);
-   Store("SubtitleOffset",     SubtitleOffset);
-   Store("SubtitleFgTransparency", SubtitleFgTransparency);
-diff --git a/config.h b/config.h
-index c51e3df..e46b4bd 100644
---- a/config.h
-+++ b/config.h
-@@ -235,6 +235,7 @@ public:
-   int MarginStart, MarginStop;
-   int AudioLanguages[I18N_MAX_LANGUAGES + 1];
-   int DisplaySubtitles;
-+  int SupportTeletext;
-   int SubtitleLanguages[I18N_MAX_LANGUAGES + 1];
-   int SubtitleOffset;
-   int SubtitleFgTransparency, SubtitleBgTransparency;
-diff --git a/menu.c b/menu.c
-index ef2bb46..3548ccd 100644
---- a/menu.c
-+++ b/menu.c
-@@ -2798,6 +2798,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));
-      }
-+  Add(new cMenuEditBoolItem(tr("Setup.DVB$Enable teletext support"), &data.SupportTeletext));
- 
-   SetCurrent(Get(current));
-   Display();
-diff --git a/po/ca_ES.po b/po/ca_ES.po
-index b104fea..1c09d79 100644
---- a/po/ca_ES.po
-+++ b/po/ca_ES.po
-@@ -950,6 +950,9 @@ msgstr "Transpar
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transpar�ncia fons subt�tols"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "Configuraci� de l'LNB"
- 
-diff --git a/po/cs_CZ.po b/po/cs_CZ.po
-index bcafac7..370609f 100644
---- a/po/cs_CZ.po
-+++ b/po/cs_CZ.po
-@@ -949,6 +949,9 @@ msgstr "Průhlednost písma titulků"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Průhlednost pozadí titulků"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/da_DK.po b/po/da_DK.po
-index 81b11eb..5daca8d 100644
---- a/po/da_DK.po
-+++ b/po/da_DK.po
-@@ -947,6 +947,9 @@ msgstr "Undertekst forgrundsgennemsigtighed"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Undertekst baggrundsgennemsigtighed"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/de_DE.po b/po/de_DE.po
-index 6d5b822..0a00a5a 100644
---- a/po/de_DE.po
-+++ b/po/de_DE.po
-@@ -947,6 +947,9 @@ msgstr "Untertitel-Transparenz Vordergrund"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Untertitel-Transparenz Hintergrund"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr "Videotext-Unterst�tzung aktivieren"
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/el_GR.po b/po/el_GR.po
-index 9756ea7..5d4d6ea 100644
---- a/po/el_GR.po
-+++ b/po/el_GR.po
-@@ -947,6 +947,9 @@ msgstr ""
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr ""
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/es_ES.po b/po/es_ES.po
-index 193e75e..1f36b60 100644
---- a/po/es_ES.po
-+++ b/po/es_ES.po
-@@ -948,6 +948,9 @@ msgstr "Transparencia primer plano subt
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transparencia fondo subt�tulos"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/et_EE.po b/po/et_EE.po
-index 49794dd..83ff319 100644
---- a/po/et_EE.po
-+++ b/po/et_EE.po
-@@ -947,6 +947,9 @@ msgstr "Subtiitri l
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Subtiitri tausta l�bipaistvus"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr "Teleteksti tugi"
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/fi_FI.po b/po/fi_FI.po
-index b093e88..4abf6a8 100644
---- a/po/fi_FI.po
-+++ b/po/fi_FI.po
-@@ -950,6 +950,9 @@ msgstr "Tekstityksen läpinäkyvyys"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Tekstityksen taustan läpinäkyvyys"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr "Salli teksti-TV-tuki"
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/fr_FR.po b/po/fr_FR.po
-index b5c5120..86a961a 100644
---- a/po/fr_FR.po
-+++ b/po/fr_FR.po
-@@ -953,6 +953,9 @@ msgstr "Transparence de l'avant-plan"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transparence du fond"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/hr_HR.po b/po/hr_HR.po
-index ed519a2..43f2ea5 100644
---- a/po/hr_HR.po
-+++ b/po/hr_HR.po
-@@ -949,6 +949,9 @@ msgstr "Transparentnost titla"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transparentnost pozadine titla"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/hu_HU.po b/po/hu_HU.po
-index 17b905f..06f4505 100644
---- a/po/hu_HU.po
-+++ b/po/hu_HU.po
-@@ -950,6 +950,9 @@ msgstr "Felirat transzparenci
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Felirat h�tter�nek transzparenci�ja"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/it_IT.po b/po/it_IT.po
-index 501300e..e0227d3 100644
---- a/po/it_IT.po
-+++ b/po/it_IT.po
-@@ -954,6 +954,9 @@ msgstr "Trasparenza sottotitoli"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Trasparenza sfondo sottotitoli"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/lt_LT.po b/po/lt_LT.po
-index 6cb1faa..4efc707 100644
---- a/po/lt_LT.po
-+++ b/po/lt_LT.po
-@@ -947,6 +947,9 @@ msgstr "Subtitrų fonto permatomumas"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Subtitrų fono permatomumas"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "Konverteris (LNB)"
- 
-diff --git a/po/nl_NL.po b/po/nl_NL.po
-index ae2b85e..34a71e9 100644
---- a/po/nl_NL.po
-+++ b/po/nl_NL.po
-@@ -951,6 +951,9 @@ msgstr "Transparantie voorgrond ondertiteling"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transparantie achtergrond ondertiteling"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/nn_NO.po b/po/nn_NO.po
-index 8ec8dfb..9c129ee 100644
---- a/po/nn_NO.po
-+++ b/po/nn_NO.po
-@@ -948,6 +948,9 @@ msgstr ""
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr ""
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/pl_PL.po b/po/pl_PL.po
-index a5c1b47..9645eca 100644
---- a/po/pl_PL.po
-+++ b/po/pl_PL.po
-@@ -948,6 +948,9 @@ msgstr "Prze
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Prze�rocze podtytu��w: T�o"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/pt_PT.po b/po/pt_PT.po
-index c443312..3c108ea 100644
---- a/po/pt_PT.po
-+++ b/po/pt_PT.po
-@@ -948,6 +948,9 @@ msgstr "Transpar
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transpar�ncia de fundo das legendas"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/ro_RO.po b/po/ro_RO.po
-index f8c5a1e..35ec9ec 100644
---- a/po/ro_RO.po
-+++ b/po/ro_RO.po
-@@ -950,6 +950,9 @@ msgstr "Transparen
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transparen�a fundalului subtitr�rii"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/ru_RU.po b/po/ru_RU.po
-index e683b8b..b90e565 100644
---- a/po/ru_RU.po
-+++ b/po/ru_RU.po
-@@ -948,6 +948,9 @@ msgstr "
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "������������ ���� ���������"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "���������"
- 
-diff --git a/po/sk_SK.po b/po/sk_SK.po
-index 46edef5..aabb641 100644
---- a/po/sk_SK.po
-+++ b/po/sk_SK.po
-@@ -947,6 +947,9 @@ msgstr "Prieh
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Prieh�adnos� pozadia titulkov"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/sl_SI.po b/po/sl_SI.po
-index 89c6923..8ef4387 100644
---- a/po/sl_SI.po
-+++ b/po/sl_SI.po
-@@ -948,6 +948,9 @@ msgstr "Transparentnost podnapisov"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transparentnost ozadja podnapisov"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/sv_SE.po b/po/sv_SE.po
-index 150f95e..020c64d 100644
---- a/po/sv_SE.po
-+++ b/po/sv_SE.po
-@@ -950,6 +950,9 @@ msgstr "Transparent f
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transparent bakgrund textremsa"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/tr_TR.po b/po/tr_TR.po
-index 194943b..338c649 100644
---- a/po/tr_TR.po
-+++ b/po/tr_TR.po
-@@ -947,6 +947,9 @@ msgstr "Altyaz
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Altyaz� arka �effafl�k"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "LNB"
- 
-diff --git a/po/uk_UA.po b/po/uk_UA.po
-index 433ec70..c0a7947 100644
---- a/po/uk_UA.po
-+++ b/po/uk_UA.po
-@@ -947,6 +947,9 @@ msgstr "Прозорість переднього плану субтитрів"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Прозорість заднього плану субтитрів"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "Конвертер"
- 
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index c28fe88..8a594e3 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -950,6 +950,9 @@ msgstr "字幕前景透明度"
- msgid "Setup.DVB$Subtitle background transparency"
- msgstr "字幕背景透明度"
- 
-+msgid "Setup.DVB$Enable teletext support"
-+msgstr ""
-+
- msgid "LNB"
- msgstr "切换器设置"
- 
-diff --git a/receiver.c b/receiver.c
-index 1312b9b..a5c8967 100644
---- a/receiver.c
-+++ b/receiver.c
-@@ -82,7 +82,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;
- }
--- 
-1.7.6.3
-