Remove "DVB Source Selection" setup option (unused since 0.2.0).

13 files changed, 12 insertions, 179 deletions

diff --git a/HISTORY b/HISTORY
index e54a39a..6150a8f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,8 +2,8 @@ VDR Plugin 'ttxtsubs' Revision History
 --------------------------------------
 
 201x-xx-xx: Version x.x.x
-- Removed obsolete (unused since 0.2.0) setup options: Live Delay,
-  Record Subtitles, and Workaround for some French chns.
+- Removed obsolete (unused since 0.2.0) setup options: DVB Source Selection,
+  Live Delay, Record Subtitles, and Workaround for some French chns.
 
 2011-10-08: Version 0.2.4
 - Updated patch for VDR 1.7.21 (Closes #745)
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 82faf45..7dc0fbe 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2011-12-09 20:59+0200\n"
+"POT-Creation-Date: 2011-12-09 21:28+0200\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -43,18 +43,6 @@ msgstr "4:3/Letterbox"
 msgid "Page Mode"
 msgstr "Modalitat pàgina"
 
-msgid "All"
-msgstr "Totes"
-
-msgid "Only DVB-S"
-msgstr "Només DVB-S"
-
-msgid "Only DVB-T"
-msgstr "Només DVB-T"
-
-msgid "Only DVB-C"
-msgstr "Només DVB-C"
-
 msgid "Display Subtitles"
 msgstr "Visualitza subtítols"
 
@@ -67,9 +55,6 @@ msgstr "Retard en reproducció (TS)"
 msgid "Main Menu Alternative"
 msgstr "Alternativa del menú principal"
 
-msgid "DVB Source Selection"
-msgstr "Selecció font DVB"
-
 msgid "Font Size (pixel)"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 1c72643..73b169d 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2011-12-09 20:59+0200\n"
+"POT-Creation-Date: 2011-12-09 21:28+0200\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -41,18 +41,6 @@ msgstr "4:3/Letterbox"
 msgid "Page Mode"
 msgstr "Seitenmodus"
 
-msgid "All"
-msgstr "Alle"
-
-msgid "Only DVB-S"
-msgstr "Nur DVB-S"
-
-msgid "Only DVB-T"
-msgstr "Nur DVB-T"
-
-msgid "Only DVB-C"
-msgstr "Nur DVB-C"
-
 msgid "Display Subtitles"
 msgstr "Zeige Untertitel"
 
@@ -65,9 +53,6 @@ msgstr "Wiedergabe Verzögerung (TS)"
 msgid "Main Menu Alternative"
 msgstr "Hauptmenu Alternative"
 
-msgid "DVB Source Selection"
-msgstr "DVB Quelle Auswahl"
-
 msgid "Font Size (pixel)"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 425511e..310cab3 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2011-12-09 20:59+0200\n"
+"POT-Creation-Date: 2011-12-09 21:28+0200\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -41,18 +41,6 @@ msgstr "4:3/Letterbox"
 msgid "Page Mode"
 msgstr "Modo página"
 
-msgid "All"
-msgstr "Todas"
-
-msgid "Only DVB-S"
-msgstr "Sólo DVB-S"
-
-msgid "Only DVB-T"
-msgstr "Sólo DVB-T"
-
-msgid "Only DVB-C"
-msgstr "Sólo DVB-C"
-
 msgid "Display Subtitles"
 msgstr "Visualiza subtítulos"
 
@@ -65,9 +53,6 @@ msgstr "Retardo en reproducción (TS)"
 msgid "Main Menu Alternative"
 msgstr "Alternativa del menú principal"
 
-msgid "DVB Source Selection"
-msgstr "Selección fuente DVB"
-
 msgid "Font Size (pixel)"
 msgstr ""
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 98e0d91..a1711ed 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2011-12-09 20:59+0200\n"
+"POT-Creation-Date: 2011-12-09 21:28+0200\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -40,18 +40,6 @@ msgstr "pildisuhe (iganenud)"
 msgid "Page Mode"
 msgstr "lk valik"
 
-msgid "All"
-msgstr "kõik"
-
-msgid "Only DVB-S"
-msgstr "DVB-S"
-
-msgid "Only DVB-T"
-msgstr "DVB-T"
-
-msgid "Only DVB-C"
-msgstr "DVB-C"
-
 msgid "Display Subtitles"
 msgstr "Subtiitrite kuvamine"
 
@@ -64,9 +52,6 @@ msgstr "Salvestuse viivitus (TS)"
 msgid "Main Menu Alternative"
 msgstr "Peamenüü valikud"
 
-msgid "DVB Source Selection"
-msgstr "DVB allika valik"
-
 msgid "Font Size (pixel)"
 msgstr "Fondi suurus (pix)"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 2ae6201..6dce8de 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ttxtsubs 0.2.0\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2011-12-09 20:59+0200\n"
+"POT-Creation-Date: 2011-12-09 21:28+0200\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -40,18 +40,6 @@ msgstr "4:3/Letterbox (käytöstä poistunut)"
 msgid "Page Mode"
 msgstr "sivun valinta"
 
-msgid "All"
-msgstr "kaikki"
-
-msgid "Only DVB-S"
-msgstr "vain DVB-S"
-
-msgid "Only DVB-T"
-msgstr "vain DVB-T"
-
-msgid "Only DVB-C"
-msgstr "vain DVB-C"
-
 msgid "Display Subtitles"
 msgstr "Näytä tekstitykset"
 
@@ -64,9 +52,6 @@ msgstr "Viive toistossa (TS)"
 msgid "Main Menu Alternative"
 msgstr "Päävalikon toiminnot"
 
-msgid "DVB Source Selection"
-msgstr "Tekstityslähteen valinta"
-
 msgid "Font Size (pixel)"
 msgstr "Kirjasintyypin koko (px)"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 1042d91..e074cab 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2011-12-09 20:59+0200\n"
+"POT-Creation-Date: 2011-12-09 21:28+0200\n"
 "PO-Revision-Date: 2010-02-28 14:43+0100\n"
 "Last-Translator: Nival Michaël\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -43,18 +43,6 @@ msgstr "4:3/Letterbox (obsolète)"
 msgid "Page Mode"
 msgstr "Mode page"
 
-msgid "All"
-msgstr "Tous"
-
-msgid "Only DVB-S"
-msgstr "Seulement DVB-S"
-
-msgid "Only DVB-T"
-msgstr "Seulement DVB-T"
-
-msgid "Only DVB-C"
-msgstr "Seulement DVB-C"
-
 msgid "Display Subtitles"
 msgstr "Afficher les sous-titre"
 
@@ -67,9 +55,6 @@ msgstr "Delai à la lecture (TS)"
 msgid "Main Menu Alternative"
 msgstr "Choix du menu principal"
 
-msgid "DVB Source Selection"
-msgstr "Sélection Source DVB"
-
 msgid "Font Size (pixel)"
 msgstr "Taille Police (pixel)"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 3a10de5..9911a01 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2011-12-09 20:59+0200\n"
+"POT-Creation-Date: 2011-12-09 21:28+0200\n"
 "PO-Revision-Date: 2010-03-02 20:48+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -45,18 +45,6 @@ msgstr "4:3/Letterbox (deprecato)"
 msgid "Page Mode"
 msgstr "Mod. pagina"
 
-msgid "All"
-msgstr "Tutte"
-
-msgid "Only DVB-S"
-msgstr "Solo DVB-S"
-
-msgid "Only DVB-T"
-msgstr "Solo DVB-T"
-
-msgid "Only DVB-C"
-msgstr "Solo DVB-C"
-
 msgid "Display Subtitles"
 msgstr "Visualizza sottotitoli"
 
@@ -69,9 +57,6 @@ msgstr "Ritardo mod. riproduzione (TS)"
 msgid "Main Menu Alternative"
 msgstr "Voci alternative menu princ."
 
-msgid "DVB Source Selection"
-msgstr "Selezione sorgente DVB"
-
 msgid "Font Size (pixel)"
 msgstr "Dim. caratteri (pixel)"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 2b4b114..4bda852 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2011-12-09 20:59+0200\n"
+"POT-Creation-Date: 2011-12-09 21:28+0200\n"
 "PO-Revision-Date: 2008-12-30 14:05+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -41,18 +41,6 @@ msgstr "4:3/широкий экран"
 msgid "Page Mode"
 msgstr "Режим страницы"
 
-msgid "All"
-msgstr "Все"
-
-msgid "Only DVB-S"
-msgstr "Только DVB-S"
-
-msgid "Only DVB-T"
-msgstr "Только  DVB-T"
-
-msgid "Only DVB-C"
-msgstr "Только DVB-C"
-
 msgid "Display Subtitles"
 msgstr "Показывать субтитры"
 
@@ -65,9 +53,6 @@ msgstr "Задержка воспроизведения (TS)"
 msgid "Main Menu Alternative"
 msgstr "Команда в главном меню"
 
-msgid "DVB Source Selection"
-msgstr "Выбор DVB источника"
-
 msgid "Font Size (pixel)"
 msgstr "Размер фонта  (pixel)"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index a770f59..b12242c 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2011-12-09 20:59+0200\n"
+"POT-Creation-Date: 2011-12-09 21:28+0200\n"
 "PO-Revision-Date: 2007-08-24 23:49+0300\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -42,18 +42,6 @@ msgstr "4:3/brevlådeformat"
 msgid "Page Mode"
 msgstr ""
 
-msgid "All"
-msgstr ""
-
-msgid "Only DVB-S"
-msgstr ""
-
-msgid "Only DVB-T"
-msgstr ""
-
-msgid "Only DVB-C"
-msgstr ""
-
 msgid "Display Subtitles"
 msgstr "Visa textning"
 
@@ -66,9 +54,6 @@ msgstr ""
 msgid "Main Menu Alternative"
 msgstr "Huvudmenyalternativ"
 
-msgid "DVB Source Selection"
-msgstr ""
-
 msgid "Font Size (pixel)"
 msgstr ""
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 567a577..bdcae35 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <author>\n"
-"POT-Creation-Date: 2011-12-09 20:59+0200\n"
+"POT-Creation-Date: 2011-12-09 21:28+0200\n"
 "PO-Revision-Date: 2009-05-28 14:05+0100\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -36,18 +36,6 @@ msgstr "4:3/широкий екран"
 msgid "Page Mode"
 msgstr "Режим сторінки"
 
-msgid "All"
-msgstr "Всі"
-
-msgid "Only DVB-S"
-msgstr "Тільки DVB-S"
-
-msgid "Only DVB-T"
-msgstr "Тільки  DVB-T"
-
-msgid "Only DVB-C"
-msgstr "Тільки DVB-C"
-
 msgid "Display Subtitles"
 msgstr "Показувати субтитри"
 
@@ -60,9 +48,6 @@ msgstr "Затримка Програвання (TS)"
 msgid "Main Menu Alternative"
 msgstr "Команда в головному меню"
 
-msgid "DVB Source Selection"
-msgstr "Вибір DVB джерела"
-
 msgid "Font Size (pixel)"
 msgstr "Размір фонта (пікселі)"
 
diff --git a/ttxtsubs.c b/ttxtsubs.c
index 01683c2..9781a26 100644
--- a/ttxtsubs.c
+++ b/ttxtsubs.c
@@ -315,7 +315,6 @@ bool cPluginTtxtsubs::SetupParse(const char *Name, const char *Value)
   else if(!strcasecmp(Name, "ReplayDelay")) globals.mReplayDelay = atoi(Value);
   else if(!strcasecmp(Name, "ReplayTsDelay")) globals.mReplayTsDelay = atoi(Value);
   else if(!strcasecmp(Name, "MainMenuEntry")) globals.mMainMenuEntry = atoi(Value);
-  else if(!strcasecmp(Name, "DvbSources")) globals.mDvbSources = atoi(Value);
   else if(!strcasecmp(Name, "FontSize")) globals.mFontSize = atoi(Value);
   else if(!strcasecmp(Name, "OutlineWidth")) globals.mOutlineWidth = atoi(Value);
   else if(!strcasecmp(Name, "Languages")) parseLanguages(Value);
@@ -477,7 +476,6 @@ void cMenuSetupTtxtsubsLanguages::Store(void)
 }
 
 const char * mainMenuAlts[5] = {NULL, NULL, NULL, NULL, NULL};
-const char * dvbSources[5];
 
 cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
   :
@@ -493,15 +491,8 @@ cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
     mainMenuAlts[2] = tr("4:3/Letterbox (deprecated)");
     mainMenuAlts[3] = tr("Page Mode");
     mainMenuAlts[4] = NULL;
-
-    dvbSources[0] = tr("All");
-    dvbSources[1] = tr("Only DVB-S");
-    dvbSources[2] = tr("Only DVB-T");
-    dvbSources[3] = tr("Only DVB-C");
-    dvbSources[4] = NULL;
   }
   const int numMainMenuAlts = sizeof(mainMenuAlts) / sizeof(mainMenuAlts[0]) - 1;
-  const int numDvbSources = sizeof(dvbSources) / sizeof(dvbSources[0]) - 1;
 
   for(int n = 0; n < MAXLANGUAGES; n++) {
     mLanguageNo[n] = -1;
@@ -523,10 +514,6 @@ cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
     mConf.mMainMenuEntry = 0;  // menu item segfaults if out of range
   Add(new cMenuEditStraItem(tr("Main Menu Alternative"), &mConf.mMainMenuEntry,
 			    numMainMenuAlts, mainMenuAlts));
-  if(mConf.mDvbSources < 0 || mConf.mDvbSources >= numDvbSources)
-    mConf.mDvbSources = 0;  // menu item segfaults if out of range
-  Add(new cMenuEditStraItem(tr("DVB Source Selection"),
-                          &mConf.mDvbSources, 4, dvbSources));
   Add(new cMenuEditIntItem(tr("Font Size (pixel)"), &mConf.mFontSize, 10, MAXFONTSIZE * 2));
   Add(new cMenuEditIntItem(tr("Font OutlineWidth (pixel)"), &mConf.mOutlineWidth, 1, 10));
 
@@ -583,7 +570,6 @@ void cMenuSetupTtxtsubs::Store(void)
   SetupStore("ReplayDelay", mConf.mReplayDelay);
   SetupStore("ReplayTsDelay", mConf.mReplayTsDelay);
   SetupStore("MainMenuEntry", mConf.mMainMenuEntry);
-  SetupStore("DvbSources", mConf.mDvbSources);
   SetupStore("FontSize", mConf.mFontSize);
   SetupStore("OutlineWidth", mConf.mOutlineWidth);
 
diff --git a/ttxtsubsglobals.h b/ttxtsubsglobals.h
index 8abb18d..acf82b5 100644
--- a/ttxtsubsglobals.h
+++ b/ttxtsubsglobals.h
@@ -38,7 +38,6 @@ class cTtxtsubsConf {
     mDoDisplay(1),
     mRealDoDisplay(1),
     mMainMenuEntry(0),
-    mDvbSources(0),
     mFontSize(20),
     mOutlineWidth(2),
     mReplayDelay(0),
@@ -51,7 +50,6 @@ class cTtxtsubsConf {
  public:
   int doDisplay(void) {return mRealDoDisplay;}
   int mainMenuEntry(void) {return mMainMenuEntry;}
-  int dvbSources(void) {return mDvbSources;}
   int fontSize(void) {return mFontSize;}
   int outlineWidth(void) {return mOutlineWidth;}
   char (*languages(void))[MAXLANGUAGES][2][4] {return &mLanguages;}
@@ -65,7 +63,6 @@ class cTtxtsubsConf {
   int mDoDisplay;
   int mRealDoDisplay;
   int mMainMenuEntry;
-  int mDvbSources;
   int mFontSize;
   int mOutlineWidth;
   char mLanguages[MAXLANGUAGES][2][4];