Updated for vdr-1.3.36.

Added french translation (Thanks to Nicolas Huillard). Enabled bitrate commands via SVDRP. Added new SVDRP commands. Modified femon service without incrementing version number. Added "Duotone" theme for 2bpp on screen displays. Fixed crash bug in femonreceiver. Fixed setup page bug (Thanks to Thomas Günther for reporting this one).
Updated for vdr-1.3.34.
2023-10-10 11:36:53 +00:00 · 2005-11-13 04:20:00 +02:00 · 2005-10-04 04:20:00 +03:00 · 2005-08-28 04:20:00 +03:00
19 changed files with 1271 additions and 224 deletions
--- a/23
+++ b/23
@@ -171,3 +171,26 @@ VDR Plugin 'femon' Revision History
 2005-08-15: Version 0.9.2

 - Threads updated for vdr-1.3.29.
+
+2005-08-28: Version 0.9.3
+
+- Updated for vdr-1.3.31.
+- Added preliminary svdrp and service support.
+
+2005-10-04: Version 0.9.4
+
+- Updated for vdr-1.3.34.
+- Added Enigma theme (Thanks to Rolf Hoverath).
+- Added EgalsTry theme (Thanks to Uwe Hanke).
+- Added option to disable rounded corners.
+
+2005-11-13: Version 0.9.5
+
+- Updated for vdr-1.3.36.
+- Added french translation (Thanks to Nicolas Huillard).
+- Enabled bitrate commands via SVDRP.
+- Added new SVDRP commands.
+- Modified femon service without incrementing version number.
+- Added "Duotone" theme for 2bpp on screen displays.
+- Fixed crash bug in femonreceiver.
+- Fixed setup page bug (Thanks to Thomas G<>nther for reporting this one).
--- a/8
+++ b/8
@@ -16,11 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ pri
 ### The C++ compiler and options:

 CXX      ?= g++
-ifdef FEMON_DEBUG
-CXXFLAGS ?= -g -Wall -Woverloaded-virtual -fPIC
-else
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -fPIC
-endif
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual

 ### The directory environment:

@@ -61,7 +57,7 @@ all-redirect: all

 ### The object files (add further files here):

-OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femoni18n.o
+OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femoni18n.o femontools.o

 ### Implicit rules:

--- a/5
+++ b/5
@@ -77,9 +77,8 @@ make plugins

 Notes:

- The plugin supports only those DVB cards with _one_ frontend (do any cards
-  with multiple frontends even exist?), because I haven't yet figured howto do
-  it without patching the VDR core.
+- The plugin supports only those DVB cards with _one_ frontend, because I
+  haven't yet figured howto do it without patching the VDR core.

 - Disable the stream analyze to speed up heavy zapping sessions.

--- a/femon.c
+++ b/femon.c
@@ -6,26 +6,31 @@
 * $Id$
 */

+#include <vdr/remote.h>
 #include "femoncfg.h"
 #include "femoni18n.h"
 #include "femonreceiver.h"
 #include "femonosd.h"
+#include "femonservice.h"
+#include "femontools.h"
 #include "femon.h"

-#if VDRVERSNUM && VDRVERSNUM < 10329
-#error "You don't exist! Go away!"
+#if defined(VDRVERSNUM) && VDRVERSNUM < 10336
+#error "You don't exist! Go away! Upgrade yourself!"
 #endif

-cPluginFemon::cPluginFemon(void)
+cPluginFemon::cPluginFemon()
 {
  // Initialize any member variables here.
  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
 }

 cPluginFemon::~cPluginFemon()
 {
  // Clean up after yourself!
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
 }

 const char *cPluginFemon::CommandLineHelp(void)
@@ -66,7 +71,8 @@ void cPluginFemon::Housekeeping(void)
 cOsdObject *cPluginFemon::MainMenuAction(void)
 {
  // Perform the action when selected from the main VDR menu.
-  return new cFemonOsd();
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  return cFemonOsd::Instance(true);
 }

 bool cPluginFemon::SetupParse(const char *Name, const char *Value)
@@ -78,6 +84,7 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)
  else if (!strcasecmp(Name, "Position"))       femonConfig.position       = atoi(Value);
  else if (!strcasecmp(Name, "OSDHeight"))      femonConfig.osdheight      = atoi(Value);
  else if (!strcasecmp(Name, "OSDOffset"))      femonConfig.osdoffset      = atoi(Value);
+  else if (!strcasecmp(Name, "Skin"))           femonConfig.skin           = atoi(Value);
  else if (!strcasecmp(Name, "Theme"))          femonConfig.theme          = atoi(Value);
  else if (!strcasecmp(Name, "ShowCASystem"))   femonConfig.showcasystem   = atoi(Value);
  else if (!strcasecmp(Name, "RedLimit"))       femonConfig.redlimit       = atoi(Value);
@@ -92,18 +99,145 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)
  return true;
 }

+bool cPluginFemon::Service(const char *Id, void *Data)
+{
+  if ((strcmp(Id,"FemonService-v1.0") == 0) && Data) {
+     FemonService_v1_0 *data = (FemonService_v1_0*)Data;
+     int ndx = cDevice::ActualDevice()->CardIndex();
+     data->fe_name = getFrontendName(ndx);
+     data->fe_status = getFrontendStatus(ndx);
+     data->fe_snr = getSNR(ndx);
+     data->fe_signal = getSignal(ndx);
+     data->fe_ber = getBER(ndx);
+     data->fe_unc = getUNC(ndx);
+     data->video_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetVideoBitrate() : 0.0;
+     data->audio_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetAudioBitrate() : 0.0;
+     data->dolby_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetDolbyBitrate() : 0.0;
+     return true;
+     }
+
+  return false;
+}
+
+const char **cPluginFemon::SVDRPHelpPages(void)
+{ 
+  static const char *HelpPages[] = {
+    "OPEN\n"
+    "    Open femon plugin.",
+    "QUIT\n"
+    "    Close femon plugin.",
+    "NEXT\n"
+    "    Switch to next possible device.",
+    "PREV\n"
+    "    Switch to previous possible device.",
+    "NAME\n"
+    "    Print the current frontend name.",
+    "STAT\n"
+    "    Print the current frontend status.",
+    "SGNL\n"
+    "    Print the current signal strength.",
+    "SNRA\n"
+    "    Print the current signal-to-noise ratio.",
+    "BERA\n"
+    "    Print the current bit error rate.",
+    "UNCB\n"
+    "    Print the current uncorrcted blocks rate.",
+    "VIBR\n"
+    "    Print the actual device and current video bitrate [Mbit/s].",
+    "AUBR\n"
+    "    Print the actual device and current audio bitrate [kbit/s].",
+    "DDBR\n"
+    "    Print the actual device and current dolby bitrate [kbit/s].",
+    NULL
+    };
+  return HelpPages;
+}
+
+cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+{
+  if (strcasecmp(Command, "OPEN") == 0) {
+     if (!cFemonOsd::Instance())
+        cRemote::CallPlugin("femon");
+     return cString("Opening femon plugin");
+     }
+  else if (strcasecmp(Command, "QUIT") == 0) {
+     if (cFemonOsd::Instance())
+        cRemote::Put(kBack);
+     return cString("Closing femon plugin");
+     }
+  else if (strcasecmp(Command, "NEXT") == 0) {
+     if (cFemonOsd::Instance())
+        return cString::sprintf("Switching to next device: %s", cFemonOsd::Instance()->DeviceSwitch(1) ? "ok" : "failed");
+     else
+        return cString("Cannot switch device");
+     }
+  else if (strcasecmp(Command, "PREV") == 0) {
+     if (cFemonOsd::Instance())
+        return cString::sprintf("Switching to previous device: %s", cFemonOsd::Instance()->DeviceSwitch(-1) ? "ok" : "failed");
+     else
+        return cString("Cannot switch device");
+     }
+  else if (strcasecmp(Command, "NAME") == 0) {
+     return getFrontendName(cDevice::ActualDevice()->CardIndex());
+     }
+  else if (strcasecmp(Command, "STAT") == 0) {
+     return getFrontendStatus(cDevice::ActualDevice()->CardIndex());
+     }
+  else if (strcasecmp(Command, "SGNL") == 0) {
+     int value = getSignal(cDevice::ActualDevice()->CardIndex());
+     return cString::sprintf("%04X (%02d%%) on device #%d", value, value / 655, cDevice::ActualDevice()->CardIndex());
+     }
+  else if (strcasecmp(Command, "SNRA") == 0) {
+     int value = getSNR(cDevice::ActualDevice()->CardIndex());
+     return cString::sprintf("%04X (%02d%%) on device #%d", value, value / 655, cDevice::ActualDevice()->CardIndex());
+     }
+  else if (strcasecmp(Command, "BERA") == 0) {
+     return cString::sprintf("%08X on device #%d", getBER(cDevice::ActualDevice()->CardIndex()), cDevice::ActualDevice()->CardIndex());
+     }
+  else if (strcasecmp(Command, "UNCB") == 0) {
+     return cString::sprintf("%08X on device #%d", getUNC(cDevice::ActualDevice()->CardIndex()), cDevice::ActualDevice()->CardIndex());
+     }
+  else if (strcasecmp(Command, "VIBR") == 0) {
+     if (cFemonOsd::Instance())
+        return cString::sprintf("%.2f Mbit/s on device #%d", cFemonOsd::Instance()->GetVideoBitrate(), cDevice::ActualDevice()->CardIndex());
+     else
+        return cString::sprintf("--- Mbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
+     }
+  else if (strcasecmp(Command, "AUBR") == 0) {
+     if (cFemonOsd::Instance())
+        return cString::sprintf("%.0f kbit/s on device #%d", cFemonOsd::Instance()->GetAudioBitrate(), cDevice::ActualDevice()->CardIndex());
+     else
+        return cString::sprintf("--- kbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
+     }
+  else if (strcasecmp(Command, "DDBR") == 0) {
+     if (cFemonOsd::Instance())
+        return cString::sprintf("%.0f kbit/s on device #%d", cFemonOsd::Instance()->GetDolbyBitrate(), cDevice::ActualDevice()->CardIndex());
+     else
+        return cString::sprintf("--- kbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
+     }
+  return NULL;
+}
+
 cMenuFemonSetup::cMenuFemonSetup(void)
 {
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
  dispmodes[eFemonModeBasic]       = tr("basic");
  dispmodes[eFemonModeTransponder] = tr("transponder");
  dispmodes[eFemonModeStream]      = tr("stream");
  dispmodes[eFemonModeAC3]         = tr("AC-3");

+  skins[eFemonSkinClassic]         = tr("Classic");
+  skins[eFemonSkinElchi]           = tr("Elchi");
+
  themes[eFemonThemeClassic]       = tr("Classic");
  themes[eFemonThemeElchi]         = tr("Elchi");
  themes[eFemonThemeDeepBlue]      = tr("DeepBlue");
  themes[eFemonThemeMoronimo]      = tr("Moronimo");
+  themes[eFemonThemeEnigma]        = tr("Enigma");
+  themes[eFemonThemeEgalsTry]      = tr("EgalsTry");
+  themes[eFemonThemeDuotone]       = tr("Duotone");

+  data = femonConfig;
  Setup();
 }

@@ -112,20 +246,21 @@ void cMenuFemonSetup::Setup(void)
  int current = Current();

  Clear();
-  Add(new cMenuEditBoolItem(  tr("Hide main menu entry"),        &femonConfig.hidemenu,       tr("no"),            tr("yes")));
-  Add(new cMenuEditBoolItem(  tr("Use syslog output"),           &femonConfig.syslogoutput,   tr("no"),            tr("yes")));
-  Add(new cMenuEditStraItem(  tr("Default display mode"),        &femonConfig.displaymode,    eFemonModeMaxNumber, dispmodes));
-  Add(new cMenuEditStraItem(  tr("Theme"),                       &femonConfig.theme,          eFemonThemeMaxNumber,themes));
-  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"),        tr("top")));
-  Add(new cMenuEditIntItem(   tr("Height"),                      &femonConfig.osdheight,      400,                 500));
-  Add(new cMenuEditIntItem(   tr("Horizontal offset"),           &femonConfig.osdoffset,      -50,                 50));
-  Add(new cMenuEditBoolItem(  tr("Show CA system"),              &femonConfig.showcasystem,   tr("no"),            tr("yes")));
-  Add(new cMenuEditIntItem(   tr("Red limit [%]"),               &femonConfig.redlimit,       1,                   50));
-  Add(new cMenuEditIntItem(   tr("Green limit [%]"),             &femonConfig.greenlimit,     51,                  100));
-  Add(new cMenuEditIntItem(   tr("OSD update interval [0.1s]"),  &femonConfig.updateinterval, 1,                   100));
-  Add(new cMenuEditBoolItem(  tr("Analyze stream"),              &femonConfig.analyzestream,  tr("no"),            tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Hide main menu entry"),        &data.hidemenu,       tr("no"),            tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Use syslog output"),           &data.syslogoutput,   tr("no"),            tr("yes")));
+  Add(new cMenuEditStraItem(  tr("Default display mode"),        &data.displaymode,    eFemonModeMaxNumber, dispmodes));
+  Add(new cMenuEditStraItem(  tr("Skin"),                        &data.skin,           eFemonSkinMaxNumber, skins));
+  Add(new cMenuEditStraItem(  tr("Theme"),                       &data.theme,          eFemonThemeMaxNumber,themes));
+  Add(new cMenuEditBoolItem(  tr("Position"),                    &data.position,       tr("bottom"),        tr("top")));
+  Add(new cMenuEditIntItem(   tr("Height"),                      &data.osdheight,      400,                 500));
+  Add(new cMenuEditIntItem(   tr("Horizontal offset"),           &data.osdoffset,      -50,                 50));
+  Add(new cMenuEditBoolItem(  tr("Show CA system"),              &data.showcasystem,   tr("no"),            tr("yes")));
+  Add(new cMenuEditIntItem(   tr("Red limit [%]"),               &data.redlimit,       1,                   50));
+  Add(new cMenuEditIntItem(   tr("Green limit [%]"),             &data.greenlimit,     51,                  100));
+  Add(new cMenuEditIntItem(   tr("OSD update interval [0.1s]"),  &data.updateinterval, 1,                   100));
+  Add(new cMenuEditBoolItem(  tr("Analyze stream"),              &data.analyzestream,  tr("no"),            tr("yes")));
  if (femonConfig.analyzestream)
-     Add(new cMenuEditIntItem(tr("Calculation interval [0.1s]"), &femonConfig.calcinterval,   1,                   100));
+     Add(new cMenuEditIntItem(tr("Calculation interval [0.1s]"), &data.calcinterval,   1,                   100));

  SetCurrent(Get(current));
  Display();
@@ -133,9 +268,12 @@ void cMenuFemonSetup::Setup(void)

 void cMenuFemonSetup::Store(void)
 {
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  femonConfig = data;
  SetupStore("HideMenu",       femonConfig.hidemenu);
  SetupStore("SyslogOutput",   femonConfig.syslogoutput);
  SetupStore("DisplayMode",    femonConfig.displaymode);
+  SetupStore("Skin",           femonConfig.skin);
  SetupStore("Theme",          femonConfig.theme);
  SetupStore("Position",       femonConfig.position);
  SetupStore("OSDHeight",      femonConfig.osdheight);
@@ -150,11 +288,11 @@ void cMenuFemonSetup::Store(void)

 eOSState cMenuFemonSetup::ProcessKey(eKeys Key)
 {
-  int oldAnalyzestream = femonConfig.analyzestream;
+  int oldAnalyzestream = data.analyzestream;

  eOSState state = cMenuSetupPage::ProcessKey(Key);

-  if (Key != kNone && (femonConfig.analyzestream != oldAnalyzestream)) {
+  if (Key != kNone && (data.analyzestream != oldAnalyzestream)) {
     Setup();
     }

--- a/femon.h
+++ b/femon.h
@@ -11,13 +11,11 @@

 #include <vdr/plugin.h>

-static const char *VERSION        = "0.9.2";
+static const char *VERSION        = "0.9.5";
 static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
 static const char *MAINMENUENTRY  = "Signal Information";

 class cPluginFemon : public cPlugin {
-private:
-  // Add any member variables or functions you may need here.
 public:
  cPluginFemon(void);
  virtual ~cPluginFemon();
@@ -33,12 +31,17 @@ public:
  virtual cOsdObject *MainMenuAction(void);
  virtual cMenuSetupPage *SetupMenu(void);
  virtual bool SetupParse(const char *Name, const char *Value);
+  virtual bool Service(const char *Id, void *Data);
+  virtual const char **SVDRPHelpPages(void);
+  virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
  };

 class cMenuFemonSetup : public cMenuSetupPage {
  private:
    const char *dispmodes[eFemonModeMaxNumber];
+    const char *skins[eFemonSkinMaxNumber];
    const char *themes[eFemonThemeMaxNumber];
+    cFemonConfig data;
    virtual void Setup(void);
  protected:
    virtual eOSState ProcessKey(eKeys Key);
--- a/femoncfg.c
+++ b/femoncfg.c
@@ -14,6 +14,7 @@ cFemonConfig::cFemonConfig(void)
 {
  hidemenu       = 0;
  displaymode    = 0;
+  skin           = 0;
  theme          = 0;
  position       = 1;
  redlimit       = 33;
@@ -35,6 +36,7 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
 {
  {
    // eFemonThemeClassic
+    4,          // bpp
    0x7F000000, // clrBackground
    0xFFFCFCFC, // clrTitleBackground
    0xFF000000, // clrTitleText
@@ -46,6 +48,7 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
  },
  {
    // eFemonThemeElchi
+    4,          // bpp
    0xC8000066, // clrBackground
    0xC833AAEE, // clrTitleBackground
    0xFF000000, // clrTitleText
@@ -57,6 +60,7 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
  },
  {
    // eFemonThemeDeepBlue
+    4,          // bpp
    0xC80C0C0C, // clrBackground
    0xC832557A, // clrTitleBackground
    0xFF000000, // clrTitleText
@@ -68,6 +72,7 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
  },
  {
    // eFemonThemeMoronimo
+    4,          // bpp
    0xDF294A6B, // clrBackground
    0xDF3E5578, // clrTitleBackground
    0xFF9BBAD7, // clrTitleText
@@ -77,5 +82,39 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
    0xFFCE7B00, // clrYellow
    0xFF336600, // clrGreen
  },
+  {
+    // eFemonThemeEnigma
+    4,          // bpp
+    0xB8DEE5FA, // clrBackground
+    0xB84158BC, // clrTitleBackground
+    0xFFFFFFFF, // clrTitleText
+    0xFF000000, // clrActiveText
+    0xFF000000, // clrInactiveText
+    0xB8C40000, // clrRed
+    0xB8C4C400, // clrYellow
+    0xB800C400, // clrGreen
+  },
+  {
+    // eFemonThemeEgalsTry
+    0xCA2B1B9E, // clrBackground
+    0xDFBEBAC3, // clrTitleBackground
+    0xFF280249, // clrTitleText
+    0xFFD4D7DB, // clrActiveText
+    0xDFCFCFCF, // clrInactiveText
+    0xFFFF0000, // clrRed
+    0xFFFCC024, // clrYellow
+    0xFF20980B, // clrGreen
+  },
+  {
+    // eFemonThemeDuotone
+    2,          // bpp
+    0x7F000000, // clrBackground
+    0xFFFCFCFC, // clrTitleBackground
+    0x7F000000, // clrTitleText                                                                                                              
+    0xFFFCFCFC, // clrActiveText                                                                                                            
+    0xFFFCFCFC, // clrInactiveText
+    0xFFFC1414, // clrRed
+    0xFFFCFCFC, // clrYellow
+    0xFFFCFCFC, // clrGreen
+  },
 };
-
--- a/femoncfg.h
+++ b/femoncfg.h
@@ -9,12 +9,6 @@
 #ifndef __FEMONCFG_H
 #define __FEMONCFG_H

-#ifdef FEMON_DEBUG
-#define Dprintf(x...) printf(x);
-#else
-#define Dprintf(x...) ;
-#endif
-
 enum eFemonModes
 {
  eFemonModeBasic,
@@ -30,6 +24,7 @@ public:
  cFemonConfig(void);
  int hidemenu;
  int displaymode;
+  int skin;
  int theme;
  int position;
  int redlimit;
@@ -45,17 +40,28 @@ public:

 extern cFemonConfig femonConfig;

+enum eFemonSkins
+{
+  eFemonSkinClassic,
+  eFemonSkinElchi,
+  eFemonSkinMaxNumber
+};
+
 enum eFemonThemes
 {
  eFemonThemeClassic,
  eFemonThemeElchi,
  eFemonThemeDeepBlue,
  eFemonThemeMoronimo,
+  eFemonThemeEnigma,
+  eFemonThemeEgalsTry,
+  eFemonThemeDuotone,
  eFemonThemeMaxNumber
 };

 struct cFemonTheme
 {
+  int bpp;
  int clrBackground;
  int clrTitleBackground;
  int clrTitleText;
--- a/femonclient-0.0.1/COPYING
+++ b/femonclient-0.0.1/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
--- a/femonclient-0.0.1/HISTORY
+++ b/femonclient-0.0.1/HISTORY
@@ -0,0 +1,6 @@
+VDR Plugin 'femonclient' Revision History
+-----------------------------------------
+
+2005-08-28: Version 0.0.1
+
+- Initial revision.
--- a/femonclient-0.0.1/Makefile
+++ b/femonclient-0.0.1/Makefile
@@ -0,0 +1,82 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile 1.1 2005/08/21 10:43:12 kls Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+#
+PLUGIN = femonclient
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The C++ compiler and options:
+
+CXX      ?= g++
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+
+### The directory environment:
+
+DVBDIR = ../../../../DVB
+VDRDIR = ../../..
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### Allow user defined options to overwrite defaults:
+
+-include $(VDRDIR)/Make.config
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
+### The name of the distribution archive:
+
+ARCHIVE = svcintf-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR)/PLUGINS/src/femon/
+
+DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+
+# Dependencies:
+
+MAKEDEP = g++ -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Targets:
+
+all: libvdr-$(PLUGIN).so
+
+libvdr-$(PLUGIN).so: $(PLUGIN).o
+	$(CXX) $(CXXFLAGS) -shared $(PLUGIN).o -o $@
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+
+dist: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
--- a/femonclient-0.0.1/README
+++ b/femonclient-0.0.1/README
@@ -0,0 +1,14 @@
+This is a "plugin" for the Video Disk Recorder (VDR).
+
+Written by:                  R o l f . A h r e n b e r g @ s c i . f i
+
+Project's homepage:          http://www.saunalahti.fi/~rahrenbe/vdr/femon/
+
+Latest version available at: http://www.saunalahti.fi/~rahrenbe/vdr/femon/
+
+See the file COPYING for license information.
+
+Description:
+
+Demo client for the service interface of the Femon plugin.
+
--- a/femonclient-0.0.1/femonclient.c
+++ b/femonclient-0.0.1/femonclient.c
@@ -0,0 +1,51 @@
+/*
+ * femonclient.c: Demo femon service client plugin
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id: $
+ */
+
+#include <stdlib.h>
+#include <vdr/interface.h>
+#include <vdr/plugin.h>
+#include "femonservice.h"
+
+static const char *VERSION        = "0.0.1";
+static const char *DESCRIPTION    = "Femon client";
+static const char *MAINMENUENTRY  = "Show frontend statistic on console";
+
+class cPluginFemonClient : public cPlugin {
+public:
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return DESCRIPTION; }
+  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
+  virtual cOsdObject *MainMenuAction(void);
+  };
+
+// --- cPluginFemonClient ----------------------------------------------------------
+
+cOsdObject *cPluginFemonClient::MainMenuAction(void)
+{
+  FemonService_v1_0 femon;
+  cPlugin *p;
+
+  p = cPluginManager::CallFirstService("FemonService-v1.0", &femon);
+  if (p) {
+     printf("Device : %s\n", *femon.fe_name);
+     printf("Status : %s\n", *femon.fe_status);
+     printf("Signal : %04X (%2d%%)\n", femon.fe_signal, femon.fe_signal / 655);
+     printf("SNR    : %04X (%2d%%)\n", femon.fe_snr, femon.fe_snr / 655);
+     printf("BER    : %08X\n", femon.fe_ber);
+     printf("UNC    : %08X\n", femon.fe_unc);
+     printf("Video  : %.2f Mbit/s\n", femon.video_bitrate);
+     printf("Audio  : %.0f kbit/s\n", femon.audio_bitrate);
+     printf("Dolby  : %.0f kbit/s\n", femon.dolby_bitrate);
+     }
+  else
+     printf("\n--- No support for FemonService-v1.0 found ---\n");
+
+  return NULL;
+}
+
+VDRPLUGINCREATOR(cPluginFemonClient); // Don't touch this!
--- a/femoni18n.c
+++ b/femoni18n.c
@@ -15,7 +15,7 @@ const tI18nPhrase Phrases[] = {
    "Visualizza le informazioni sul segnale DVB", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Affiche les informations du signal DVB", // Fran<61>ais
    "", // Norsk
    "Signaalimittari (OSD)", // suomi
    "", // Polski
@@ -36,7 +36,7 @@ const tI18nPhrase Phrases[] = {
    "Informazioni sul segnale", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Signal DVB", // Fran<61>ais
    "", // Norsk
    "Signaalimittari", // suomi
    "", // Polski
@@ -57,7 +57,7 @@ const tI18nPhrase Phrases[] = {
    "Posizione", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Position", // Fran<61>ais
    "", // Norsk
    "Sijainti", // suomi
    "", // Polski
@@ -78,7 +78,7 @@ const tI18nPhrase Phrases[] = {
    "Altezza", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Hauteur", // Fran<61>ais
    "", // Norsk
    "Korkeus", // suomi
    "", // Polski
@@ -99,7 +99,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "D<EFBFBD>placement horizontal", // Fran<61>ais
    "", // Norsk
    "Vaakakeskitys", // suomi
    "", // Polski
@@ -120,11 +120,11 @@ const tI18nPhrase Phrases[] = {
    "Modo di visualizzazione standard", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais 
+    "Affichage par d<>faut", // Fran<61>ais
    "", // Norsk
    "Oletusn<EFBFBD>ytt<EFBFBD>tila", // suomi
-    "", // Polski   
-    "", // Espa<70>ol  
+    "", // Polski
+    "", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -141,11 +141,11 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais 
+    "basique", // Fran<61>ais
    "", // Norsk
    "perus", // suomi
-    "", // Polski   
-    "", // Espa<70>ol  
+    "", // Polski
+    "", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -162,11 +162,11 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais 
+    "transpondeur", // Fran<61>ais
    "", // Norsk
    "transponderi", // suomi
-    "", // Polski   
-    "", // Espa<70>ol  
+    "", // Polski
+    "", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -183,11 +183,11 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais 
+    "flux", // Fran<61>ais
    "", // Norsk
    "l<EFBFBD>hete", // suomi
-    "", // Polski   
-    "", // Espa<70>ol  
+    "", // Polski
+    "", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -198,17 +198,38 @@ const tI18nPhrase Phrases[] = {
    "voog", // Eesti
    "", // Dansk
  },
+  { "Skin", // English
+    "Oberfl<EFBFBD>che", // Deutsch
+    "", // Slovenski
+    "", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "Skin", // Fran<61>ais
+    "", // Norsk
+    "Ulkoasu", // suomi
+    "", // Polski
+    "", // Espa<70>ol  
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catal<61> 
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+    "Kest", // Eesti
+    "", // Dansk 
+  },
  { "Theme", // English
    "Thema", // Deutsch
    "", // Slovenski
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais 
+    "Th<EFBFBD>me", // Fran<61>ais
    "", // Norsk
    "Teema", // suomi
-    "", // Polski   
-    "", // Espa<70>ol  
+    "", // Polski
+    "", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -225,16 +246,16 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais 
+    "Classique", // Fran<61>ais
    "", // Norsk
    "Klassinen", // suomi
-    "", // Polski   
-    "", // Espa<70>ol  
+    "", // Polski
+    "", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
-    "", // Magyar  
-    "", // Catal<61>  
+    "", // Magyar
+    "", // Catal<61>
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
    "", // Hrvatski (Croatian)
    "Klassikaline", // Eesti
@@ -246,16 +267,16 @@ const tI18nPhrase Phrases[] = {
    "Elchi", // Italiano
    "Elchi", // Nederlands
    "Elchi", // Portugu<67>s
-    "Elchi", // Fran<61>ais 
+    "Elchi", // Fran<61>ais
    "Elchi", // Norsk
    "Elchi", // suomi
-    "Elchi", // Polski   
-    "Elchi", // Espa<70>ol  
+    "Elchi", // Polski
+    "Elchi", // Espa<70>ol
    "Elchi", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "Elchi", // Svenska
    "Elchi", // Romaneste
-    "Elchi", // Magyar  
-    "Elchi", // Catal<61>  
+    "Elchi", // Magyar
+    "Elchi", // Catal<61>
    "Elchi", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
    "Elchi", // Hrvatski (Croatian)
    "Elchi", // Eesti
@@ -267,16 +288,16 @@ const tI18nPhrase Phrases[] = {
    "DeepBlue", // Italiano
    "DeepBlue", // Nederlands
    "DeepBlue", // Portugu<67>s
-    "DeepBlue", // Fran<61>ais 
+    "DeepBlue", // Fran<61>ais
    "DeepBlue", // Norsk
    "DeepBlue", // suomi
-    "DeepBlue", // Polski   
-    "DeepBlue", // Espa<70>ol  
+    "DeepBlue", // Polski
+    "DeepBlue", // Espa<70>ol
    "DeepBlue", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "DeepBlue", // Svenska
    "DeepBlue", // Romaneste
-    "DeepBlue", // Magyar  
-    "DeepBlue", // Catal<61>  
+    "DeepBlue", // Magyar
+    "DeepBlue", // Catal<61>
    "DeepBlue", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
    "DeepBlue", // Hrvatski (Croatian)
    "DeepBlue", // Eesti
@@ -288,28 +309,91 @@ const tI18nPhrase Phrases[] = {
    "Moronimo", // Italiano
    "Moronimo", // Nederlands
    "Moronimo", // Portugu<67>s
-    "Moronimo", // Fran<61>ais 
+    "Moronimo", // Fran<61>ais
    "Moronimo", // Norsk
    "Moronimo", // suomi
-    "Moronimo", // Polski   
-    "Moronimo", // Espa<70>ol  
+    "Moronimo", // Polski
+    "Moronimo", // Espa<70>ol
    "Moronimo", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "Moronimo", // Svenska
    "Moronimo", // Romaneste
-    "Moronimo", // Magyar  
-    "Moronimo", // Catal<61>  
+    "Moronimo", // Magyar
+    "Moronimo", // Catal<61>
    "Moronimo", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
    "Moronimo", // Hrvatski (Croatian)
    "Moronimo", // Eesti
    "Moronimo", // Dansk
  },
+  { "Enigma", // English
+    "Enigma", // Deutsch
+    "Enigma", // Slovenski
+    "Enigma", // Italiano
+    "Enigma", // Nederlands
+    "Enigma", // Portugu<67>s
+    "Enigma", // Fran<61>ais
+    "Enigma", // Norsk
+    "Enigma", // suomi
+    "Enigma", // Polski
+    "Enigma", // Espa<70>ol
+    "Enigma", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "Enigma", // Svenska
+    "Enigma", // Romaneste
+    "Enigma", // Magyar
+    "Enigma", // Catal<61>
+    "Enigma", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "Enigma", // Hrvatski (Croatian)
+    "Enigma", // Eesti
+    "Enigma", // Dansk
+  },
+  { "EgalsTry", // English
+    "EgalsTry", // Deutsch
+    "EgalsTry", // Slovenski
+    "EgalsTry", // Italiano
+    "EgalsTry", // Nederlands
+    "EgalsTry", // Portugu<67>s
+    "EgalsTry", // Fran<61>ais
+    "EgalsTry", // Norsk
+    "EgalsTry", // suomi
+    "EgalsTry", // Polski
+    "EgalsTry", // Espa<70>ol
+    "EgalsTry", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "EgalsTry", // Svenska
+    "EgalsTry", // Romaneste
+    "EgalsTry", // Magyar
+    "EgalsTry", // Catal<61>
+    "EgalsTry", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "EgalsTry", // Hrvatski (Croatian)
+    "EgalsTry", // Eesti
+    "EgalsTry", // Dansk
+  },
+  { "Duotone", // English
+    "Duotone", // Deutsch
+    "Duotone", // Slovenski
+    "Duotone", // Italiano
+    "Duotone", // Nederlands
+    "Duotone", // Portugu<67>s
+    "Duotone", // Fran<61>ais
+    "Duotone", // Norsk
+    "Duotone", // suomi
+    "Duotone", // Polski
+    "Duotone", // Espa<70>ol
+    "Duotone", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "Duotone", // Svenska
+    "Duotone", // Romaneste
+    "Duotone", // Magyar
+    "Duotone", // Catal<61>
+    "Duotone", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "Duotone", // Hrvatski (Croatian)
+    "Duotone", // Eesti
+    "Duotone", // Dansk
+  },
  { "Hide main menu entry", // English
    "Hauptmen<EFBFBD>eintrag verstecken", // Deutsch
    "", // Slovenski
    "Nascondi voce men<65>", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Masquer dans le menu principal", // Fran<61>ais
    "", // Norsk
    "Piilota valinta p<><70>valikosta", // suomi
    "", // Polski
@@ -330,7 +414,7 @@ const tI18nPhrase Phrases[] = {
    "Intervallo di aggiornamento [0.1s]", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Intervalle de mise <20> jour (0,1s)", // Fran<61>ais
    "", // Norsk
    "N<EFBFBD>yt<EFBFBD>n p<>ivitysv<73>li [0.1s]", // suomi
    "", // Polski
@@ -351,7 +435,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Analyser le flux", // Fran<61>ais
    "", // Norsk
    "L<EFBFBD>hetteen analysointi", // suomi
    "", // Polski
@@ -372,7 +456,7 @@ const tI18nPhrase Phrases[] = {
    "Intervallo di calcolo [0.1s]", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Intervalle de calcul (0,1s)", // Fran<61>ais
    "", // Norsk
    "Laskennan p<>ivitysv<73>li [0.1s]", // suomi
    "", // Polski
@@ -393,7 +477,7 @@ const tI18nPhrase Phrases[] = {
    "Limite rosso [%]", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Limite du rouge (%)", // Fran<61>ais
    "", // Norsk
    "Punaisen taso [%]", // suomi
    "", // Polski
@@ -414,7 +498,7 @@ const tI18nPhrase Phrases[] = {
    "Limite verde [%]", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Limite du vert (%)", // Fran<61>ais
    "", // Norsk
    "Vihre<EFBFBD>n taso [%]", // suomi
    "", // Polski
@@ -435,10 +519,10 @@ const tI18nPhrase Phrases[] = {
    "Informazioni transponder", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Information transpondeur", // Fran<61>ais
    "", // Norsk   
    "Transponderin tiedot", // suomi
-    "", // Polski   
+    "", // Polski
    "", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
@@ -456,7 +540,7 @@ const tI18nPhrase Phrases[] = {
    "Scheda satellitare", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Carte Satellite", // Fran<61>ais
    "", // Norsk
    "Satelliittikortti", // suomi
    "", // Polski
@@ -477,7 +561,7 @@ const tI18nPhrase Phrases[] = {
    "Scheda via cavo", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Carte C<>ble", // Fran<61>ais
    "", // Norsk
    "Kaapelikortti", // suomi
    "", // Polski
@@ -498,7 +582,7 @@ const tI18nPhrase Phrases[] = {
    "Scheda terrestre", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Carte TNT", // Fran<61>ais
    "", // Norsk
    "Terrestiaalikortti", // suomi
    "", // Polski
@@ -519,7 +603,7 @@ const tI18nPhrase Phrases[] = {
    "Registra su syslog", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Enregistrer les infos dans syslog", // Fran<61>ais
    "", // Norsk
    "Kirjaa systeemilokiin", // suomi
    "", // Polski
@@ -561,7 +645,7 @@ const tI18nPhrase Phrases[] = {
    "Video", // Italiano
    "Video", // Nederlands
    "Video", // Portugu<67>s
-    "Video", // Fran<61>ais
+    "Vid<EFBFBD>o", // Fran<61>ais
    "Video", // Norsk
    "Kuva", // suomi
    "Video", // Polski
@@ -603,7 +687,7 @@ const tI18nPhrase Phrases[] = {
    "None", // Italiano
    "None", // Nederlands
    "None", // Portugu<67>s
-    "None", // Fran<61>ais
+    "Aucun", // Fran<61>ais
    "None", // Norsk
    "ei", // suomi
    "None", // Polski
@@ -624,7 +708,7 @@ const tI18nPhrase Phrases[] = {
    "Off", // Italiano
    "Off", // Nederlands
    "Off", // Portugu<67>s
-    "Off", // Fran<61>ais
+    "Non", // Fran<61>ais
    "Off", // Norsk
    "poissa", // suomi
    "Off", // Polski
@@ -645,7 +729,7 @@ const tI18nPhrase Phrases[] = {
    "On", // Italiano
    "On", // Nederlands
    "On", // Portugu<67>s
-    "On", // Fran<61>ais
+    "Oui", // Fran<61>ais
    "On", // Norsk
    "p<EFBFBD><EFBFBD>ll<EFBFBD>", // suomi
    "On", // Polski
@@ -729,7 +813,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Information flux", // Fran<61>ais
    "", // Norsk
    "L<EFBFBD>hetteen tiedot", // suomi
    "", // Polski
@@ -750,7 +834,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "MPEG Layer", // Fran<61>ais
    "", // Norsk
    "MPEG-taso", // suomi
    "", // Polski
@@ -771,7 +855,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Flux vid<69>o", // Fran<61>ais
    "", // Norsk
    "Kuvaraita", // suomi
    "", // Polski
@@ -792,7 +876,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Bitrate", // Fran<61>ais
    "", // Norsk
    "Bittinopeus", // suomi
    "", // Polski
@@ -813,7 +897,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Rafra<EFBFBD>chissement", // Fran<61>ais
    "", // Norsk
    "Ruudunp<EFBFBD>ivitysnopeus", // suomi
    "", // Polski
@@ -855,7 +939,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Proportions d'image", // Fran<61>ais
    "", // Norsk
    "Kuvasuhde", // suomi
    "", // Polski
@@ -876,7 +960,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "r<EFBFBD>serv<EFBFBD>", // Fran<61>ais
    "", // Norsk
    "varattu", // suomi
    "", // Polski
@@ -897,10 +981,10 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "libre", // Fran<61>ais
    "", // Norsk
    "vapaa", // suomi
-    "", // Polski   
+    "", // Polski
    "", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
@@ -918,7 +1002,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Standard vid<69>o", // Fran<61>ais
    "", // Norsk
    "Kuvaformaatti", // suomi
    "", // Polski
@@ -981,7 +1065,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "inconnu", // Fran<61>ais
    "", // Norsk
    "tuntematon", // suomi
    "", // Polski
@@ -1002,7 +1086,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "R<EFBFBD>solution", // Fran<61>ais
    "", // Norsk
    "Resoluutio", // suomi
    "", // Polski
@@ -1023,7 +1107,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Flux audio", // Fran<61>ais
    "", // Norsk
    "<EFBFBD><EFBFBD>niraita", // suomi
    "", // Polski
@@ -1044,7 +1128,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Fr<EFBFBD>quence d'<27>chantillonage", // Fran<61>ais
    "", // Norsk
    "N<EFBFBD>ytteenottotaajuus", // suomi
    "", // Polski
@@ -1068,7 +1152,7 @@ const tI18nPhrase Phrases[] = {
    "kHz", // Fran<61>ais
    "kHz", // Norsk
    "kHz", // suomi
-    "kHz", // Polski   
+    "kHz", // Polski
    "kHz", // Espa<70>ol
    "kHz", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "kHz", // Svenska
@@ -1185,6 +1269,27 @@ const tI18nPhrase Phrases[] = {
    "Rid", // Eesti
    "Rid", // Dansk
  },
+  { "Coderate", // English
+    "Coderate", // Deutsch
+    "Coderate", // Slovenski
+    "Coderate", // Italiano
+    "Coderate", // Nederlands
+    "Coderate", // Portugu<67>s
+    "Coderate", // Fran<61>ais
+    "Coderate", // Norsk
+    "Suojaustaso", // suomi
+    "Coderate", // Polski
+    "Coderate", // Espa<70>ol
+    "Coderate", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "Coderate", // Svenska
+    "Coderate", // Romaneste
+    "Coderate", // Magyar
+    "Coderate", // Catal<61>
+    "Coderate", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "Coderate", // Hrvatski (Croatian)
+    "Coderate", // Eesti
+    "Coderate", // Dansk
+  },
  { "dB", // English
    "dB", // Deutsch
    "dB", // Slovenski
@@ -1194,7 +1299,7 @@ const tI18nPhrase Phrases[] = {
    "dB", // Fran<61>ais
    "dB", // Norsk
    "dB", // suomi
-    "dB", // Polski   
+    "dB", // Polski
    "dB", // Espa<70>ol
    "dB", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "dB", // Svenska
@@ -1212,7 +1317,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "non indiqu<71>", // Fran<61>ais
    "", // Norsk
    "ei ilmaistu", // suomi
    "", // Polski
@@ -1254,7 +1359,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Flux AC-3", // Fran<61>ais
    "", // Norsk
    "AC-3-<2D><>niraita", // suomi
    "", // Polski
@@ -1275,7 +1380,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Taille de paquet", // Fran<61>ais
    "", // Norsk
    "Kehyksen koko", // suomi
    "", // Polski
@@ -1296,7 +1401,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Mode bitstream", // Fran<61>ais
    "", // Norsk
    "L<EFBFBD>hetteen tyyppi", // suomi
    "", // Polski
@@ -1317,7 +1422,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Mode de codage audio", // Fran<61>ais
    "", // Norsk
    "<EFBFBD><EFBFBD>nikoodaus", // suomi
    "", // Polski
@@ -1338,7 +1443,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Niveau sonore milieu", // Fran<61>ais
    "", // Norsk
    "Keskikanavan taso", // suomi
    "", // Polski
@@ -1359,7 +1464,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Niveau sonore surround", // Fran<61>ais
    "", // Norsk
    "Tehostekanavien taso", // suomi
    "", // Polski
@@ -1380,7 +1485,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Mode Dolby Surround", // Fran<61>ais
    "", // Norsk
    "Dolby Surround -tehoste", // suomi
    "", // Polski
@@ -1401,7 +1506,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Effets de basses", // Fran<61>ais
    "", // Norsk
    "LFE-kanava", // suomi
    "", // Polski
@@ -1422,7 +1527,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Normalisation des dialogues", // Fran<61>ais
    "", // Norsk
    "Dialogin normalisointi", // suomi
    "", // Polski
@@ -1443,7 +1548,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Principal (CM)", // Fran<61>ais
    "", // Norsk
    "P<EFBFBD><EFBFBD>asiallinen (CM)", // suomi
    "", // Polski
@@ -1464,7 +1569,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Musique et effets (ME)", // Fran<61>ais
    "", // Norsk
    "Musiikki ja tehosteet (ME)", // suomi
    "", // Polski
@@ -1485,7 +1590,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Malvoyants (VI)", // Fran<61>ais
    "", // Norsk
    "N<EFBFBD>k<EFBFBD>rajoitteinen (VI)", // suomi
    "", // Polski
@@ -1506,7 +1611,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Malentendants (HI)", // Fran<61>ais
    "", // Norsk
    "Kuulorajoitteinen (HI)", // suomi
    "", // Polski
@@ -1527,7 +1632,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Dialogue (D)", // Fran<61>ais
    "", // Norsk
    "Vuoropuhelu (D)", // suomi
    "", // Polski
@@ -1548,7 +1653,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Commentaires (C)", // Fran<61>ais
    "", // Norsk
    "Kommentointi (C)", // suomi
    "", // Polski
@@ -1569,7 +1674,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Urgence (E)", // Fran<61>ais
    "", // Norsk
    "H<EFBFBD>t<EFBFBD>tiedote (E)", // suomi
    "", // Polski
@@ -1590,7 +1695,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Voix off (VO)", // Fran<61>ais
    "", // Norsk
    "P<EFBFBD><EFBFBD>lle puhuttu (VO)", // suomi
    "", // Polski
@@ -1611,7 +1716,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Karaoke", // Fran<61>ais
    "", // Norsk
    "Karaoke", // suomi
    "", // Polski
@@ -1632,7 +1737,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Can. 1", // Fran<61>ais
    "", // Norsk
    "kan. 1", // suomi
    "", // Polski
@@ -1653,7 +1758,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Can. 2", // Fran<61>ais
    "", // Norsk
    "kan. 2", // suomi
    "", // Polski
@@ -1674,7 +1779,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Centre", // Fran<61>ais
    "", // Norsk
    "K", // suomi
    "", // Polski
@@ -1695,7 +1800,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Gauche", // Fran<61>ais
    "", // Norsk
    "V", // suomi
    "", // Polski
@@ -1716,7 +1821,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Droite", // Fran<61>ais
    "", // Norsk
    "O", // suomi
    "", // Polski
@@ -1737,7 +1842,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Surround", // Fran<61>ais
    "", // Norsk
    "T", // suomi
    "", // Polski
@@ -1758,7 +1863,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Surround gauche", // Fran<61>ais
    "", // Norsk
    "TV", // suomi
    "", // Polski
@@ -1779,7 +1884,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Surround droit", // Fran<61>ais
    "", // Norsk
    "TO", // suomi
    "", // Polski
@@ -1800,7 +1905,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Syst<EFBFBD>me CA", // Fran<61>ais
    "", // Norsk
    "N<EFBFBD>yt<EFBFBD> salausj<73>rjestelm<6C>", // suomi
    "", // Polski
@@ -1821,7 +1926,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Fixe", // Fran<61>ais
    "", // Norsk
    "kiinte<EFBFBD>", // suomi
    "", // Polski
@@ -1842,7 +1947,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Analogique", // Fran<61>ais
    "", // Norsk
    "analoginen", // suomi
    "", // Polski
@@ -1863,7 +1968,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Free To Air", // Fran<61>ais
    "", // Norsk
    "salaamaton", // suomi
    "", // Polski
@@ -1884,7 +1989,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "SECA/Mediaguard", // Fran<61>ais
    "", // Norsk
    "SECA/Mediaguard", // suomi
    "", // Polski
@@ -1905,7 +2010,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Viaccess", // Fran<61>ais
    "", // Norsk
    "Viaccess", // suomi
    "", // Polski
@@ -1926,7 +2031,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Irdeto", // Fran<61>ais
    "", // Norsk
    "Irdeto", // suomi
    "", // Polski
@@ -1947,7 +2052,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "NDS/Videoguard", // Fran<61>ais
    "", // Norsk
    "NDS/Videoguard", // suomi
    "", // Polski
@@ -1968,7 +2073,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "Conax", // Fran<61>ais
    "", // Norsk
    "Conax", // suomi
    "", // Polski
@@ -1989,7 +2094,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "CryptoWorks", // Fran<61>ais
    "", // Norsk
    "CryptoWorks", // suomi
    "", // Polski
@@ -2010,7 +2115,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "PowerVu", // Fran<61>ais
    "", // Norsk
    "PowerVu", // suomi
    "", // Polski
@@ -2031,7 +2136,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "BetaCrypt", // Fran<61>ais
    "", // Norsk
    "BetaCrypt", // suomi
    "", // Polski
@@ -2052,7 +2157,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "NagraVision", // Fran<61>ais
    "", // Norsk
    "NagraVision", // suomi
    "", // Polski
@@ -2073,7 +2178,7 @@ const tI18nPhrase Phrases[] = {
    "", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
-    "", // Fran<61>ais
+    "SkyCrypt", // Fran<61>ais
    "", // Norsk   
    "SkyCrypt", // suomi
    "", // Polski
--- a/femonosd.c
+++ b/femonosd.c
@@ -10,6 +10,7 @@
 #include "femoncfg.h"
 #include "femoni18n.h"
 #include "femonreceiver.h"
+#include "femontools.h"
 #include "femonosd.h"

 #include "symbols/device.xpm"
@@ -37,7 +38,6 @@
 #include "symbols/viterbi.xpm"
 #include "symbols/sync.xpm"

-#define FRONTEND_DEVICE           "/dev/dvb/adapter%d/frontend%d"
 #define CHANNELINPUT_TIMEOUT      1000

 #define OSDHEIGHT                 femonConfig.osdheight   // in pixels
@@ -47,6 +47,7 @@
 #define OSDSTATUSHEIGHT           (OSDROWHEIGHT * 6)      // in pixels (6 rows)
 #define OSDSPACING                5
 #define OSDCORNERING              10
+#define IS_OSDCORNERING           (femonConfig.skin == eFemonSkinElchi)

 #define OSDINFOWIN_Y(offset)      (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
 #define OSDINFOWIN_X(col)         ((col == 4) ? 455 : (col == 3) ? 305 : (col == 2) ? 155 : 15)
@@ -80,7 +81,19 @@ cBitmap cFemonOsd::bmCarrier(carrier_xpm);
 cBitmap cFemonOsd::bmViterbi(viterbi_xpm);
 cBitmap cFemonOsd::bmSync(sync_xpm);

-cFemonOsd::cFemonOsd(void)
+cFemonOsd *cFemonOsd::pInstance = NULL;
+
+cFemonOsd *cFemonOsd::Instance(bool create)
+{
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  if (pInstance == NULL && create)
+  {
+     pInstance = new cFemonOsd();
+  }
+  return (pInstance);
+}
+
+cFemonOsd::cFemonOsd()
 :cOsdObject(true), cThread("femon osd")
 {
  Dprintf("%s()\n", __PRETTY_FUNCTION__);
@@ -109,13 +122,13 @@ cFemonOsd::cFemonOsd(void)
 cFemonOsd::~cFemonOsd(void)
 {
  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  if (Running()) {
+  if (Running())
     Cancel(3);
-     }
  if (m_Receiver)
     delete m_Receiver;
  if (m_Osd)
     delete m_Osd;
+  pInstance = NULL;
 }

 void cFemonOsd::DrawStatusWindow(void)
@@ -136,8 +149,10 @@ void cFemonOsd::DrawStatusWindow(void)
     snprintf(buf, sizeof(buf), "%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->ShortName(true));
     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground);
     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
-     m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(0), OSDCORNERING, OSDSTATUSWIN_Y(OSDCORNERING), clrTransparent, -2);
-     m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDCORNERING), clrTransparent, -1);
+     if (IS_OSDCORNERING) {
+        m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(0), OSDCORNERING, OSDSTATUSWIN_Y(OSDCORNERING), clrTransparent, -2);
+        m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDCORNERING), clrTransparent, -1);
+        }
     if (m_Receiver) {
        value = cDevice::ActualDevice()->CardIndex();
        if (value == 1) {
@@ -343,8 +358,10 @@ void cFemonOsd::DrawStatusWindow(void)
     m_Osd->DrawBitmap(OSDSTATUSWIN_XSYMBOL(3, x), OSDSTATUSWIN_Y(offset + y), bmCarrier, (m_FrontendStatus & FE_HAS_CARRIER) ? femonTheme[femonConfig.theme].clrActiveText : femonTheme[femonConfig.theme].clrRed, femonTheme[femonConfig.theme].clrBackground);
     m_Osd->DrawBitmap(OSDSTATUSWIN_XSYMBOL(4, x), OSDSTATUSWIN_Y(offset + y), bmViterbi, (m_FrontendStatus & FE_HAS_VITERBI) ? femonTheme[femonConfig.theme].clrActiveText : femonTheme[femonConfig.theme].clrRed, femonTheme[femonConfig.theme].clrBackground);
     m_Osd->DrawBitmap(OSDSTATUSWIN_XSYMBOL(5, x), OSDSTATUSWIN_Y(offset + y), bmSync, (m_FrontendStatus & FE_HAS_SYNC) ? femonTheme[femonConfig.theme].clrActiveText : femonTheme[femonConfig.theme].clrRed, femonTheme[femonConfig.theme].clrBackground);
-     m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-OSDCORNERING), OSDCORNERING, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -3);
-     m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-OSDCORNERING), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -4);
+     if (IS_OSDCORNERING) {
+        m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-OSDCORNERING), OSDCORNERING, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -3);
+        m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-OSDCORNERING), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -4);
+        }
     m_Osd->Flush();
     }
 }
@@ -365,8 +382,10 @@ void cFemonOsd::DrawInfoWindow(void)
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground);
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground);
        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
-        m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
-        m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
+        if (IS_OSDCORNERING) {
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
+           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
+           }
        offset += OSDROWHEIGHT;
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Vpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        snprintf(buf, sizeof(buf), "%d", channel->Vpid());
@@ -614,29 +633,29 @@ void cFemonOsd::DrawInfoWindow(void)
               else if (value == INVERSION_ON)    snprintf(buf, sizeof(buf), tr("On"));
               else            /*INVERSION_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Coderate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               value = channel->CoderateH();
-               if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), tr("None"));
-               else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2");
-               else if (value == FEC_2_3)   snprintf(buf, sizeof(buf), "2/3");
-               else if (value == FEC_3_4)   snprintf(buf, sizeof(buf), "3/4");
-               else if (value == FEC_4_5)   snprintf(buf, sizeof(buf), "4/5");
-               else if (value == FEC_5_6)   snprintf(buf, sizeof(buf), "5/6");
-               else if (value == FEC_6_7)   snprintf(buf, sizeof(buf), "6/7");
-               else if (value == FEC_7_8)   snprintf(buf, sizeof(buf), "7/8");
-               else if (value == FEC_8_9)   snprintf(buf, sizeof(buf), "8/9");
-               else            /*FEC_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
+               if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), "%s (H)", tr("None"));
+               else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2 (H)");
+               else if (value == FEC_2_3)   snprintf(buf, sizeof(buf), "2/3 (H)");
+               else if (value == FEC_3_4)   snprintf(buf, sizeof(buf), "3/4 (H)");
+               else if (value == FEC_4_5)   snprintf(buf, sizeof(buf), "4/5 (H)");
+               else if (value == FEC_5_6)   snprintf(buf, sizeof(buf), "5/6 (H)");
+               else if (value == FEC_6_7)   snprintf(buf, sizeof(buf), "6/7 (H)");
+               else if (value == FEC_7_8)   snprintf(buf, sizeof(buf), "7/8 (H)");
+               else if (value == FEC_8_9)   snprintf(buf, sizeof(buf), "8/9 (H)");
+               else            /*FEC_AUTO*/ snprintf(buf, sizeof(buf), "%s (H)", tr("Auto"));
               value = channel->CoderateL();
-               if      (value == FEC_NONE)  snprintf(buf2, sizeof(buf2), " - %s", tr("None"));
-               else if (value == FEC_1_2)   snprintf(buf2, sizeof(buf2), " - 1/2");
-               else if (value == FEC_2_3)   snprintf(buf2, sizeof(buf2), " - 2/3");
-               else if (value == FEC_3_4)   snprintf(buf2, sizeof(buf2), " - 3/4");
-               else if (value == FEC_4_5)   snprintf(buf2, sizeof(buf2), " - 4/5");
-               else if (value == FEC_5_6)   snprintf(buf2, sizeof(buf2), " - 5/6");
-               else if (value == FEC_6_7)   snprintf(buf2, sizeof(buf2), " - 6/7");
-               else if (value == FEC_7_8)   snprintf(buf2, sizeof(buf2), " - 7/8");
-               else if (value == FEC_8_9)   snprintf(buf2, sizeof(buf2), " - 8/9");
-               else            /*FEC_AUTO*/ snprintf(buf2, sizeof(buf2), " - %s", tr("Auto"));
+               if      (value == FEC_NONE)  snprintf(buf2, sizeof(buf2), " %s (L)", tr("None"));
+               else if (value == FEC_1_2)   snprintf(buf2, sizeof(buf2), " 1/2 (L)");
+               else if (value == FEC_2_3)   snprintf(buf2, sizeof(buf2), " 2/3 (L)");
+               else if (value == FEC_3_4)   snprintf(buf2, sizeof(buf2), " 3/4 (L)");
+               else if (value == FEC_4_5)   snprintf(buf2, sizeof(buf2), " 4/5 (L)");
+               else if (value == FEC_5_6)   snprintf(buf2, sizeof(buf2), " 5/6 (L)");
+               else if (value == FEC_6_7)   snprintf(buf2, sizeof(buf2), " 6/7 (L)");
+               else if (value == FEC_7_8)   snprintf(buf2, sizeof(buf2), " 7/8 (L)");
+               else if (value == FEC_8_9)   snprintf(buf2, sizeof(buf2), " 8/9 (L)");
+               else            /*FEC_AUTO*/ snprintf(buf2, sizeof(buf2), " %s (L)", tr("Auto"));
               strncat(buf, buf2, sizeof(buf));
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
@@ -658,15 +677,19 @@ void cFemonOsd::DrawInfoWindow(void)
               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               break;
          }
-        m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDCORNERING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3);
-        m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4);
+        if (IS_OSDCORNERING) {
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDCORNERING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3);
+           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4);
+           }
        }
     else if (m_DisplayMode == eFemonModeStream) {
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground);
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground);
        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Stream Information"), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
-        m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
-        m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
+        if (IS_OSDCORNERING) {
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
+           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
+           }
        offset += OSDROWHEIGHT;
        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Stream"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
        snprintf(buf, sizeof(buf), "#%d", channel->Vpid());
@@ -736,16 +759,20 @@ void cFemonOsd::DrawInfoWindow(void)
           }
        else                         snprintf(buf, sizeof(buf), "---");
        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDCORNERING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3);
-        m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4);
+        if (IS_OSDCORNERING) {
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDCORNERING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3);
+           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4);
+           }
        }
     else if (m_DisplayMode == eFemonModeAC3) {
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground);
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground);
        snprintf(buf, sizeof(buf), "%s - %s #%d %s", tr("Stream Information"), tr("AC-3 Stream"), IS_DOLBY_TRACK(track) ? channel->Dpid(int(track - ttDolbyFirst)) : channel->Dpid(0), IS_DOLBY_TRACK(track) ? channel->Dlang(int(track - ttDolbyFirst)) : channel->Dlang(0));
        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
-        m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
-        m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
+        if (IS_OSDCORNERING) {
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
+           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
+           }
        offset += OSDROWHEIGHT;
        if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
@@ -831,8 +858,10 @@ void cFemonOsd::DrawInfoWindow(void)
           else           snprintf(buf, sizeof(buf), "---");
           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
           }
-        m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDCORNERING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3);
-        m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4);
+        if (IS_OSDCORNERING) {
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDCORNERING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3);
+           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4);
+           }
        }
     else /* eFemonModeBasic */ {
        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
@@ -886,13 +915,13 @@ void cFemonOsd::Show(void)
     }
  m_Osd = cOsdProvider::NewOsd(((Setup.OSDWidth - OSDWIDTH) / 2) + Setup.OSDLeft + femonConfig.osdoffset, ((Setup.OSDHeight - OSDHEIGHT) / 2) + Setup.OSDTop);
  if (m_Osd) {
-     tArea Areas1[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, 4 } };
+     tArea Areas1[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, femonTheme[femonConfig.theme].bpp } };
     if (m_Osd->CanHandleAreas(Areas1, sizeof(Areas1) / sizeof(tArea)) == oeOk) {
        m_Osd->SetAreas(Areas1, sizeof(Areas1) / sizeof(tArea));
        }
     else {
-        tArea Areas2[] = { { 0, OSDSTATUSWIN_Y(0),          (OSDWIDTH-1), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-1), 4 },
-                           { 0, OSDINFOWIN_Y(0),            (OSDWIDTH-1), OSDINFOWIN_Y(OSDROWHEIGHT-1),      4 },
+        tArea Areas2[] = { { 0, OSDSTATUSWIN_Y(0),          (OSDWIDTH-1), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-1), femonTheme[femonConfig.theme].bpp },
+                           { 0, OSDINFOWIN_Y(0),            (OSDWIDTH-1), OSDINFOWIN_Y(OSDROWHEIGHT-1),      femonTheme[femonConfig.theme].bpp },
                           { 0, OSDINFOWIN_Y(OSDROWHEIGHT), (OSDWIDTH-1), OSDINFOWIN_Y(OSDINFOHEIGHT-1),     2 } };
        m_Osd->SetAreas(Areas2, sizeof(Areas2) / sizeof(tArea));
        }
@@ -963,6 +992,69 @@ void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks)
     }
 }

+bool cFemonOsd::DeviceSwitch(int direction)
+{
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  int device = cDevice::ActualDevice()->DeviceNumber();                            
+  direction = sgn(direction);
+  if (device >= 0) {
+     cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+     for (int i = 0; i < cDevice::NumDevices() - 1; i++) {                         
+        if (direction) {
+           if (++device >= cDevice::NumDevices()) device = 0;                     
+           }
+        else {
+           if (--device < 0) device = cDevice::NumDevices() - 1;
+           }
+        if (cDevice::GetDevice(device)->ProvidesChannel(channel)) {
+           Dprintf("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, direction, device);
+           // here should be added some checks, if the device is really available (i.e. not recording)
+           cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
+           cControl::Shutdown();
+           cDevice::GetDevice(device)->SwitchChannel(channel, true);
+           // does this work with primary devices ?
+           cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
+           cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
+           return (true);
+           }
+        }
+     }
+   return (false);
+}
+
+double cFemonOsd::GetVideoBitrate(void)
+{
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  double value = 0.0;
+
+  if (m_Receiver)
+     value = m_Receiver->VideoBitrate();
+
+  return (value);
+}
+
+double cFemonOsd::GetAudioBitrate(void)
+{
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  double value = 0.0;
+
+  if (m_Receiver)
+     value = m_Receiver->AudioBitrate();
+
+  return (value);
+}
+
+double cFemonOsd::GetDolbyBitrate(void)
+{
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  double value = 0.0;
+
+  if (m_Receiver)
+     value = m_Receiver->AC3Bitrate();
+
+  return (value);
+}
+
 eOSState cFemonOsd::ProcessKey(eKeys Key)
 { 
  eOSState state = cOsdObject::ProcessKey(Key);
@@ -1043,32 +1135,10 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
               }
            break;
       case kRight:
+            DeviceSwitch(1);
+            break;
       case kLeft:
-            {
-            int device = cDevice::ActualDevice()->DeviceNumber();
-            if (device >= 0) {
-               cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-               for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
-                   if (NORMALKEY(Key) == kRight) {
-                      if (++device >= cDevice::NumDevices()) device = 0;
-                      }
-                   else {
-                      if (--device < 0) device = cDevice::NumDevices() - 1;
-                      }
-                   if (cDevice::GetDevice(device)->ProvidesChannel(channel)) {
-                      Dprintf("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, Key, device);
-                      // here should be added some checks, if the device is really available (i.e. not recording)
-                      cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
-                      cControl::Shutdown();
-                      cDevice::GetDevice(device)->SwitchChannel(channel, true);
-                      // does this work with primary devices ?
-                      cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
-                      cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
-                      break;
-                      }
-                   }
-               }
-            }
+            DeviceSwitch(-1);
            break;
       case kUp|k_Repeat:
       case kUp:
--- a/femonosd.h
+++ b/femonosd.h
@@ -21,6 +21,7 @@

 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
+  static cFemonOsd *pInstance;
  cOsd *m_Osd;
  cFemonReceiver *m_Receiver;
  int m_Frontend;
@@ -44,16 +45,24 @@ private:
  void DrawInfoWindow(void);

 protected:
+  cFemonOsd();
+  cFemonOsd(const cFemonOsd&);
+  cFemonOsd& operator= (const cFemonOsd&);
  virtual void Action(void);
  virtual void ChannelSwitch(const cDevice * device, int channelNumber);
  virtual void SetAudioTrack(int Index, const char * const *Tracks);

 public:
-  cFemonOsd(void);
+  static cFemonOsd *Instance(bool create = false);
  ~cFemonOsd();

  virtual void Show(void);
  virtual eOSState ProcessKey(eKeys Key);
+
+  bool DeviceSwitch(int direction);
+  double GetVideoBitrate(void);
+  double GetAudioBitrate(void);
+  double GetDolbyBitrate(void);
 };

 #endif //__FEMONOSD_H
--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -7,7 +7,7 @@
 */

 #include <unistd.h>
-#include <vdr/tools.h>
+#include "femontools.h"
 #include "femoncfg.h"
 #include "femonreceiver.h"

@@ -58,9 +58,8 @@ cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[])
 cFemonReceiver::~cFemonReceiver(void)
 {
  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  Detach();
  if (Running())
-     Cancel();
+     Cancel(3);
 }

 /* The following function originates from libdvbmpeg: */
--- a/femonservice.h
+++ b/femonservice.h
@@ -0,0 +1,27 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id$
+ */
+
+#ifndef __FEMONSERVICE_H
+#define __FEMONSERVICE_H
+
+#include <linux/dvb/frontend.h>
+
+struct FemonService_v1_0 {
+  cString fe_name;
+  cString fe_status;
+  uint16_t fe_snr;
+  uint16_t fe_signal;
+  uint32_t fe_ber;
+  uint32_t fe_unc;
+  double video_bitrate;
+  double audio_bitrate;
+  double dolby_bitrate;
+  };
+
+#endif //__FEMONSERVICE_H
+
--- a/femontools.c
+++ b/femontools.c
@@ -0,0 +1,110 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id$
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <linux/dvb/frontend.h>
+#include "femontools.h"
+
+cString getFrontendName(int cardIndex)
+{
+  struct dvb_frontend_info value;
+  char *dev = NULL;
+
+  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
+  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  free(dev);
+  if (fe < 0)
+     return NULL;
+  ioctl(fe, FE_GET_INFO, &value);
+  close(fe);
+
+  return (cString::sprintf("%s on device #%d", value.name, cardIndex));
+}
+
+cString getFrontendStatus(int cardIndex)
+{
+  fe_status_t value;
+  char *dev = NULL;
+
+  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
+  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  free(dev);
+  if (fe < 0)
+     return NULL;
+  CHECK(ioctl(fe, FE_READ_STATUS, &value));
+  close(fe);
+
+  return (cString::sprintf("Status %s:%s:%s:%s:%s on device #%d", (value & FE_HAS_LOCK) ? "LOCKED" : "-", (value & FE_HAS_SIGNAL) ? "SIGNAL" : "-", (value & FE_HAS_CARRIER) ? "CARRIER" : "-", (value & FE_HAS_VITERBI) ? "VITERBI" : "-", (value & FE_HAS_SYNC) ? "SYNC" : "-", cardIndex));
+}
+
+uint16_t getSignal(int cardIndex)
+{
+  uint16_t value = 0;
+  char *dev = NULL;
+
+  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
+  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  free(dev);
+  if (fe < 0)
+     return (value);
+  CHECK(ioctl(fe, FE_READ_SIGNAL_STRENGTH, &value));
+  close(fe);
+
+  return (value);
+}
+
+uint16_t getSNR(int cardIndex)
+{
+  uint16_t value = 0;
+  char *dev = NULL;
+
+  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
+  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  free(dev);
+  if (fe < 0)
+     return (value);
+  CHECK(ioctl(fe, FE_READ_SNR, &value));
+  close(fe);
+
+  return (value);
+}
+
+uint32_t getBER(int cardIndex)
+{
+  uint32_t value = 0;
+  char *dev = NULL;
+
+  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
+  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  free(dev);
+  if (fe < 0)
+     return (value);
+  CHECK(ioctl(fe, FE_READ_BER, &value));
+  close(fe);
+
+  return (value);
+}
+
+uint32_t getUNC(int cardIndex)
+{
+  uint32_t value = 0;
+  char *dev = NULL;
+
+  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
+  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  free(dev);
+  if (fe < 0)
+     return (value);
+  CHECK(ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &value));
+  close(fe);
+
+  return (value);
+}
+
--- a/femontools.h
+++ b/femontools.h
@@ -0,0 +1,30 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id$
+ */
+
+#ifndef __FEMONTOOLS_H
+#define __FEMONTOOLS_H
+
+#include <stdint.h>
+#include <vdr/tools.h>
+
+#ifdef FEMON_DEBUG
+#define Dprintf(x...) printf(x);
+#else
+#define Dprintf(x...) ;
+#endif
+
+#define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"
+
+cString getFrontendName(int cardIndex = 0);
+cString getFrontendStatus(int cardIndex = 0);
+uint16_t getSNR(int cardIndex = 0);
+uint16_t getSignal(int cardIndex = 0);
+uint32_t getBER(int cardIndex = 0);
+uint32_t getUNC(int cardIndex = 0);
+
+#endif // __FEMONTOOLS_H