Updated for vdr-1.3.7 and removed compability with older versions.

Fixed minor bitrate calculation errors.
Added russian translation (Thanks to Vyacheslav Dikonov).
2023-10-10 11:36:53 +00:00 · 2004-05-18 04:20:00 +03:00 · 2004-04-04 04:20:00 +03:00 · 2004-03-16 04:20:00 +02:00 · 2004-03-07 04:20:00 +02:00 · 2004-03-03 04:20:00 +02:00
12 changed files with 1108 additions and 267 deletions
--- a/29
+++ b/29
@@ -7,7 +7,7 @@ VDR Plugin 'femon' Revision History

 2004-02-23: Version 0.0.1b

- Fixed cThread to work under vdr-1.2.6.
+- Fixed cThread initialization to work under vdr-1.2.6.

 2004-02-26: Version 0.0.2

@@ -22,3 +22,30 @@ VDR Plugin 'femon' Revision History
 - Translation only update:
  Fixed 'Deutsch' (Thanks to Olaf Henkel @ VDRPortal).
  Added 'Italiano' (Thanks to Sean Carlos).
+
+2004-03-03: Version 0.0.3
+
+- Redesigned the user interface.
+- Transponder information is now available in advanced display mode:
+  Press 'OK' key to switch between the simple and the advanced display mode.
+- Moved bitrate calculation to it's own thread for improved accurancy.
+
+2004-03-07: Version 0.0.3a
+
+- Fixed frequency, guard and bandwidth units in transponder information.
+- Added Apid2, Dpid1, Dpid2 information.
+- Added option to write signal information into system log.
+
+2004-03-16: Version 0.0.3b
+
+- Fixed channel toggling with '0' key.
+- Bitrate calculation thread is now canceled immediately to speed up channel switching.
+
+2004-04-04: Version 0.0.3c
+
+- Fixed minor bitrate calculation errors
+- Added russian translation (Thanks to Vyacheslav Dikonov)
+
+2004-05-18: Version 0.1.0
+
+- Updated for vdr-1.3.7 and removed compability with older versions.
--- a/47
+++ b/47
@@ -11,34 +11,35 @@ See the file COPYING for license information.
 Requirements:

 Ph.D. in Astro Physics and preferably a six-pack waiting in a fridge.
+Never trust a Klingon. "Qu'vaD lI' De'vam". Beam me up, Scotty!
+You're number six!

 Description:

-DVB Frontend Status Monitor is a plugin that displays a few signal quality parameters
-of the tuned channel on your screen. You can zap through all your channels and the
-plugin should be monitoring always the right frontend *fingers crossed*. A short
-message is shown at the bottom line to help the DVB card identification after each
-channel switch and OK press.
+DVB Frontend Status Monitor is a plugin that displays some signal information
+parameters of the current tuned channel on OSD. You can zap through all your
+channels and the plugin should be monitoring always the right frontend. The
+transponder information is also available in advanced display mode. User can
+switch between simple and advanced display modes by pressing 'OK' key.

-The plugin is based on a neat console frontend status monitor application called
-'femon' by Johannes Stezenbach <js@convergence.de> (see DVB-apps/szap/femon.c for
-further information). The other parts of plugin code are borrowed from the 
-excellent OSD Picture-In-Picture plugin by Sascha Volkenandt <sascha@akv-soft.de>
-and Andreas Regel <andreas.regel@powarman.de>. Props to Sascha for being brave
-enough to test this piece of junk and ofcourse for german translations. The bitrate
-calculation algorithm is originally copied from dvbstream application by Dave Chapman
-<dave@dchapman.com>.
+The plugin is based on a neat console frontend status monitor application called 
+'femon' by Johannes Stezenbach <js@convergence.de> (see DVB-apps/szap/femon.c
+for further information). The other parts of plugin code are borrowed from the 
+excellent 'OSD Picture-In-Picture' plugin by Sascha Volkenandt <sascha@akv-soft.de>
+and Andreas Regel <andreas.regel@powarman.de>. The bitrate calculation algorithm
+originates from the 'dvbstream' application by Dave Chapman <dave@dchapman.com>.

-Shortcomings / Todo list:
+Shortcomings / Todo list / Notes:

 - The current version is a kind of Proof In Concept to replace the old 'tech
-  patch', so the internals will be eventually rewritten... if I'll find some
-  spare time.
- 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.
+  patch', and it's now eating many unnecessary cpu clock cycles - this will be
+  fixed later...
+- 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.
 - Sometimes (read always) ttxtsubs plugin messes up the OSD - user should disable
-  ttxtsubs, but closing and reopening the femon plugin might help temporarily as well.
-  Btw., this same thing happens with OSDTeletext plugin too :)
- The plugin GUI is designed for small fonts, so stable vdr-1.2.6 users should consider
-  the ElchiAIO4a+ patch to maximize the *wow* effect :)
+  ttxtsubs, but closing and reopening the femon plugin might help temporarily as
+  well. Btw., this same thing happens with OSDTeletext plugin too :)
+- The stream information is still missing.
+- Disable bitrate calculation to speed up heavy zapping sessions.
+- If you're using VDR version 1.3.6 or older, you'll have to stick with femon-0.0.3c.
--- a/femon.c
+++ b/femon.c
@@ -1,5 +1,5 @@
 /*
- * A Frontend Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
@@ -12,6 +12,10 @@
 #include "femonosd.h"
 #include "femon.h"

+#if (VDRVERSNUM < 10307)
+#error "You don't exist! Go away!"
+#endif
+
 cPluginFemon::cPluginFemon(void)
 {
  // Initialize any member variables here.
@@ -63,11 +67,15 @@ cOsdObject *cPluginFemon::MainMenuAction(void)
 bool cPluginFemon::SetupParse(const char *Name, const char *Value)
 {
  // Parse your own setup parameters and store their values.
-  if      (!strcasecmp(Name, "HideMenu"))   femonConfig.hidemenu   = atoi(Value);
-  else if (!strcasecmp(Name, "Position"))   femonConfig.position   = atoi(Value);
-  else if (!strcasecmp(Name, "Interval"))   femonConfig.interval   = atoi(Value);
-  else if (!strcasecmp(Name, "RedLimit"))   femonConfig.redlimit   = atoi(Value);
-  else if (!strcasecmp(Name, "GreenLimit")) femonConfig.greenlimit = atoi(Value);
+  if      (!strcasecmp(Name, "HideMenu"))       femonConfig.hidemenu       = atoi(Value);
+  else if (!strcasecmp(Name, "SyslogOutput"))   femonConfig.syslogoutput   = atoi(Value);
+  else if (!strcasecmp(Name, "DisplayMode"))    femonConfig.displaymode    = atoi(Value);
+  else if (!strcasecmp(Name, "Position"))       femonConfig.position       = atoi(Value);
+  else if (!strcasecmp(Name, "RedLimit"))       femonConfig.redlimit       = atoi(Value);
+  else if (!strcasecmp(Name, "GreenLimit"))     femonConfig.greenlimit     = atoi(Value);
+  else if (!strcasecmp(Name, "UpdateInterval")) femonConfig.updateinterval = atoi(Value);
+  else if (!strcasecmp(Name, "ShowBitRate"))    femonConfig.showbitrate    = atoi(Value);
+  else if (!strcasecmp(Name, "CalcInterval"))   femonConfig.calcinterval   = atoi(Value);
  else
    return false;

@@ -76,20 +84,53 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)

 cMenuFemonSetup::cMenuFemonSetup(void)
 {
-  Add(new cMenuEditBoolItem(tr("Hide Mainmenu Entry"),    &femonConfig.hidemenu,   tr("no"), tr("yes")));
-  Add(new cMenuEditBoolItem(tr("Position"),               &femonConfig.position,   tr("bottom"), tr("top")));
-  Add(new cMenuEditIntItem( tr("Update Interval [0.1s]"), &femonConfig.interval,   5, 50));
-  Add(new cMenuEditIntItem( tr("Red Limit [%]"),          &femonConfig.redlimit,   1, 50));
-  Add(new cMenuEditIntItem( tr("Green Limit [%]"),        &femonConfig.greenlimit, 51, 100));
+  Setup();
+}
+
+void cMenuFemonSetup::Setup(void)
+{
+  int current = Current();
+
+  Clear();
+  Add(new cMenuEditBoolItem(  tr("Hide Mainmenu Entry"),         &femonConfig.hidemenu,       tr("no"),     tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),     tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    tr("simple"), tr("advanced")));
+  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"), tr("top")));
+  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("Bitrate Calculation"),         &femonConfig.showbitrate,    tr("no"),     tr("yes")));
+  if (femonConfig.showbitrate)
+     Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,            100));
+
+  SetCurrent(Get(current));
+  Display();
 }

 void cMenuFemonSetup::Store(void)
 {
-  SetupStore("HideMenu",   femonConfig.hidemenu);
-  SetupStore("Position",   femonConfig.position);
-  SetupStore("Interval",   femonConfig.interval);
-  SetupStore("RedLimit",   femonConfig.redlimit);
-  SetupStore("GreenLimit", femonConfig.greenlimit);
+  SetupStore("HideMenu",       femonConfig.hidemenu);
+  SetupStore("SyslogOutput",   femonConfig.syslogoutput);
+  SetupStore("Position",       femonConfig.position);
+  SetupStore("DisplayMode",    femonConfig.displaymode);
+  SetupStore("RedLimit",       femonConfig.redlimit);
+  SetupStore("GreenLimit",     femonConfig.greenlimit);
+  SetupStore("UpdateInterval", femonConfig.updateinterval);
+  SetupStore("ShowBitRate",    femonConfig.showbitrate);
+  SetupStore("CalcInterval",   femonConfig.calcinterval);
+}
+
+eOSState cMenuFemonSetup::ProcessKey(eKeys Key)
+{
+  int oldShowbitrate = femonConfig.showbitrate;
+
+  eOSState state = cMenuSetupPage::ProcessKey(Key);
+
+  if (Key != kNone && (femonConfig.showbitrate != oldShowbitrate)) {
+     Setup();
+     }
+
+  return state;
 }

 cMenuSetupPage *cPluginFemon::SetupMenu(void)
--- a/femon.h
+++ b/femon.h
@@ -1,11 +1,19 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id$
+ */
+
 #ifndef __FEMON_H
 #define __FEMON_H

 #include <vdr/plugin.h>

-static const char *VERSION        = "0.0.2c";
-static const char *DESCRIPTION    = "DVB Signal Quality Monitor (OSD)";
-static const char *MAINMENUENTRY  = "Signal Quality";
+static const char *VERSION        = "0.1.0";
+static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
+static const char *MAINMENUENTRY  = "Signal Information";

 class cPluginFemon : public cPlugin {
 private:
@@ -27,11 +35,14 @@ public:
  };

 class cMenuFemonSetup : public cMenuSetupPage {
+  private:
+    virtual void Setup(void);
+  protected:
+    virtual eOSState ProcessKey(eKeys Key);
+    virtual void Store(void);
  public:
    cMenuFemonSetup(void);
-  protected:
-    virtual void Store(void);
-};
+  };

 #endif //__FEMON_H

--- a/femoncfg.c
+++ b/femoncfg.c
@@ -1,5 +1,5 @@
 /*
- * A Frontend Monitor plugin for the Video Disk Recorder                                             
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
@@ -12,9 +12,13 @@ cFemonConfig femonConfig;

 cFemonConfig::cFemonConfig(void)
 {
-  hidemenu   = 0;
-  position   = 1;
-  interval   = 10;
-  redlimit   = 33;
-  greenlimit = 66;
+  hidemenu       = 0;
+  displaymode    = 0;
+  position       = 1;
+  redlimit       = 33;
+  greenlimit     = 66;
+  updateinterval = 5;
+  showbitrate    = 1;
+  calcinterval   = 20;
+  syslogoutput   = 0;
 }
--- a/femoncfg.h
+++ b/femoncfg.h
@@ -1,3 +1,11 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id$
+ */
+
 #ifndef __FEMONCFG_H
 #define __FEMONCFG_H

@@ -5,11 +13,15 @@ struct cFemonConfig
 {
 public:
  cFemonConfig(void);
-  int  hidemenu;
-  int  position;
-  int  interval;
-  int  redlimit;
-  int  greenlimit;
+  int hidemenu;
+  int displaymode;
+  int position;
+  int redlimit;
+  int greenlimit;
+  int updateinterval;
+  int showbitrate;
+  int calcinterval;
+  int syslogoutput;
 };

 extern cFemonConfig femonConfig;
--- a/femoni18n.c
+++ b/femoni18n.c
@@ -1,5 +1,5 @@
 /*
- * A Frontend Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
@@ -9,10 +9,10 @@
 #include "femoni18n.h"

 const tI18nPhrase Phrases[] = {
-  { "DVB Signal Quality Monitor (OSD)", // English
-    "DVB Signalqualit<EFBFBD>ts-Anzeige (OSD)", // Deutsch
+  { "DVB Signal Information Monitor (OSD)", // English
+    "DVB Signal Informationsanzeige (OSD)", // Deutsch
    "", // Slovenski
-    "Visualizzazione della qualita' del segnale DVB (OSD)", // Italiano
+    "Visualizza le informazioni sul segnale DVB", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
    "", // Fran<61>ais
@@ -20,19 +20,18 @@ const tI18nPhrase Phrases[] = {
    "DVB signaalimittari (OSD)", // suomi
    "", // Polski
    "", // Espa<70>ol
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
    "", // Magyar
    "", // Catal<61>
-#if VDRVERSNUM >= 10300
-    ""  // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-#endif
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
  },
-  { "Signal Quality", // English
-    "Signalqualit<EFBFBD>t", // Deutsch
+  { "Signal Information", // English
+    "Signalinformationen", // Deutsch
    "", // Slovenski
-    "Qualita' del segnale", // Italiano
+    "Informazioni sul segnale", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
    "", // Fran<61>ais
@@ -40,14 +39,13 @@ const tI18nPhrase Phrases[] = {
    "Signaalimittari", // suomi
    "", // Polski
    "", // Espa<70>ol
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
    "", // Magyar
    "", // Catal<61>
-#if VDRVERSNUM >= 10300
-    ""  // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-#endif
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
  },
  { "Position", // English
    "Position", // Deutsch
@@ -60,19 +58,75 @@ const tI18nPhrase Phrases[] = {
    "Sijainti", // suomi
    "", // Polski
    "", // Espa<70>ol
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
    "", // Magyar
    "", // Catal<61>
-#if VDRVERSNUM >= 10300
-    ""  // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-#endif
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "Default Display Mode", // English
+    "Standard Anzeigemodus", // Deutsch
+    "", // Slovenski
+    "Modo di visualizzazione standard", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "", // Fran<61>ais 
+    "", // Norsk
+    "Oletus n<>ytt<74>moodi", // suomi
+    "", // Polski   
+    "", // Espa<70>ol  
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar  
+    "", // Catal<61>  
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "simple", // English
+    "einfach", // Deutsch
+    "", // Slovenski
+    "semplice", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "", // Fran<61>ais 
+    "", // Norsk
+    "suppea", // suomi
+    "", // Polski   
+    "", // Espa<70>ol  
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar  
+    "", // Catal<61>  
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "advanced", // English
+    "fortgeschritten", // Deutsch
+    "", // Slovenski
+    "avanzato", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "", // Fran<61>ais 
+    "", // Norsk
+    "laaja", // suomi
+    "", // Polski   
+    "", // Espa<70>ol  
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar  
+    "", // Catal<61>  
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
  },
  { "Hide Mainmenu Entry", // English
    "Hauptmen<EFBFBD>eintrag verstecken", // Deutsch
    "", // Slovenski
-    "Nascondere Voce Menu", // Italiano
+    "Nascondi voce men<EFBFBD>", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
    "", // Fran<61>ais
@@ -80,39 +134,75 @@ const tI18nPhrase Phrases[] = {
    "Piilota valinta p<><70>valikosta", // suomi
    "", // Polski
    "", // Espa<70>ol
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
    "", // Magyar
    "", // Catal<61>
-#if VDRVERSNUM >= 10300
-    ""  // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-#endif
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
  },
-  { "Update Interval [0.1s]", // English
-    "Aktualisierung alle [0.1s]", // Deutsch
+  { "OSD Update Interval [0.1s]", // English
+    "OSD Updateintervall [0.1s]", // Deutsch
    "", // Slovenski
    "Intervallo di aggiornamento [0.1s]", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
    "", // Fran<61>ais
    "", // Norsk
-    "P<EFBFBD>ivitystaajuus [0.1s]", // suomi
+    "N<EFBFBD>yt<EFBFBD>n p<>ivitysv<73>li [0.1s]", // suomi
    "", // Polski
    "", // Espa<70>ol
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
    "", // Magyar
    "", // Catal<61>
-#if VDRVERSNUM >= 10300
-    ""  // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-#endif
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "Bitrate Calculation", // English
+    "Bitratenberechnung", // Deutsch
+    "", // Slovenski
+    "Calcolo Bitrate", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "", // Fran<61>ais
+    "", // Norsk
+    "Bittinopeuden laskenta", // suomi
+    "", // Polski
+    "", // Espa<70>ol
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "Calculation Interval [0.1s]", // English
+    "Berechnungsintervall [0.1s]", // Deutsch
+    "", // Slovenski
+    "Intervallo di calcolo [0.1s]", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "", // Fran<61>ais
+    "", // Norsk
+    "Laskennan p<>ivitysv<73>li [0.1s]", // suomi
+    "", // Polski
+    "", // Espa<70>ol
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
  },
  { "Red Limit [%]", // English
    "Grenze Rot [%]", // Deutsch
    "", // Slovenski
-    "Limite Rosso [%]", // Italiano
+    "Limite rosso [%]", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
    "", // Fran<61>ais
@@ -120,19 +210,18 @@ const tI18nPhrase Phrases[] = {
    "Punaisen taso [%]", // suomi
    "", // Polski
    "", // Espa<70>ol
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
    "", // Magyar
    "", // Catal<61>
-#if VDRVERSNUM >= 10300
-    ""  // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-#endif
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
  },
  { "Green Limit [%]", // English
    "Grenze Gr<47>n [%]", // Deutsch
    "", // Slovenski
-    "Limite Verde [%]", // Italiano
+    "Limite verde [%]", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
    "", // Fran<61>ais
@@ -140,15 +229,374 @@ const tI18nPhrase Phrases[] = {
    "Vihre<EFBFBD>n taso [%]", // suomi
    "", // Polski
    "", // Espa<70>ol
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
    "", // Magyar
    "", // Catal<61>
-#if VDRVERSNUM >= 10300
-    ""  // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-#endif
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "Transponder Information", // English
+    "Transponderinformation", // Deutsch
+    "", // Slovenski
+    "Informazioni transponder", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "", // Fran<61>ais
+    "", // Norsk   
+    "Transponderin tiedot", // suomi
+    "", // Polski   
+    "", // Espa<70>ol
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "Satellite Card", // English
+    "Satellitenkarte", // Deutsch
+    "", // Slovenski
+    "Scheda satellitare", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "", // Fran<61>ais
+    "", // Norsk
+    "Satelliittikortti", // suomi
+    "", // Polski
+    "", // Espa<70>ol
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "Cable Card", // English
+    "Kabelkarte", // Deutsch
+    "", // Slovenski
+    "Scheda via cavo", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "", // Fran<61>ais
+    "", // Norsk
+    "Kaapelikortti", // suomi
+    "", // Polski
+    "", // Espa<70>ol
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "Terrestial Card", // English
+    "Terrestrische Karte", // Deutsch
+    "", // Slovenski
+    "Scheda terrestre", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "", // Fran<61>ais
+    "", // Norsk
+    "Terrestiaalikortti", // suomi
+    "", // Polski
+    "", // Espa<70>ol
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "Use Syslog Output", // English
+    "Benutze syslog Ausgabe", // Deutsch
+    "", // Slovenski
+    "Registra su syslog", // Italiano
+    "", // Nederlands
+    "", // Portugu<67>s
+    "", // Fran<61>ais
+    "", // Norsk
+    "Kirjaa systeemilokiin", // suomi
+    "", // Polski
+    "", // Espa<70>ol
+    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "", // Svenska
+    "", // Romaneste
+    "", // Magyar
+    "", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> syslog", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "", // Hrvatski (Croatian)
+  },
+  { "LOCK", // English
+    "LOCK", // Deutsch
+    "LOCK", // Slovenski
+    "LOCK", // Italiano
+    "LOCK", // Nederlands
+    "LOCK", // Portugu<67>s
+    "LOCK", // Fran<61>ais
+    "LOCK", // Norsk
+    "LOCK", // suomi
+    "LOCK", // Polski
+    "LOCK", // Espa<70>ol
+    "LOCK", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "LOCK", // Svenska
+    "LOCK", // Romaneste
+    "LOCK", // Magyar
+    "LOCK", // Catal<61>
+    "<EFBFBD><EFBFBD>Ų<EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "LOCK", // Hrvatski (Croatian)
+  },
+  { "SIGNAL", // English
+    "SIGNAL", // Deutsch
+    "SIGNAL", // Slovenski
+    "SIGNAL", // Italiano
+    "SIGNAL", // Nederlands
+    "SIGNAL", // Portugu<67>s
+    "SIGNAL", // Fran<61>ais
+    "SIGNAL", // Norsk
+    "SIGNAL", // suomi
+    "SIGNAL", // Polski
+    "SIGNAL", // Espa<70>ol
+    "SIGNAL", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "SIGNAL", // Svenska
+    "SIGNAL", // Romaneste
+    "SIGNAL", // Magyar
+    "SIGNAL", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "SIGNAL", // Hrvatski (Croatian)
+  },
+  { "CARRIER", // English
+    "CARRIER", // Deutsch
+    "CARRIER", // Slovenski
+    "CARRIER", // Italiano
+    "CARRIER", // Nederlands
+    "CARRIER", // Portugu<67>s
+    "CARRIER", // Fran<61>ais
+    "CARRIER", // Norsk
+    "CARRIER", // suomi
+    "CARRIER", // Polski
+    "CARRIER", // Espa<70>ol
+    "CARRIER", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "CARRIER", // Svenska
+    "CARRIER", // Romaneste
+    "CARRIER", // Magyar
+    "CARRIER", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɰ<EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "CARRIER", // Hrvatski (Croatian)
+  },
+  { "VITERBI", // English
+    "VITERBI", // Deutsch
+    "VITERBI", // Slovenski
+    "VITERBI", // Italiano
+    "VITERBI", // Nederlands
+    "VITERBI", // Portugu<67>s
+    "VITERBI", // Fran<61>ais
+    "VITERBI", // Norsk
+    "VITERBI", // suomi
+    "VITERBI", // Polski
+    "VITERBI", // Espa<70>ol
+    "VITERBI", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+    "VITERBI", // Svenska
+    "VITERBI", // Romaneste
+    "VITERBI", // Magyar
+    "VITERBI", // Catal<61>
+    "<EFBFBD><EFBFBD>µ<EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "VITERBI", // Hrvatski (Croatian)
+  },
+  { "SYNC", // English
+    "SYNC", // Deutsch
+    "SYNC", // Slovenski
+    "SYNC", // Italiano
+    "SYNC", // Nederlands
+    "SYNC", // Portugu<67>s
+    "SYNC", // Fran<61>ais
+    "SYNC", // Norsk
+    "SYNC", // suomi
+    "SYNC", // Polski
+    "SYNC", // Espa<70>ol
+    "SYNC", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "SYNC", // Svenska
+    "SYNC", // Romaneste
+    "SYNC", // Magyar
+    "SYNC", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "SYNC", // Hrvatski (Croatian)
+  },
+  { "Audio", // English
+    "Audio", // Deutsch
+    "Audio", // Slovenski
+    "Audio", // Italiano
+    "Audio", // Nederlands
+    "Audio", // Portugu<67>s
+    "Audio", // Fran<61>ais
+    "Audio", // Norsk
+    "Audio", // suomi
+    "Audio", // Polski
+    "Audio", // Espa<70>ol
+    "Audio", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "Audio", // Svenska
+    "Audio", // Romaneste
+    "Audio", // Magyar
+    "Audio", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "Audio", // Hrvatski (Croatian)
+  },
+  { "Video", // English
+    "Video", // Deutsch
+    "Video", // Slovenski
+    "Video", // Italiano
+    "Video", // Nederlands
+    "Video", // Portugu<67>s
+    "Video", // Fran<61>ais
+    "Video", // Norsk
+    "Video", // suomi
+    "Video", // Polski
+    "Video", // Espa<70>ol
+    "Video", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "Video", // Svenska
+    "Video", // Romaneste
+    "Video", // Magyar
+    "Video", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "Video", // Hrvatski (Croatian)
+  },
+  { "Auto", // English
+    "Auto", // Deutsch
+    "Auto", // Slovenski
+    "Auto", // Italiano
+    "Auto", // Nederlands
+    "Auto", // Portugu<67>s
+    "Auto", // Fran<61>ais
+    "Auto", // Norsk
+    "Auto", // suomi
+    "Auto", // Polski
+    "Auto", // Espa<70>ol
+    "Auto", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "Auto", // Svenska
+    "Auto", // Romaneste
+    "Auto", // Magyar
+    "Auto", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "Auto", // Hrvatski (Croatian)
+  },
+  { "None", // English
+    "None", // Deutsch
+    "None", // Slovenski
+    "None", // Italiano
+    "None", // Nederlands
+    "None", // Portugu<67>s
+    "None", // Fran<61>ais
+    "None", // Norsk
+    "None", // suomi
+    "None", // Polski
+    "None", // Espa<70>ol
+    "None", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "None", // Svenska
+    "None", // Romaneste
+    "None", // Magyar
+    "None", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "None", // Hrvatski (Croatian)
+  },
+  { "Off", // English
+    "Off", // Deutsch
+    "Off", // Slovenski
+    "Off", // Italiano
+    "Off", // Nederlands
+    "Off", // Portugu<67>s
+    "Off", // Fran<61>ais
+    "Off", // Norsk
+    "Off", // suomi
+    "Off", // Polski
+    "Off", // Espa<70>ol
+    "Off", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "Off", // Svenska
+    "Off", // Romaneste
+    "Off", // Magyar
+    "Off", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "Off", // Hrvatski (Croatian)
+  },
+  { "On", // English
+    "On", // Deutsch
+    "On", // Slovenski
+    "On", // Italiano
+    "On", // Nederlands
+    "On", // Portugu<67>s
+    "On", // Fran<61>ais
+    "On", // Norsk
+    "On", // suomi
+    "On", // Polski
+    "On", // Espa<70>ol
+    "On", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "On", // Svenska
+    "On", // Romaneste
+    "On", // Magyar
+    "On", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "On", // Hrvatski (Croatian)
+  },
+  { "MHz", // English
+    "MHz", // Deutsch
+    "MHz", // Slovenski
+    "MHz", // Italiano
+    "MHz", // Nederlands
+    "MHz", // Portugu<67>s
+    "MHz", // Fran<61>ais
+    "MHz", // Norsk
+    "MHz", // suomi
+    "MHz", // Polski
+    "MHz", // Espa<70>ol
+    "MHz", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "MHz", // Svenska
+    "MHz", // Romaneste
+    "MHz", // Magyar
+    "MHz", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "MHz", // Hrvatski (Croatian)
+  },
+  { "Mbit/s", // English
+    "Mbit/s", // Deutsch
+    "Mbit/s", // Slovenski
+    "Mbit/s", // Italiano
+    "Mbit/s", // Nederlands
+    "Mbit/s", // Portugu<67>s
+    "Mbit/s", // Fran<61>ais
+    "Mbit/s", // Norsk
+    "Mbit/s", // suomi
+    "Mbit/s", // Polski
+    "Mbit/s", // Espa<70>ol
+    "Mbit/s", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "Mbit/s", // Svenska
+    "Mbit/s", // Romaneste
+    "Mbit/s", // Magyar
+    "Mbit/s", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "Mbit/s", // Hrvatski (Croatian)
+  },
+  { "kbit/s", // English
+    "kbit/s", // Deutsch
+    "kbit/s", // Slovenski
+    "kbit/s", // Italiano
+    "kbit/s", // Nederlands
+    "kbit/s", // Portugu<67>s
+    "kbit/s", // Fran<61>ais
+    "kbit/s", // Norsk
+    "kbit/s", // suomi
+    "kbit/s", // Polski
+    "kbit/s", // Espa<70>ol
+    "kbit/s", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "kbit/s", // Svenska
+    "kbit/s", // Romaneste
+    "kbit/s", // Magyar
+    "kbit/s", // Catal<61>
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "kbit/s", // Hrvatski (Croatian)
  },
  { NULL }
 };
-
--- a/femoni18n.h
+++ b/femoni18n.h
@@ -1,3 +1,11 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id$
+ */
+
 #ifndef __FEMONI18N_H
 #define __FEMONI18N_H

--- a/femonosd.c
+++ b/femonosd.c
@@ -1,42 +1,56 @@
 /*
- * A Frontend Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 * $Id$
 */

+#include <ctype.h>
 #include "femoncfg.h"
+#include "femoni18n.h"
 #include "femonreceiver.h"
 #include "femonosd.h"

-#define FE_DEVICE  "/dev/dvb/adapter%d/frontend%d"
-#define CHANNELINPUT_TIMEOUT 1000
-#define CHANNELINFO_TIMEOUT  5000
-#define OSDHEIGHT 5
+#define FRONTEND_DEVICE        "/dev/dvb/adapter%d/frontend%d"
+#define CHANNELINPUT_TIMEOUT   1000
+
+#define SCREENWIDTH            720 // in pixels
+#define SCREENHEIGHT           576 // in pixels
+#define OSDWIDTH               600 // in pixels
+#define OSDHEIGHT              480 // in pixels
+#define OSDINFOHEIGHT          (m_Font->Height() * 11) // in pixels (11 rows)
+#define OSDSTATUSHEIGHT        (m_Font->Height() * 6)  // in pixels (6 rows)
+
+#define OSDINFOWIN_Y(offset)   (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
+#define OSDINFOWIN_X(col)      ((col == 4) ? 470 : (col == 3) ? 300 : (col==2) ? 180 : 15)
+#define OSDSTATUSWIN_Y(offset) (femonConfig.position ? offset : (OSDHEIGHT - OSDSTATUSHEIGHT + offset))
+#define OSDSTATUSWIN_X(col)    ((col == 4) ? 410 : (col == 3) ? 220 : (col==2) ? 125 : 15)
+#define OSDSTATUSWIN_X2(col)   ((col == 5) ? 520 : (col == 4) ? 390 : (col==3) ? 250 : (col==2) ? 115 : 15)
+#define BARWIDTH(x)            (OSDWIDTH * x / 100)
+
+#define clrBackground          clrGray50 // this should be tied somehow into current theme

 cFemonOsd::cFemonOsd(void)
-#if VDRVERSNUM >= 10300
-:cOsdObject(true), cThread("femon plugin")
-#else
-:cOsdObject(true), cThread()
-#endif
+:cOsdObject(true), cThread("femon osd")
 {
  //printf("cFemonOsd::cFemonOsd()\n");
  m_Osd = NULL;
-  m_Window = -1;
  m_Receiver = NULL;
  m_Frontend = -1;
  m_Active = false;
  m_Number = 0;
+  m_OldNumber = 0;
  m_InputTime = 0;
-  m_InfoTime = 0;
-  m_Width = Setup.OSDwidth * cOsd::CellWidth();
-  m_Height = OSDHEIGHT * cOsd::LineHeight();
-  m_Xpos = (720 - m_Width) / 2;
-  m_Ypos = (576 - Setup.OSDheight * cOsd::LineHeight()) / 2 + ( femonConfig.position ? 0 : (Setup.OSDheight - OSDHEIGHT) * cOsd::LineHeight());
+  m_Signal = 0;
+  m_SNR = 0;
+  m_BER = 0;
+  m_UNC = 0;
+  m_DisplayMode = femonConfig.displaymode;
+  m_Font = cFont::GetFont(fontSml);
+  m_Mutex = new cMutex();
 }
- 
+
 cFemonOsd::~cFemonOsd(void)
 {
  //printf("cFemonOsd::~cFemonOsd()\n");
@@ -50,108 +64,336 @@ cFemonOsd::~cFemonOsd(void)
     delete m_Osd;
 }

+void cFemonOsd::DrawStatusWindow(void)
+{
+  cMutexLock lock(m_Mutex);
+  //printf("cFemonOsd::DrawStatusWindow()\n");
+  char buf[128];
+  int snr = m_SNR / 655;
+  int signal = m_Signal / 655;
+  int offset = 0;
+  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+
+  if (m_Osd) {
+     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrBackground);
+     snprintf(buf, sizeof(buf), "%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->Name());
+     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+m_Font->Height()-1), clrWhite);
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrBlack, clrWhite, m_Font);
+     offset += m_Font->Height();
+     if (signal > 0) {
+        signal = BARWIDTH(signal);
+        m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), signal), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrRed);
+        if (signal > BARWIDTH(femonConfig.redlimit)) {
+           m_Osd->DrawRectangle(BARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min((OSDWIDTH * femonConfig.greenlimit / 100), signal), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrYellow);
+           }
+        if (signal > BARWIDTH(femonConfig.greenlimit)) {
+           m_Osd->DrawRectangle(BARWIDTH(femonConfig.greenlimit), OSDSTATUSWIN_Y(offset+3), signal, OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrGreen);
+           }
+        }
+     offset += m_Font->Height();
+     if (snr > 0) {
+        snr = BARWIDTH(snr);
+        m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), snr), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrRed);
+        if (snr > BARWIDTH(femonConfig.redlimit)) {
+           m_Osd->DrawRectangle(BARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.greenlimit), snr), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrYellow);
+           }
+        if (snr > BARWIDTH(femonConfig.greenlimit)) {
+           m_Osd->DrawRectangle(BARWIDTH(femonConfig.greenlimit),  OSDSTATUSWIN_Y(offset+3), snr, OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrGreen);
+           }
+        }
+     offset += m_Font->Height();
+     snprintf(buf, sizeof(buf), "STR: %04x", m_Signal);
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "(%2d%%)", m_Signal / 655);
+     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite /*signal < femonConfig.redlimit ? clrRed : signal < femonConfig.greenlimit ? clrYellow : clrGreen*/, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "BER: %08x", m_BER);
+     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     if (m_Receiver) snprintf(buf, sizeof(buf), "%s: %.2f %s", tr("Video"), m_Receiver->VideoBitrate(), tr("Mbit/s"));
+     else            snprintf(buf, sizeof(buf), "%s: --- %s", tr("Video"), tr("Mbit/s"));
+     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     offset += m_Font->Height();
+     snprintf(buf, sizeof(buf), "SNR: %04x", m_SNR);
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "(%2d%%)", m_SNR / 655);
+     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite /*snr < femonConfig.redlimit ? clrRed : snr < femonConfig.greenlimit ? clrYellow : clrGreen*/, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "UNC: %08x", m_UNC);
+     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     if (m_Receiver) snprintf(buf, sizeof(buf), "%s: %.0f %s", tr("Audio"), m_Receiver->AudioBitrate(), tr("kbit/s"));
+     else            snprintf(buf, sizeof(buf), "%s: --- %s", tr("Audio"), tr("kbit/s"));
+     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     offset += m_Font->Height();
+     m_Osd->DrawText(OSDSTATUSWIN_X2(1), OSDSTATUSWIN_Y(offset), tr("LOCK"),   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_X2(2), OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_X2(3), OSDSTATUSWIN_Y(offset), tr("CARRIER"),(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_X2(4), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_Font);
+     m_Osd->DrawText(OSDSTATUSWIN_X2(5), OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_Font);
+     m_Osd->Flush();
+     }
+}
+
+void cFemonOsd::DrawInfoWindow(void)
+{
+  cMutexLock lock(m_Mutex);
+  //printf("cFemonOsd::DrawInfoWindow()\n");
+  char buf[128];
+  char buf2[20];
+  int offset = 0;
+  int value = 0;
+  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+
+  if (m_Osd) {
+     if (m_DisplayMode) {
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite);
+        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), clrBackground, clrWhite, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Vpid"), clrWhite, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "%d", channel->Vpid());
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Ppid"), clrWhite, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "%d", channel->Ppid());
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid1"), clrWhite, clrBackground, m_Font);
+        value = channel->Apid2();
+        if (value) snprintf(buf, sizeof(buf), "%d, %d", channel->Apid1(), value);
+        else       snprintf(buf, sizeof(buf), "%d", channel->Apid1());
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid1"), clrWhite, clrBackground, m_Font);
+        value = channel->Dpid2();
+        if (value) snprintf(buf, sizeof(buf), "%d, %d", channel->Dpid1(), value);
+        else       snprintf(buf, sizeof(buf), "%d", channel->Dpid1());
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("CA"), clrWhite, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "%d", channel->Ca());
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Tpid"), clrWhite, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "%d", channel->Tpid());
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sid"), clrWhite, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "%d", channel->Sid());
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), "Nid", clrWhite, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "%d", channel->Nid());
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), "Tid" /*tr("Tid")*/, clrWhite, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "%d", channel->Tid());
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), "Rid" /*tr("Rid")*/, clrWhite, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "%d", channel->Rid());
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        switch (m_FrontendInfo.type) {
+          case FE_QPSK:
+               snprintf(buf, sizeof(buf), "%s #%d - %s", tr("Satellite Card"), cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               offset += m_Font->Height();
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font);
+               value = channel->Frequency();
+               while (value > 20000) value /= 1000;
+               snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_Font);
+               snprintf(buf, sizeof(buf), "%s", cSource::ToString(channel->Source()));
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               offset += m_Font->Height();
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_Font);
+               snprintf(buf, sizeof(buf), "%d", channel->Srate());
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Polarization"), clrWhite, clrBackground, m_Font);
+               snprintf(buf, sizeof(buf), "%c", toupper(channel->Polarization()));
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               offset += m_Font->Height();
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_Font);
+               value = channel->Inversion();
+               if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off"));
+               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, clrYellow, clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, 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"));
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               break;
+
+          case FE_QAM:
+               snprintf(buf, sizeof(buf), "%s #%d - %s", tr("Cable Card"), cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               offset += m_Font->Height();
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font);
+               value = channel->Frequency();
+               while (value > 20000) value /= 1000;
+               snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_Font);
+               snprintf(buf, sizeof(buf), "%s", cSource::ToString(channel->Source()));
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               offset += m_Font->Height();
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_Font);
+               snprintf(buf, sizeof(buf), "%d", channel->Srate());
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_Font);
+               value = channel->Modulation();
+               if      (value == QPSK)      snprintf(buf, sizeof(buf), "QPSK");
+               else if (value == QAM_16)    snprintf(buf, sizeof(buf), "QAM 16");
+               else if (value == QAM_32)    snprintf(buf, sizeof(buf), "QAM 32");
+               else if (value == QAM_64)    snprintf(buf, sizeof(buf), "QAM 64");
+               else if (value == QAM_128)   snprintf(buf, sizeof(buf), "QAM 128");
+               else if (value == QAM_256)   snprintf(buf, sizeof(buf), "QAM 256");
+               else            /*QAM_AUTO*/ snprintf(buf, sizeof(buf), "QAM %s", tr("Auto"));
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               offset += m_Font->Height();
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_Font);
+               value = channel->Inversion();
+               if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off"));
+               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, clrYellow, clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, 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"));
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               break;
+
+          default:
+               snprintf(buf, sizeof(buf), "%s #%d - %s", tr("Terrestial Card"), cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               offset += m_Font->Height();
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font);
+               value = channel->Frequency();
+               while (value > 20000) value /= 1000;
+               snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Transmission"), clrWhite, clrBackground, m_Font);
+               value = channel->Transmission();
+               if      (value == TRANSMISSION_MODE_2K)    snprintf(buf, sizeof(buf), "2K");
+               else if (value == TRANSMISSION_MODE_8K)    snprintf(buf, sizeof(buf), "8K");
+               else            /*TRANSMISSION_MODE_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               offset += m_Font->Height();
+               m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bandwidth"), clrWhite, clrBackground, m_Font);
+               value = channel->Bandwidth();
+               if      (value == BANDWIDTH_8_MHZ) snprintf(buf, sizeof(buf), "8 %s", tr("MHz"));
+               else if (value == BANDWIDTH_7_MHZ) snprintf(buf, sizeof(buf), "7 %s", tr("MHz"));
+               else if (value == BANDWIDTH_6_MHZ) snprintf(buf, sizeof(buf), "6 %s", tr("MHz"));
+               else            /*BANDWIDTH_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_Font);
+               value = channel->Modulation();
+               if      (value == QPSK)      snprintf(buf, sizeof(buf), "QPSK");
+               else if (value == QAM_16)    snprintf(buf, sizeof(buf), "QAM 16");
+               else if (value == QAM_32)    snprintf(buf, sizeof(buf), "QAM 32");
+               else if (value == QAM_64)    snprintf(buf, sizeof(buf), "QAM 64");
+               else if (value == QAM_128)   snprintf(buf, sizeof(buf), "QAM 128");
+               else if (value == QAM_256)   snprintf(buf, sizeof(buf), "QAM 256");
+               else            /*QAM_AUTO*/ snprintf(buf, sizeof(buf), "QAM %s", tr("Auto"));
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               offset += m_Font->Height();
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_Font);
+               value = channel->Inversion();
+               if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off"));
+               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, clrYellow, clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, 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"));
+               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"));
+               strncat(buf, buf2, sizeof(buf));
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               offset += m_Font->Height();
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Hierarchy"), clrWhite, clrBackground, m_Font);
+               value = channel->Hierarchy();
+               if      (value == HIERARCHY_NONE)  snprintf(buf, sizeof(buf), tr("None"));
+               else if (value == HIERARCHY_1)     snprintf(buf, sizeof(buf), "1");
+               else if (value == HIERARCHY_2)     snprintf(buf, sizeof(buf), "2");
+               else if (value == HIERARCHY_4)     snprintf(buf, sizeof(buf), "4");
+               else            /*HIERARCHY_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Guard"), clrWhite, clrBackground, m_Font);
+               value = channel->Guard();
+               if      (value == GUARD_INTERVAL_1_32)  snprintf(buf, sizeof(buf), "1/32");
+               else if (value == GUARD_INTERVAL_1_16)  snprintf(buf, sizeof(buf), "1/16");
+               else if (value == GUARD_INTERVAL_1_8)   snprintf(buf, sizeof(buf), "1/8");
+               else if (value == GUARD_INTERVAL_1_4)   snprintf(buf, sizeof(buf), "1/4");
+               else            /*GUARD_INTERVAL_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+               break;
+          }
+        }
+     else {
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
+        }
+     m_Osd->Flush();
+     }
+}
+
 void cFemonOsd::Action(void)
 {
  //printf("cFemonOsd::Action()\n");
-  int snr_o, signal_o;
-  uint16_t snr, signal;
-  uint32_t ber, unc;
-  fe_status_t fe_status;
-  char buf[128];
-  double VRate = 0.0;
-  double ARate = 0.0;
-
-#if (VDRVERSNUM < 10300)
-	isyslog("femon plugin: thread started (pid = %d)", getpid());
-#endif
  m_Active = true;
  while (m_Active) {
    if (m_Frontend != -1) {
-       CHECK(ioctl(m_Frontend, FE_READ_STATUS, &fe_status));
-       CHECK(ioctl(m_Frontend, FE_READ_SIGNAL_STRENGTH, &signal));
-       CHECK(ioctl(m_Frontend, FE_READ_SNR, &snr));
-       CHECK(ioctl(m_Frontend, FE_READ_BER, &ber));
-       CHECK(ioctl(m_Frontend, FE_READ_UNCORRECTED_BLOCKS, &unc));
-       if (m_Osd) {
-          m_Osd->Clear(m_Window);
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
-          eDvbFont OldFont = m_Osd->SetFont(fontSml);
-#endif
-          sprintf(buf, "%d%s%s", m_Number ? m_Number : cDevice::CurrentChannel(), m_Number ? "- " : " ", Channels.GetByNumber(cDevice::CurrentChannel())->Name());
-          m_Osd->Fill(0, 0, m_Width, cOsd::LineHeight() - 1, clrWhite, m_Window);
-          m_Osd->Text(cOsd::CellWidth(), 0, buf, clrBlack, clrWhite, m_Window);
-          if (m_Receiver) {
-             // do some averaging to smooth the value
-             VRate = (VRate + (8.0 * TS_SIZE * m_Receiver->VideoPacketCount()) / (femonConfig.interval * 102.4 * 1024.0)) / 2.0;
-             ARate = (ARate + (8.0 * TS_SIZE * m_Receiver->AudioPacketCount()) / (femonConfig.interval * 102.4)) / 2.0;
-             sprintf(buf, "V: %.2f Mbit/s", VRate);
-             m_Osd->Text((m_Width - 22 * cOsd::CellWidth()), 0, buf, clrBlack, clrWhite, m_Window);
-             sprintf(buf, "A: %.0f kbit/s", ARate);
-             m_Osd->Text((m_Width - 10 * cOsd::CellWidth()), 0, buf, clrBlack, clrWhite, m_Window);
-             }
-          sprintf(buf, "STR: %04x", signal);
-          m_Osd->Text(cOsd::CellWidth(), 3 * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_Window);
-          sprintf(buf, "SNR: %04x", snr);
-          m_Osd->Text(11 * cOsd::CellWidth(), 3 * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_Window);
-          sprintf(buf, "BER: %08x", ber);
-          m_Osd->Text(21 * cOsd::CellWidth(), 3 * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_Window);
-          sprintf(buf, "UNC: %08x", unc);
-          m_Osd->Text(35 * cOsd::CellWidth(), 3 * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_Window);
-          signal_o = signal / 655;
-          sprintf(buf, "STR: %2d%%", signal_o);
-          if (signal_o > 0) {
-             signal_o = (m_Width - 8 * cOsd::CellWidth()) * signal_o / 100;
-             m_Osd->Fill(0, cOsd::LineHeight() + 3, min(((m_Width - 8 * cOsd::CellWidth()) * femonConfig.redlimit / 100), signal_o), 2 * cOsd::LineHeight() - 3, clrRed, m_Window);
-             if (signal_o > ((m_Width - 8 * cOsd::CellWidth()) * femonConfig.redlimit / 100)) {
-                m_Osd->Fill(((m_Width - 8 * cOsd::CellWidth()) * femonConfig.redlimit / 100), cOsd::LineHeight() + 3, min(((m_Width - 8 * cOsd::CellWidth()) * femonConfig.greenlimit / 100), signal_o), 2 * cOsd::LineHeight() - 3, clrYellow, m_Window);
-                }
-             if (signal_o > ((m_Width - 8 * cOsd::CellWidth()) * femonConfig.greenlimit / 100)) {
-                m_Osd->Fill(((m_Width - 8 * cOsd::CellWidth()) * femonConfig.greenlimit / 100), cOsd::LineHeight() + 3, signal_o, 2 * cOsd::LineHeight() - 3, clrGreen, m_Window);
-                }
-             m_Osd->Text(m_Width - 8 * cOsd::CellWidth(), cOsd::LineHeight(), buf, clrWhite, clrBackground, m_Window);
-             }
-          snr_o = snr / 655;
-          sprintf(buf, "SNR: %2d%%", snr_o);
-          if (snr_o > 0) {
-             snr_o = (m_Width - 8 * cOsd::CellWidth()) * snr_o / 100;
-             m_Osd->Fill(0, 2 * cOsd::LineHeight() + 3, min(((m_Width - 8 * cOsd::CellWidth()) * femonConfig.redlimit / 100), snr_o), 3 * cOsd::LineHeight() - 3, clrRed, m_Window);
-             if (snr_o > ((m_Width - 8 * cOsd::CellWidth()) * femonConfig.redlimit / 100)) {
-                m_Osd->Fill(((m_Width - 8 * cOsd::CellWidth()) * femonConfig.redlimit / 100), 2 * cOsd::LineHeight() + 3, min(((m_Width - 8 * cOsd::CellWidth()) * femonConfig.greenlimit / 100), snr_o), 3 * cOsd::LineHeight() - 3, clrYellow, m_Window);
-                }
-             if (snr_o > ((m_Width - 8 * cOsd::CellWidth()) * femonConfig.greenlimit / 100)) {
-                m_Osd->Fill(((m_Width - 8 * cOsd::CellWidth()) * femonConfig.greenlimit / 100), 2 * cOsd::LineHeight() + 3, snr_o, 3 * cOsd::LineHeight() - 3, clrGreen, m_Window);
-                }
-             m_Osd->Text(m_Width - 8 * cOsd::CellWidth(), 2 * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_Window);
-             }
-          if (time_ms() - m_InfoTime < CHANNELINFO_TIMEOUT) {
-             sprintf(buf, "%s Card #%d - %s", m_FrontendInfo.type == FE_QPSK ? "Satellite" : m_FrontendInfo.type == FE_QAM ? "Cable" : "Terrestial", cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name);
-             m_Osd->Text(cOsd::CellWidth(), 4 * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_Window);
-             }
-          else {
-             m_Osd->Text(  1 * cOsd::CellWidth(), 4 * cOsd::LineHeight(), "LOCK",   (fe_status & FE_HAS_LOCK) ? clrYellow : clrBlack, clrBackground, m_Window);
-             m_Osd->Text(  9 * cOsd::CellWidth(), 4 * cOsd::LineHeight(), "SIGNAL", (fe_status & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_Window);
-             m_Osd->Text( 19 * cOsd::CellWidth(), 4 * cOsd::LineHeight(), "CARRIER",(fe_status & FE_HAS_CARRIER) ? clrYellow : clrBlack, clrBackground, m_Window);
-             m_Osd->Text( 30 * cOsd::CellWidth(), 4 * cOsd::LineHeight(), "VITERBI",(fe_status & FE_HAS_VITERBI) ? clrYellow : clrBlack, clrBackground, m_Window);
-             m_Osd->Text( 40 * cOsd::CellWidth(), 4 * cOsd::LineHeight(), "SYNC",   (fe_status & FE_HAS_SYNC) ? clrYellow : clrBlack, clrBackground, m_Window);
-             }
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
-          m_Osd->SetFont(OldFont);
-#endif
-          m_Osd->Flush();
+       CHECK(ioctl(m_Frontend, FE_READ_STATUS, &m_FrontendStatus));
+       CHECK(ioctl(m_Frontend, FE_READ_SIGNAL_STRENGTH, &m_Signal));
+       CHECK(ioctl(m_Frontend, FE_READ_SNR, &m_SNR));
+       CHECK(ioctl(m_Frontend, FE_READ_BER, &m_BER));
+       CHECK(ioctl(m_Frontend, FE_READ_UNCORRECTED_BLOCKS, &m_UNC));
+       DrawInfoWindow();
+       DrawStatusWindow();
+       if (femonConfig.syslogoutput) {
+          isyslog("Card #%d (%s) STR: %04x SNR: %04x BER: %08x UNC: %08x |%c|%c|%c|%c|%c|", cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name, m_Signal, m_SNR, m_BER, m_UNC, (m_FrontendStatus & FE_HAS_LOCK) ? 'L' : ' ', (m_FrontendStatus & FE_HAS_SIGNAL) ? 'S' : ' ', (m_FrontendStatus & FE_HAS_CARRIER) ? 'C' : ' ', (m_FrontendStatus & FE_HAS_VITERBI) ? 'V' : ' ', (m_FrontendStatus & FE_HAS_SYNC) ? 'Z' : ' ');
          }
       }
-    usleep(100000L * femonConfig.interval);
+    usleep(100000L * femonConfig.updateinterval);
    }
-#if (VDRVERSNUM < 10300)
-	isyslog("femon plugin: thread stopped (pid = %d)", getpid());
-#endif
 }

 void cFemonOsd::Show(void)
 {
  //printf("cFemonOsd::Show()\n");
  char *dev = NULL;
-  asprintf(&dev, FE_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
+  asprintf(&dev, FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
  m_Frontend = open(dev, O_RDONLY | O_NONBLOCK);
  free(dev);
  if (m_Frontend < 0) {
@@ -165,24 +407,27 @@ void cFemonOsd::Show(void)
     close(m_Frontend);
     return;
     }
-  m_InfoTime = time_ms();
-  m_Osd = cOsd::OpenRaw(m_Xpos, m_Ypos);
+  m_Osd = cOsdProvider::NewOsd(((Setup.OSDWidth - OSDWIDTH) / 2) + Setup.OSDLeft, ((Setup.OSDHeight - OSDHEIGHT) / 2) + Setup.OSDTop);
  if (m_Osd) {
-     //printf("X: %d - Y: %d - W: %d - H: %d\n", m_Xpos, m_Ypos, m_Width, m_Height);
-     m_Window = m_Osd->Create(0, 0, m_Width, m_Height, 4);
-     m_Osd->AddColor(clrBackground, m_Window);
-     m_Osd->AddColor(clrRed, m_Window);
-     m_Osd->AddColor(clrGreen, m_Window);
-     m_Osd->AddColor(clrYellow, m_Window);
-     m_Osd->AddColor(clrWhite, m_Window);
-     m_Osd->AddColor(clrBlack, m_Window);
-     m_Osd->AddColor(clrTransparent, m_Window);
-     m_Osd->Clear(m_Window);
+     tArea Areas[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, 4 } };
+     if (m_Osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk) {
+        m_Osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
+     else {
+        tArea Areas[] = { { 0, OSDSTATUSWIN_Y(0), (OSDWIDTH-1), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-1), 4 },
+                          { 0, OSDINFOWIN_Y(0),   (OSDWIDTH-1), OSDINFOWIN_Y(OSDINFOHEIGHT-1),     2 }
+                        };
+        m_Osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
+        }
+     m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
     m_Osd->Flush();
     if (m_Receiver)
        delete m_Receiver;
-     m_Receiver = new cFemonReceiver(Channels.GetByNumber(cDevice::CurrentChannel())->Ca(), Channels.GetByNumber(cDevice::CurrentChannel())->Vpid(), Channels.GetByNumber(cDevice::CurrentChannel())->Apid1());
-     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+     if (femonConfig.showbitrate) {
+        int channelNumber = cDevice::CurrentChannel();
+        m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1());
+        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+        }
     Start();
     }
 }
@@ -192,7 +437,7 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
  //printf("cFemonOsd::ChannelSwitch()\n");
  char *dev = NULL;
  close(m_Frontend);
-  asprintf(&dev, FE_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
+  asprintf(&dev, FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
  m_Frontend = open(dev, O_RDONLY | O_NONBLOCK);
  free(dev);
  if (m_Frontend < 0) {
@@ -208,9 +453,11 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
     }
  if (m_Receiver)
     delete m_Receiver;
-  m_Receiver = new cFemonReceiver(Channels.GetByNumber(cDevice::CurrentChannel())->Ca(), Channels.GetByNumber(cDevice::CurrentChannel())->Vpid(), Channels.GetByNumber(cDevice::CurrentChannel())->Apid1());
-  cDevice::ActualDevice()->AttachReceiver(m_Receiver);
-  m_InfoTime = time_ms();
+  if (femonConfig.showbitrate) {
+     channelNumber = cDevice::CurrentChannel();
+     m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1());
+     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+     }
 }

 eOSState cFemonOsd::ProcessKey(eKeys Key)
@@ -220,15 +467,18 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
  if (state == osUnknown) {
     switch (Key & ~k_Repeat) {
       case k0:
-            if (m_Number == 0) {
-               // keep the "Toggle channels" function working
-               cRemote::Put(Key);
+            if ((m_Number == 0) && (m_OldNumber != 0)) {
+               m_Number = m_OldNumber;
+               m_OldNumber = cDevice::CurrentChannel();
+               Channels.SwitchTo(m_Number);
+               m_Number = 0;
               return osContinue;
               }
       case k1 ... k9:
            if (m_Number >= 0) {
               m_Number = m_Number * 10 + Key - k0;
               if (m_Number > 0) {
+                  DrawStatusWindow();
                  cChannel *ch = Channels.GetByNumber(m_Number);
                  m_InputTime = time_ms();
                  // Lets see if there can be any useful further input:
@@ -245,6 +495,7 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
                        }
                  if (n > 0) {
                     // This channel is the only one that fits the input, so let's take it right away:
+                     m_OldNumber = cDevice::CurrentChannel();
                     Channels.SwitchTo(m_Number);
                     m_Number = 0;
                     }
@@ -253,24 +504,30 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
            break;
       case kBack:
            return osEnd;
+       case kUp|k_Repeat:
       case kUp:
+       case kDown|k_Repeat:
       case kDown:
+            m_OldNumber = cDevice::CurrentChannel();
            cDevice::SwitchChannel(NORMALKEY(Key) == kUp ? 1 : -1);
+            m_Number = 0;
            break;
       case kNone:
            if (m_Number && (time_ms() - m_InputTime > CHANNELINPUT_TIMEOUT)) {
               if (Channels.GetByNumber(m_Number)) {
+                  m_OldNumber = cDevice::CurrentChannel();
                  Channels.SwitchTo(m_Number);
                  m_Number = 0;
                  }
               else {
-                  m_Number = 0;
                  m_InputTime = time_ms();
+                  m_Number = 0;
                  }
               }
            break;
       case kOk:
-            m_InfoTime = time_ms();
+            m_DisplayMode ^= 1; // toggle between advanced and simple display mode
+            DrawInfoWindow();
            break;
       default:
            break;
--- a/femonosd.h
+++ b/femonosd.h
@@ -1,3 +1,11 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id$
+ */
+
 #ifndef __FEMONOSD_H
 #define __FEMONOSD_H

@@ -8,24 +16,27 @@
 #include <vdr/thread.h>
 #include <vdr/status.h>
 #include <vdr/channels.h>
-#include <vdr/font.h>
-#include <vdr/device.h> // only for TS_SIZE

 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
  bool m_Active;
-  cOsdBase *m_Osd;
-  tWindowHandle m_Window;
+  cOsd *m_Osd;
  cFemonReceiver *m_Receiver;
  int m_Frontend;
  struct dvb_frontend_info m_FrontendInfo;
  int m_Number;
+  int m_OldNumber;
  int m_InputTime;
-  int m_InfoTime;
-  int m_Width;
-  int m_Height;
-  int m_Xpos;
-  int m_Ypos;
+  uint16_t m_SNR;
+  uint16_t m_Signal;
+  uint32_t m_BER;
+  uint32_t m_UNC;
+  fe_status_t m_FrontendStatus;
+  int m_DisplayMode;
+  const cFont *m_Font;
+  cMutex* m_Mutex;
+  void DrawStatusWindow(void);
+  void DrawInfoWindow(void);

 protected:
  virtual void Action(void);
--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -1,59 +1,68 @@
 /*
- * A Frontend Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 * $Id$
 */

+#include <unistd.h>
+#include "femoncfg.h"
 #include "femonreceiver.h"

 cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid)
-:cReceiver(Ca, -1, 2, Vpid, Apid)
+:cReceiver(Ca, -1, 2, Vpid, Apid), cThread("femon receiver")
 {
  //printf("cFemonReceiver::cFemonReceiver()\n");
-  m_VPid = Vpid;
-  m_APid = Apid;
-  m_VideoCount = 0;
-  m_AudioCount = 0;
+  m_Active = false;
+  m_VideoPid = Vpid;
+  m_AudioPid = Apid;
+  m_VideoPacketCount = 0;
+  m_AudioPacketCount = 0;
+  m_VideoBitrate = 0.0;
+  m_AudioBitrate = 0.0;
 }
 
 cFemonReceiver::~cFemonReceiver(void)
 {
  //printf("cFemonReceiver::~cFemonReceiver()\n");
+  if (m_Active) {
+     m_Active = false;
+     Cancel(0);
+     }
 }

 void cFemonReceiver::Activate(bool On)
 {
  //printf("cFemonReceiver::Activate()\n");
+  Start();
 }

 void cFemonReceiver::Receive(uchar *Data, int Length)
 {
  //printf("cFemonReceiver::Receive()\n");
-  if (Length == TS_SIZE) {
+  // TS packet length: 188
+  if (Length == 188) {
     int pid = ((Data[1] & 0x1f) << 8) | (Data[2]);
-     if (pid == m_VPid) {
-        m_VideoCount++;
+     if (pid == m_VideoPid) {
+        m_VideoPacketCount++;
        }
-     else if (pid == m_APid) {
-        m_AudioCount++;
+     else if (pid == m_AudioPid) {
+        m_AudioPacketCount++;
        }
     }
 }

-int cFemonReceiver::VideoPacketCount(void)
+void cFemonReceiver::Action(void)
 {
-  //printf("cFemonReceiver::VideoPacketCount()\n");
-  int count = m_VideoCount;
-  m_VideoCount = 0;
-  return count;
-}
-
-int cFemonReceiver::AudioPacketCount(void)
-{
-  //printf("cFemonReceiver::AudioPacketCount()\n");
-  int count = m_AudioCount;
-  m_AudioCount = 0;
-  return count;
+  //printf("cFemonReceiver::Action()\n");
+  m_Active = true;
+  while (m_Active) {
+        // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
+        m_VideoBitrate = (8.0 * 184.0 * m_VideoPacketCount) / (femonConfig.calcinterval * 100000.0);
+        m_VideoPacketCount = 0;
+        m_AudioBitrate = (8.0 * 184.0 * m_AudioPacketCount) / (femonConfig.calcinterval * 100.0);
+        m_AudioPacketCount = 0;
+        usleep(100000L * femonConfig.calcinterval);
+    }
 }
--- a/femonreceiver.h
+++ b/femonreceiver.h
@@ -1,26 +1,38 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * $Id$
+ */
+
 #ifndef __FEMONRECEIVER_H
 #define __FEMONRECEIVER_H

-#include <vdr/device.h> // only for TS_SIZE
+#include <vdr/thread.h>
 #include <vdr/receiver.h>

-class cFemonReceiver : public cReceiver {
+class cFemonReceiver : public cReceiver, public cThread {
 private:
-  int m_VPid;
-  int m_APid;
-  int m_VideoCount;
-  int m_AudioCount;
+  bool m_Active;
+  int m_VideoPid;
+  int m_AudioPid;
+  int m_VideoPacketCount;
+  int m_AudioPacketCount;
+  double m_VideoBitrate;
+  double m_AudioBitrate;

 protected:
  virtual void Activate(bool On);
  virtual void Receive(uchar *Data, int Length);
+  virtual void Action(void);

 public:
  cFemonReceiver(int Ca, int Vpid, int Apid);
  virtual ~cFemonReceiver();

-  int VideoPacketCount(void);
-  int AudioPacketCount(void);
+  double VideoBitrate(void) { return m_VideoBitrate; }; // Mbit/s
+  double AudioBitrate(void) { return m_AudioBitrate; }; // kbit/s
  };

 #endif //__FEMONRECEIVER_H
Author	SHA1	Message	Date
Rolf Ahrenberg	8c7c110cf2	Updated for vdr-1.3.7 and removed compability with older versions.	2004-05-18 04:20:00 +03:00
Rolf Ahrenberg	ba7896b59a	Fixed minor bitrate calculation errors. Added russian translation (Thanks to Vyacheslav Dikonov).	2004-04-04 04:20:00 +03:00
Rolf Ahrenberg	43c68bcf23	Fixed channel toggling with '0' key. Bitrate calculation thread is now canceled immediately to speed up channel switching.	2004-03-16 04:20:00 +02:00
Rolf Ahrenberg	954f09182f	Fixed frequency, guard and bandwidth units in transponder information. Added Apid2, Dpid1, Dpid2 information. Added option to write signal information into system log.	2004-03-07 04:20:00 +02:00
Rolf Ahrenberg	23487c5972	Redesigned the user interface. Transponder information is now available in advanced display mode: Press 'OK' key to switch between the simple and the advanced display mode. Moved bitrate calculation to it's own thread for improved accurancy.	2004-03-03 04:20:00 +02:00