Remove "Workaround for some French chns" setup option (unused since 0.2.0).

14 files changed, 13 insertions, 83 deletions

diff --git a/HISTORY b/HISTORY
index fc0310b..e54a39a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,7 +2,8 @@ VDR Plugin 'ttxtsubs' Revision History
 --------------------------------------
 
 201x-xx-xx: Version x.x.x
-- Removed Live Delay and Record Subtitles setup options (unused since 0.2.0).
+- Removed obsolete (unused since 0.2.0) setup options: 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/TROUBLESHOOTING b/TROUBLESHOOTING
index b8cf3f5..3c321d9 100644
--- a/TROUBLESHOOTING
+++ b/TROUBLESHOOTING
@@ -63,9 +63,7 @@ Troubleshooting ttxtsubs
 
 A good thing to check first is how another set top box behaves. If the
 other set top box automatically finds and displays teletext subtitles
-while ttxtsubs don't, there is probably a problem in ttxtsubs. If the
-channel in question is a French, please see the French channel problem
-section below.
+while ttxtsubs don't, there is probably a problem in ttxtsubs.
 
 If neither the set top box nor ttxtsubs automatically finds the
 subtitles but you can get them by manually entering the teletext page
@@ -198,36 +196,6 @@ automatically pick them up and present the subtitles to the viewer.
 -----
 
 
-There is a known problem with some French channels. Because of some
-old specification interpretation mistake, some channels send the
-teletext page number in decimal coded as binary, and not as the
-standard says in hexadecimal. Since there are set top boxes sold that
-has the same bug so that they can work with there channels, they are
-reluctant to correct this. The service information for those channels
-typically say that the subtitles are on page 858 or 859 when they
-really are on page 888 or 889. To still be able to use those channels,
-you can in ttxtsubs turn on the "Workaround for some French chns"
-option which will remap numbers in the X5Y range into X8Y. Since this
-would also remap the page number for a channel that really is using
-for example page 859, this is an option that is off by default.  If
-you see this problem, please contact the channel provider and make
-them understand that time will only make it harder to correct this
-mistake as more decoders with this bug will be out there and software
-updates for older set top boxes will be harder and harder to get.
-Some channels do what they can to gradually correct this by sending
-both a descriptor for French subtitles on page 859 (whish is
-interpreted as page 889 on the old non standard decoders), and as
-French for the Hearing Impaired on page 889 which is the setting that
-can be used on standard compliant decoders.
-(For the technically interrested: The hundreds figure is in teletext
-called "magazine" and is sent separately from the 8 bit "page
-number". Each magazine can actually have up to 256 pages and the page
-number is really in hex, but only the 100 pages which use only the
-figures 0-9 are normally seen by the user as only those numbers can be
-entered on the remote control keyboard. 59 hex is 89 decimal, and here
-is where something went wrong.)
-
-
 Note that some channels don't use teletext subtitles but instead use
 DVB subtitles, which is something different. DVB subtitles are sent as
 bitmaps, somewhat like DVD subtitles. You can find a plugin for DVB
diff --git a/po/ca_ES.po b/po/ca_ES.po
index dcd6aa8..82faf45 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:44+0200\n"
+"POT-Creation-Date: 2011-12-09 20:59+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"
@@ -67,9 +67,6 @@ msgstr "Retard en reproducció (TS)"
 msgid "Main Menu Alternative"
 msgstr "Alternativa del menú principal"
 
-msgid "Workaround for some French chns"
-msgstr "Correcció per a canals francesos"
-
 msgid "DVB Source Selection"
 msgstr "Selecció font DVB"
 
diff --git a/po/de_DE.po b/po/de_DE.po
index e08b5c1..1c72643 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:44+0200\n"
+"POT-Creation-Date: 2011-12-09 20:59+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"
@@ -65,9 +65,6 @@ msgstr "Wiedergabe Verzögerung (TS)"
 msgid "Main Menu Alternative"
 msgstr "Hauptmenu Alternative"
 
-msgid "Workaround for some French chns"
-msgstr "Workaround für französische Kanäle"
-
 msgid "DVB Source Selection"
 msgstr "DVB Quelle Auswahl"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index e005416..425511e 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:44+0200\n"
+"POT-Creation-Date: 2011-12-09 20:59+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"
@@ -65,9 +65,6 @@ msgstr "Retardo en reproducción (TS)"
 msgid "Main Menu Alternative"
 msgstr "Alternativa del menú principal"
 
-msgid "Workaround for some French chns"
-msgstr "Corrección para canales franceses"
-
 msgid "DVB Source Selection"
 msgstr "Selección fuente DVB"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 632c734..98e0d91 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:44+0200\n"
+"POT-Creation-Date: 2011-12-09 20:59+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"
@@ -64,9 +64,6 @@ msgstr "Salvestuse viivitus (TS)"
 msgid "Main Menu Alternative"
 msgstr "Peamenüü valikud"
 
-msgid "Workaround for some French chns"
-msgstr "Parandus prantsuse kanalitel"
-
 msgid "DVB Source Selection"
 msgstr "DVB allika valik"
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 1995c50..2ae6201 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:44+0200\n"
+"POT-Creation-Date: 2011-12-09 20:59+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"
@@ -64,9 +64,6 @@ msgstr "Viive toistossa (TS)"
 msgid "Main Menu Alternative"
 msgstr "Päävalikon toiminnot"
 
-msgid "Workaround for some French chns"
-msgstr "Ranskalainen silmänkääntötemppu"
-
 msgid "DVB Source Selection"
 msgstr "Tekstityslähteen valinta"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index aa70dca..1042d91 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:44+0200\n"
+"POT-Creation-Date: 2011-12-09 20:59+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"
@@ -67,9 +67,6 @@ msgstr "Delai à la lecture (TS)"
 msgid "Main Menu Alternative"
 msgstr "Choix du menu principal"
 
-msgid "Workaround for some French chns"
-msgstr "Contournement chaînes françaises"
-
 msgid "DVB Source Selection"
 msgstr "Sélection Source DVB"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index a517fa9..3a10de5 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:44+0200\n"
+"POT-Creation-Date: 2011-12-09 20:59+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"
@@ -69,9 +69,6 @@ msgstr "Ritardo mod. riproduzione (TS)"
 msgid "Main Menu Alternative"
 msgstr "Voci alternative menu princ."
 
-msgid "Workaround for some French chns"
-msgstr "Correzione per canali francesi"
-
 msgid "DVB Source Selection"
 msgstr "Selezione sorgente DVB"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 1d2c255..2b4b114 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:44+0200\n"
+"POT-Creation-Date: 2011-12-09 20:59+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"
@@ -65,9 +65,6 @@ msgstr "Задержка воспроизведения (TS)"
 msgid "Main Menu Alternative"
 msgstr "Команда в главном меню"
 
-msgid "Workaround for some French chns"
-msgstr "Спец. настройки для франц. каналов"
-
 msgid "DVB Source Selection"
 msgstr "Выбор DVB источника"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e1db472..a770f59 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:44+0200\n"
+"POT-Creation-Date: 2011-12-09 20:59+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"
@@ -66,9 +66,6 @@ msgstr ""
 msgid "Main Menu Alternative"
 msgstr "Huvudmenyalternativ"
 
-msgid "Workaround for some French chns"
-msgstr "Fix för vissa franska kanaler"
-
 msgid "DVB Source Selection"
 msgstr ""
 
diff --git a/po/uk_UA.po b/po/uk_UA.po
index d34d5bc..567a577 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:44+0200\n"
+"POT-Creation-Date: 2011-12-09 20:59+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"
@@ -60,9 +60,6 @@ msgstr "Затримка Програвання (TS)"
 msgid "Main Menu Alternative"
 msgstr "Команда в головному меню"
 
-msgid "Workaround for some French chns"
-msgstr "Спец. настройки для франц. каналів"
-
 msgid "DVB Source Selection"
 msgstr "Вибір DVB джерела"
 
diff --git a/ttxtsubs.c b/ttxtsubs.c
index 541c6fa..01683c2 100644
--- a/ttxtsubs.c
+++ b/ttxtsubs.c
@@ -181,7 +181,6 @@ class cMenuSetupTtxtsubs : public cMenuSetupPage {
   cPluginTtxtsubs *mTtxtsubs;
   int mLanguageNo[MAXLANGUAGES];
   int mLangHI[MAXLANGUAGES];
-  int mSavedFrenchSpecial;
   int mDoStore;
   cTtxtsubsConf mConf;
 };
@@ -316,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, "FrenchSpecial")) globals.mFrenchSpecial = 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);
@@ -484,7 +482,6 @@ const char * dvbSources[5];
 cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
   :
   mTtxtsubs(ttxtsubs),
-  mSavedFrenchSpecial(globals.mFrenchSpecial),
   mDoStore(doStore),
   mConf(globals)
 {
@@ -526,8 +523,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));
-  Add(new cMenuEditBoolItem(tr("Workaround for some French chns"),
-			    &mConf.mFrenchSpecial));
   if(mConf.mDvbSources < 0 || mConf.mDvbSources >= numDvbSources)
     mConf.mDvbSources = 0;  // menu item segfaults if out of range
   Add(new cMenuEditStraItem(tr("DVB Source Selection"),
@@ -587,7 +582,6 @@ void cMenuSetupTtxtsubs::Store(void)
   SetupStore("Display", mConf.mDoDisplay);
   SetupStore("ReplayDelay", mConf.mReplayDelay);
   SetupStore("ReplayTsDelay", mConf.mReplayTsDelay);
-  SetupStore("FrenchSpecial", mConf.mFrenchSpecial);
   SetupStore("MainMenuEntry", mConf.mMainMenuEntry);
   SetupStore("DvbSources", mConf.mDvbSources);
   SetupStore("FontSize", mConf.mFontSize);
diff --git a/ttxtsubsglobals.h b/ttxtsubsglobals.h
index 494e4e2..88eddea 100644
--- a/ttxtsubsglobals.h
+++ b/ttxtsubsglobals.h
@@ -38,7 +38,6 @@ class cTtxtsubsConf {
       mDoDisplay = 1;
       mRealDoDisplay =1;
       mMainMenuEntry = 0;
-      mFrenchSpecial = 0;
       mDvbSources = 0;
       mFontSize = 20;
       mOutlineWidth = 2;
@@ -52,7 +51,6 @@ class cTtxtsubsConf {
  public:
   int doDisplay(void) {return mRealDoDisplay;}
   int mainMenuEntry(void) {return mMainMenuEntry;}
-  int frenchSpecial(void) {return mFrenchSpecial;}
   int dvbSources(void) {return mDvbSources;}
   int fontSize(void) {return mFontSize;}
   int outlineWidth(void) {return mOutlineWidth;}
@@ -68,7 +66,6 @@ class cTtxtsubsConf {
   int mDoDisplay;
   int mRealDoDisplay;
   int mMainMenuEntry;
-  int mFrenchSpecial;
   int mDvbSources;
   int mFontSize;
   int mOutlineWidth;