Added "Stream Information" display mode.

Toggle between different modes with 'OK' key:
 .-> basic -> transponder -> stream -.
 `-----------------------------------´
Added missing german translations (Thanks to Peter Marquardt).

HISTORY

@@ -29,3 +29,37 @@ VDR Plugin 'femon' Revision History
 - 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-31: Version 0.0.4
+
+- Backported "stream information" feature (from version 0.1.1).
+
+-------------------------
+
+2004-05-18: Version 0.1.0
+
+- Updated for vdr-1.3.7 and removed compability with older versions.
+
+2004-05-30: Version 0.1.1
+
+- Added "Stream Information" display mode.
+  Toggle between different modes with 'OK' key:
+  .-> basic -> transponder -> stream -.
+  `-----------------------------------<2D>
+- Added missing german translations (Thanks to Peter Marquardt).

README

@@ -11,33 +11,32 @@ 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.
+Never trust a Klingon. "Qu'vaD lI' De'vam". Beam me up, Scotty!
+You're number six! I'm number two.
 
 Description:
 
 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
+transponder and stream information are also available in advanced display modes.
-switch between simple and advanced display modes by pressing 'OK' key.
+User can switch between different 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>
+excellent 'OSD Picture-In-Picture' plugin by Sascha Volkenandt and Andreas Regel.
-and Andreas Regel <andreas.regel@powarman.de>. The bitrate calculation algorithm
+The bitrate calculation algorithm originates from the 'dvbstream' application by
-originates from the 'dvbstream' application by Dave Chapman <dave@dchapman.com>.
+Dave Chapman and the stream information routines from the 'libdvb' library by
+Metzler Brothers.
 
-Shortcomings / Todo list:
+Shortcomings / Todo list / Important Notes:
 
-- The current version is a kind of Proof In Concept to replace the old 'tech
-  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
+- Disable the stream analyze to speed up heavy zapping sessions.
-  consider a small font patch (e.g. ElchiAIO4a) to maximize the visual effect :)
+- If you're using VDR version 1.3.6 or older, you'll have to stick with femon-0.0.4!

femon.c

@@ -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.
@@ -64,21 +68,26 @@ 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, "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, "AnalStream"))     femonConfig.analyzestream  = atoi(Value);
   else if (!strcasecmp(Name, "CalcInterval"))   femonConfig.calcinterval   = atoi(Value);
   else
     return false;
+  if (femonConfig.displaymode < 0 || femonConfig.displaymode >= modeMaxNumber) femonConfig.displaymode = 0;
 
   return true;
 }
 
 cMenuFemonSetup::cMenuFemonSetup(void)
 {
+  dispmodes[0] = tr("basic");
+  dispmodes[1] = tr("transponder");
+  dispmodes[2] = tr("stream");
   Setup();
 }
 
@@ -87,15 +96,16 @@ 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("Hide Mainmenu Entry"),         &femonConfig.hidemenu,       tr("no"),      tr("yes")));
-  Add(new cMenuEditBoolItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    tr("simple"), tr("advanced")));
+  Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),      tr("yes")));
-  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"), tr("top")));
+  Add(new cMenuEditStraItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    modeMaxNumber, dispmodes));
-  Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,            50));
+  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"),  tr("top")));
-  Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,           100));
+  Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,             50));
-  Add(new cMenuEditIntItem(   tr("OSD Update Interval [0.1s]"),  &femonConfig.updateinterval, 1,            100));
+  Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,            100));
-  Add(new cMenuEditBoolItem(  tr("Bitrate Calculation"),         &femonConfig.showbitrate,    tr("no"),     tr("yes")));
+  Add(new cMenuEditIntItem(   tr("OSD Update Interval [0.1s]"),  &femonConfig.updateinterval, 1,             100));
-  if (femonConfig.showbitrate)
+  Add(new cMenuEditBoolItem(  tr("Analyze Stream"),              &femonConfig.analyzestream,  tr("no"),      tr("yes")));
-     Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,            100));
+  if (femonConfig.analyzestream)
+     Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,             100));
 
   SetCurrent(Get(current));
   Display();
@@ -104,22 +114,23 @@ void cMenuFemonSetup::Setup(void)
 void cMenuFemonSetup::Store(void)
 {
   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("AnalStream",     femonConfig.analyzestream);
   SetupStore("CalcInterval",   femonConfig.calcinterval);
 }
 
 eOSState cMenuFemonSetup::ProcessKey(eKeys Key)
 {
-  int oldShowbitrate = femonConfig.showbitrate;
+  int oldAnalyzestream = femonConfig.analyzestream;
 
   eOSState state = cMenuSetupPage::ProcessKey(Key);
 
-  if (Key != kNone && (femonConfig.showbitrate != oldShowbitrate)) {
+  if (Key != kNone && (femonConfig.analyzestream != oldAnalyzestream)) {
      Setup();
      }
 

femon.h

@@ -11,7 +11,7 @@
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.3";
+static const char *VERSION        = "0.1.1";
 static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
 static const char *MAINMENUENTRY  = "Signal Information";
 
@@ -36,6 +36,7 @@ public:
 
 class cMenuFemonSetup : public cMenuSetupPage {
   private:
+    const char *dispmodes[modeMaxNumber];
     virtual void Setup(void);
   protected:
     virtual eOSState ProcessKey(eKeys Key);

femoncfg.c

@@ -18,6 +18,7 @@ cFemonConfig::cFemonConfig(void)
   redlimit       = 33;
   greenlimit     = 66;
   updateinterval = 5;
-  showbitrate    = 1;
+  analyzestream  = 1;
   calcinterval   = 20;
+  syslogoutput   = 0;
 }

femoncfg.h

@@ -9,18 +9,26 @@
 #ifndef __FEMONCFG_H
 #define __FEMONCFG_H
 
+enum dispModes {
+  modeBasic,
+  modeTransponder,
+  modeStream,
+  modeMaxNumber
+  };
+
 struct cFemonConfig
 {
 public:
   cFemonConfig(void);
-  int  hidemenu;
+  int hidemenu;
-  int  displaymode;
+  int displaymode;
-  int  position;
+  int position;
-  int  redlimit;
+  int redlimit;
-  int  greenlimit;
+  int greenlimit;
-  int  updateinterval;
+  int updateinterval;
-  int  showbitrate;
+  int analyzestream;
-  int  calcinterval;
+  int calcinterval;
+  int syslogoutput;
 };
 
 extern cFemonConfig femonConfig;

femonosd.c

@@ -12,55 +12,42 @@
 #include "femonreceiver.h"
 #include "femonosd.h"
 
-#if (VDRVERSNUM < 10300) && !defined(ELCHIAIOVERSION)
+#define FRONTEND_DEVICE          "/dev/dvb/adapter%d/frontend%d"
-#warning You should consider using the small fonts!
+#define CHANNELINPUT_TIMEOUT     1000
-#endif
 
-#define FE_DEVICE            "/dev/dvb/adapter%d/frontend%d"
+#define SCREENWIDTH              720 // in pixels
-#define CHANNELINPUT_TIMEOUT 1000
+#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 OSDWIDTH        46
+#define OSDINFOWIN_Y(offset)     (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
-#define OSDINFOHEIGHT   11
+#define OSDINFOWIN_X(col)        ((col == 4) ? 470 : (col == 3) ? 300 : (col==2) ? 180 : 15)
-#define OSDGAPHEIGHT    1
+#define OSDSTATUSWIN_Y(offset)   (femonConfig.position ? offset : (OSDHEIGHT - OSDSTATUSHEIGHT + offset))
-#define OSDSTATUSHEIGHT 6
+#define OSDSTATUSWIN_X(col)      ((col == 7) ? 475 : (col == 6) ? 410 : (col == 5) ? 275 : (col == 4) ? 220 : (col == 3) ? 125 : (col==2) ? 70 : 15)
+#define OSDSTATUSWIN_XC(col,txt) (((col - 1) * SCREENWIDTH / 6) + ((SCREENWIDTH / 6 - m_Font->Width(txt)) / 2))
+#define BARWIDTH(x)              (OSDWIDTH * x / 100)
 
-#define OSDSTATUSCOL1   1
+#define clrBackground            clrGray50 // this should be tied somehow into current theme
-#define OSDSTATUSCOL2   10
-#define OSDSTATUSCOL3   17
-#define OSDSTATUSCOL4   32
-
-#define OSDSTATUSLOCK   1
-#define OSDSTATUSSIGN   9
-#define OSDSTATUSCARR   19
-#define OSDSTATUSVITE   30
-#define OSDSTATUSSYNC   40
-
-#define OSDINFOLCOL1    1
-#define OSDINFOLCOL2    14
-#define OSDINFOLCOL3    23
-#define OSDINFOLCOL4    36
 
 cFemonOsd::cFemonOsd(void)
-#if VDRVERSNUM >= 10300
+:cOsdObject(true), cThread("femon osd")
-:cOsdObject(true), cThread("femon plugin")
-#else
-:cOsdObject(true)
-#endif
 {
   //printf("cFemonOsd::cFemonOsd()\n");
   m_Osd = NULL;
-  m_InfoWindow = -1;
-  m_StatusWindow = -1;
   m_Receiver = NULL;
   m_Frontend = -1;
   m_Active = false;
   m_Number = 0;
+  m_OldNumber = 0;
   m_InputTime = 0;
   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();
 }
 
@@ -69,7 +56,7 @@ cFemonOsd::~cFemonOsd(void)
   //printf("cFemonOsd::~cFemonOsd()\n");
   if (m_Active) {
      m_Active = false;
-     Cancel(5);
+     Cancel(3);
      }
   if (m_Receiver)
      delete m_Receiver;
@@ -84,67 +71,70 @@ void cFemonOsd::DrawStatusWindow(void)
   char buf[128];
   int snr = m_SNR / 655;
   int signal = m_Signal / 655;
-  int lines = 0;
+  int offset = 0;
+  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
 
   if (m_Osd) {
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrBackground);
-     eDvbFont OldFont = m_Osd->SetFont(fontSml);
+     snprintf(buf, sizeof(buf), "%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->Name());
-#endif
+     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+m_Font->Height()-1), clrWhite);
-     m_Osd->Clear(m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrBlack, clrWhite, m_Font);
-     snprintf(buf, sizeof(buf), "%d%s %s", m_Number ? m_Number : Channels.GetByNumber(cDevice::CurrentChannel())->Number(), m_Number ? "-" : "", Channels.GetByNumber(cDevice::CurrentChannel())->Name());
+     offset += m_Font->Height();
-     m_Osd->Fill(0, femonConfig.position ? 0 : (OSDINFOHEIGHT + OSDGAPHEIGHT) * cOsd::LineHeight(), OSDWIDTH * cOsd::CellWidth(), femonConfig.position ? cOsd::LineHeight() - 1 : (OSDINFOHEIGHT + OSDGAPHEIGHT + 1) * cOsd::LineHeight() - 1, clrWhite, m_StatusWindow);
-     m_Osd->Text(OSDSTATUSCOL1 * cOsd::CellWidth(), femonConfig.position ? 0 : (OSDINFOHEIGHT + OSDGAPHEIGHT + 0) * cOsd::LineHeight(), buf, clrBlack, clrWhite, m_StatusWindow);
-     lines++;
      if (signal > 0) {
-        signal = (OSDWIDTH * cOsd::CellWidth()) * signal / 100;
+        signal = BARWIDTH(signal);
-        m_Osd->Fill(0, femonConfig.position ? lines * cOsd::LineHeight() + 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() + 3, min(((OSDWIDTH * cOsd::CellWidth()) * femonConfig.redlimit / 100), signal), femonConfig.position ? (lines + 1) * cOsd::LineHeight() - 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines + 1) * cOsd::LineHeight() - 3, clrRed, m_StatusWindow);
+        m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), signal), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrRed);
-        if (signal > ((OSDWIDTH * cOsd::CellWidth()) * femonConfig.redlimit / 100)) {
+        if (signal > BARWIDTH(femonConfig.redlimit)) {
-           m_Osd->Fill(((OSDWIDTH * cOsd::CellWidth()) * femonConfig.redlimit / 100), femonConfig.position ? lines * cOsd::LineHeight() + 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() + 3, min(((OSDWIDTH * cOsd::CellWidth()) * femonConfig.greenlimit / 100), signal), femonConfig.position ? (lines + 1) * cOsd::LineHeight() - 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines + 1) * cOsd::LineHeight() - 3, clrYellow, m_StatusWindow);
+           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 > ((OSDWIDTH * cOsd::CellWidth()) * femonConfig.greenlimit / 100)) {
+        if (signal > BARWIDTH(femonConfig.greenlimit)) {
-           m_Osd->Fill(((OSDWIDTH * cOsd::CellWidth()) * femonConfig.greenlimit / 100), femonConfig.position ? lines * cOsd::LineHeight() + 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() + 3, signal, femonConfig.position ? (lines + 1) * cOsd::LineHeight() - 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines + 1) * cOsd::LineHeight() - 3, clrGreen, m_StatusWindow);
+           m_Osd->DrawRectangle(BARWIDTH(femonConfig.greenlimit), OSDSTATUSWIN_Y(offset+3), signal, OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrGreen);
            }
         }
-     lines++;
+     offset += m_Font->Height();
      if (snr > 0) {
-        snr = (OSDWIDTH * cOsd::CellWidth()) * snr / 100;
+        snr = BARWIDTH(snr);
-        m_Osd->Fill(0, femonConfig.position ? lines * cOsd::LineHeight() + 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() + 3, min(((OSDWIDTH * cOsd::CellWidth()) * femonConfig.redlimit / 100), snr), femonConfig.position ? (lines + 1) * cOsd::LineHeight() - 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines + 1) * cOsd::LineHeight() - 3, clrRed, m_StatusWindow);
+        m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), snr), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrRed);
-        if (snr > ((OSDWIDTH * cOsd::CellWidth()) * femonConfig.redlimit / 100)) {
+        if (snr > BARWIDTH(femonConfig.redlimit)) {
-           m_Osd->Fill(((OSDWIDTH * cOsd::CellWidth()) * femonConfig.redlimit / 100), femonConfig.position ? lines * cOsd::LineHeight() + 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() + 3, min(((OSDWIDTH * cOsd::CellWidth()) * femonConfig.greenlimit / 100), snr), femonConfig.position ? (lines + 1) * cOsd::LineHeight() - 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines + 1) * cOsd::LineHeight() - 3, clrYellow, m_StatusWindow);
+           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 > ((OSDWIDTH * cOsd::CellWidth()) * femonConfig.greenlimit / 100)) {
+        if (snr > BARWIDTH(femonConfig.greenlimit)) {
-           m_Osd->Fill(((OSDWIDTH * cOsd::CellWidth()) * femonConfig.greenlimit / 100),  femonConfig.position ? lines * cOsd::LineHeight() + 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() + 3, snr, femonConfig.position ? (lines + 1) * cOsd::LineHeight() - 3 : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines + 1) * cOsd::LineHeight() - 3, clrGreen, m_StatusWindow);
+           m_Osd->DrawRectangle(BARWIDTH(femonConfig.greenlimit),  OSDSTATUSWIN_Y(offset+3), snr, OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrGreen);
            }
         }
-     lines++;
+     offset += m_Font->Height();
-     snprintf(buf, sizeof(buf), "STR: %04x", m_Signal);
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "STR:", clrWhite, clrBackground, m_Font);
-     m_Osd->Text(OSDSTATUSCOL1 * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_StatusWindow);
+     snprintf(buf, sizeof(buf), "%04x", m_Signal);
+     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
      snprintf(buf, sizeof(buf), "(%2d%%)", m_Signal / 655);
-     m_Osd->Text(OSDSTATUSCOL2 * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), buf, clrWhite /*signal < femonConfig.redlimit ? clrRed : signal < femonConfig.greenlimit ? clrYellow : clrGreen*/, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     snprintf(buf, sizeof(buf), "BER: %08x", m_BER);
+     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "BER:", clrWhite, clrBackground, m_Font);
-     m_Osd->Text(OSDSTATUSCOL3 * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_StatusWindow);
+     snprintf(buf, sizeof(buf), "%08x", m_BER);
-     if (m_Receiver) snprintf(buf, sizeof(buf), "Video: %.2f Mbit/s",m_Receiver->VideoBitrate());
+     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     else            snprintf(buf, sizeof(buf), "Video: --- Mbit/s");
+     snprintf(buf, sizeof(buf), "%s:", tr("Video"));
-     m_Osd->Text(OSDSTATUSCOL4 * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     lines++;
+     if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s", m_Receiver->VideoBitrate(), tr("Mbit/s"));
-     snprintf(buf, sizeof(buf), "SNR: %04x", m_SNR);
+     else            snprintf(buf, sizeof(buf), "--- %s", tr("Mbit/s"));
-     m_Osd->Text(OSDSTATUSCOL1 * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     offset += m_Font->Height();
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "SNR:", clrWhite, clrBackground, m_Font);
+     snprintf(buf, sizeof(buf), "%04x", m_SNR);
+     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
      snprintf(buf, sizeof(buf), "(%2d%%)", m_SNR / 655);
-     m_Osd->Text(OSDSTATUSCOL2 * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), buf, clrWhite /*snr < femonConfig.redlimit ? clrRed : snr < femonConfig.greenlimit ? clrYellow : clrGreen*/, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     snprintf(buf, sizeof(buf), "UNC: %08x", m_UNC);
+     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "UNC:", clrWhite, clrBackground, m_Font);
-     m_Osd->Text(OSDSTATUSCOL3 * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_StatusWindow);
+     snprintf(buf, sizeof(buf), "%08x", m_UNC);
-     if (m_Receiver) snprintf(buf, sizeof(buf), "Audio: %.0f kbit/s",m_Receiver->AudioBitrate());
+     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     else            snprintf(buf, sizeof(buf), "Audio: --- kbit/s");
+     snprintf(buf, sizeof(buf), "%s:", tr("Audio"));
-     m_Osd->Text(OSDSTATUSCOL4 * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     lines++;
+     if (m_Receiver) snprintf(buf, sizeof(buf), "%.0f %s", m_Receiver->AudioBitrate(), tr("kbit/s"));
-     m_Osd->Text(OSDSTATUSLOCK * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), "LOCK",   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+     else            snprintf(buf, sizeof(buf), "--- %s", tr("kbit/s"));
-     m_Osd->Text(OSDSTATUSSIGN * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), "SIGNAL", (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     m_Osd->Text(OSDSTATUSCARR * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), "CARRIER",(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+     offset += m_Font->Height();
-     m_Osd->Text(OSDSTATUSVITE * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), "VITERBI",(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_XC(1,tr("LOCK")),    OSDSTATUSWIN_Y(offset), tr("LOCK"),   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_Font);
-     m_Osd->Text(OSDSTATUSSYNC * cOsd::CellWidth(), femonConfig.position ? lines * cOsd::LineHeight() : (OSDINFOHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight(), "SYNC",   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_XC(2,tr("SIGNAL")),  OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_Font);
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+     m_Osd->DrawText(OSDSTATUSWIN_XC(3,tr("CARRIER")), OSDSTATUSWIN_Y(offset), tr("CARRIER"),(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_Font);
-     m_Osd->SetFont(OldFont);
+     m_Osd->DrawText(OSDSTATUSWIN_XC(4,tr("VITERBI")), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_Font);
-#endif
+     m_Osd->DrawText(OSDSTATUSWIN_XC(5,tr("SYNC")),    OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_Font);
      m_Osd->Flush();
      }
 }
@@ -155,225 +145,307 @@ void cFemonOsd::DrawInfoWindow(void)
   //printf("cFemonOsd::DrawInfoWindow()\n");
   char buf[128];
   char buf2[20];
-  int lines = 0;
+  int offset = 0;
   int value = 0;
+  double dvalue = 0.0;
+  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
 
   if (m_Osd) {
-     if (m_DisplayMode) {
+     if (m_DisplayMode == modeTransponder) {
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground);
-        eDvbFont OldFont = m_Osd->SetFont(fontSml);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite);
-#endif
+        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), clrBackground, clrWhite, m_Font);
-        m_Osd->Clear(m_InfoWindow);
+        offset += m_Font->Height();
-        m_Osd->Fill(0, femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), OSDWIDTH * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines + 1) * cOsd::LineHeight() - 1 : (lines + 1) * cOsd::LineHeight() - 1, clrWhite, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Vpid"), clrWhite, clrBackground, m_Font);
-        m_Osd->Text( OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines, tr("Transponder Information"), clrBackground, clrWhite, m_InfoWindow);
+        snprintf(buf, sizeof(buf), "%d", channel->Vpid());
-        lines++;
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Vpid"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Ppid"), clrWhite, clrBackground, m_Font);
-        snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Vpid());
+        snprintf(buf, sizeof(buf), "%d", channel->Ppid());
-        m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Ppid"), clrWhite, clrBackground, m_InfoWindow);
+        offset += m_Font->Height();
-        snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Ppid());
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid1"), clrWhite, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+        value = channel->Apid2();
-        lines++;
+        if (value) snprintf(buf, sizeof(buf), "%d, %d", channel->Apid1(), value);
-        m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Apid1"), clrWhite, clrBackground, m_InfoWindow);
+        else       snprintf(buf, sizeof(buf), "%d", channel->Apid1());
-        snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Apid1());
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid1"), clrWhite, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Tpid"), clrWhite, clrBackground, m_InfoWindow);
+        value = channel->Dpid2();
-        snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Tpid());
+        if (value) snprintf(buf, sizeof(buf), "%d, %d", channel->Dpid1(), value);
-        m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+        else       snprintf(buf, sizeof(buf), "%d", channel->Dpid1());
-        lines++;
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("CA"), clrWhite, clrBackground, m_InfoWindow);
+        offset += m_Font->Height();
-        snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Ca());
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("CA"), clrWhite, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+        snprintf(buf, sizeof(buf), "%d", channel->Ca());
-        m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Sid"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Sid());
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Tpid"), clrWhite, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+        snprintf(buf, sizeof(buf), "%d", channel->Tpid());
-        lines++;
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-#if (VDRVERSNUM >= 10300)
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), "Nid", clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sid"), clrWhite, clrBackground, m_Font);
-        snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Nid());
+        snprintf(buf, sizeof(buf), "%d", channel->Sid());
-        m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), "Tid" /*tr("Tid")*/, clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), "Nid", clrWhite, clrBackground, m_Font);
-        snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Tid());
+        snprintf(buf, sizeof(buf), "%d", channel->Nid());
-        m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        lines++;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), "Rid" /*tr("Rid")*/, clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), "Tid" /*tr("Tid")*/, clrWhite, clrBackground, m_Font);
-        snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Rid());
+        snprintf(buf, sizeof(buf), "%d", channel->Tid());
-        m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        lines++;
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), "Rid" /*tr("Rid")*/, clrWhite, clrBackground, m_Font);
-#endif
+        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->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               lines++;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font);
-               snprintf(buf, sizeof(buf), "%d kHz", Channels.GetByNumber(cDevice::CurrentChannel())->Frequency());
+               value = channel->Frequency();
-               m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               while (value > 20000) value /= 1000;
-               m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Source"), clrWhite, clrBackground, m_InfoWindow);
+               snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
-               snprintf(buf, sizeof(buf), "%s", cSource::ToString(Channels.GetByNumber(cDevice::CurrentChannel())->Source()));
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_Font);
-               lines++;
+               snprintf(buf, sizeof(buf), "%s", cSource::ToString(channel->Source()));
-               m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Srate"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Srate());
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Polarization"), clrWhite, clrBackground, m_InfoWindow);
+               snprintf(buf, sizeof(buf), "%d", channel->Srate());
-               snprintf(buf, sizeof(buf), "%c", toupper(Channels.GetByNumber(cDevice::CurrentChannel())->Polarization()));
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Polarization"), clrWhite, clrBackground, m_Font);
-               lines++;
+               snprintf(buf, sizeof(buf), "%c", toupper(channel->Polarization()));
-               m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->Inversion();
+               offset += m_Font->Height();
-               if      (value == 0) snprintf(buf, sizeof(buf), "Off");
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_Font);
-               else if (value == 1) snprintf(buf, sizeof(buf), "On");
+               value = channel->Inversion();
-               else                 snprintf(buf, sizeof(buf), "Auto");
+               if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off"));
-               m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               else if (value == INVERSION_ON)    snprintf(buf, sizeof(buf), tr("On"));
-               m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow);
+               else            /*INVERSION_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->CoderateH();
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               if      (value == 0) snprintf(buf, sizeof(buf), "None");
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_Font);
-               else if (value == 1) snprintf(buf, sizeof(buf), "1/2");
+               value = channel->CoderateH();
-               else if (value == 2) snprintf(buf, sizeof(buf), "2/3");
+               if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), tr("None"));
-               else if (value == 3) snprintf(buf, sizeof(buf), "3/4");
+               else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2");
-               else if (value == 4) snprintf(buf, sizeof(buf), "4/5");
+               else if (value == FEC_2_3)   snprintf(buf, sizeof(buf), "2/3");
-               else if (value == 5) snprintf(buf, sizeof(buf), "5/6");
+               else if (value == FEC_3_4)   snprintf(buf, sizeof(buf), "3/4");
-               else if (value == 6) snprintf(buf, sizeof(buf), "6/7");
+               else if (value == FEC_4_5)   snprintf(buf, sizeof(buf), "4/5");
-               else if (value == 7) snprintf(buf, sizeof(buf), "7/8");
+               else if (value == FEC_5_6)   snprintf(buf, sizeof(buf), "5/6");
-               else if (value == 8) snprintf(buf, sizeof(buf), "8/9");
+               else if (value == FEC_6_7)   snprintf(buf, sizeof(buf), "6/7");
-               else                 snprintf(buf, sizeof(buf), "Auto");
+               else if (value == FEC_7_8)   snprintf(buf, sizeof(buf), "7/8");
-               m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               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->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               lines++;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font);
-               snprintf(buf, sizeof(buf), "%d kHz", Channels.GetByNumber(cDevice::CurrentChannel())->Frequency());
+               value = channel->Frequency();
-               m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               while (value > 20000) value /= 1000;
-               m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Source"), clrWhite, clrBackground, m_InfoWindow);
+               snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
-               snprintf(buf, sizeof(buf), "%s", cSource::ToString(Channels.GetByNumber(cDevice::CurrentChannel())->Source()));
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_Font);
-               lines++;
+               snprintf(buf, sizeof(buf), "%s", cSource::ToString(channel->Source()));
-               m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Srate"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               snprintf(buf, sizeof(buf), "%d", Channels.GetByNumber(cDevice::CurrentChannel())->Srate());
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Modulation"), clrWhite, clrBackground, m_InfoWindow);
+               snprintf(buf, sizeof(buf), "%d", channel->Srate());
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->Modulation();
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               if      (value == 0) snprintf(buf, sizeof(buf), "QPSK");
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_Font);
-               else if (value == 1) snprintf(buf, sizeof(buf), "QAM 16");
+               value = channel->Modulation();
-               else if (value == 2) snprintf(buf, sizeof(buf), "QAM 32");
+               if      (value == QPSK)      snprintf(buf, sizeof(buf), "QPSK");
-               else if (value == 3) snprintf(buf, sizeof(buf), "QAM 64");
+               else if (value == QAM_16)    snprintf(buf, sizeof(buf), "QAM 16");
-               else if (value == 4) snprintf(buf, sizeof(buf), "QAM 128");
+               else if (value == QAM_32)    snprintf(buf, sizeof(buf), "QAM 32");
-               else if (value == 5) snprintf(buf, sizeof(buf), "QAM 256");
+               else if (value == QAM_64)    snprintf(buf, sizeof(buf), "QAM 64");
-               else                 snprintf(buf, sizeof(buf), "QAM Auto");
+               else if (value == QAM_128)   snprintf(buf, sizeof(buf), "QAM 128");
-               m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               else if (value == QAM_256)   snprintf(buf, sizeof(buf), "QAM 256");
-               lines++;
+               else            /*QAM_AUTO*/ snprintf(buf, sizeof(buf), "QAM %s", tr("Auto"));
-               m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->Inversion();
+               offset += m_Font->Height();
-               if      (value == 0) snprintf(buf, sizeof(buf), "Off");
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_Font);
-               else if (value == 1) snprintf(buf, sizeof(buf), "On");
+               value = channel->Inversion();
-               else                 snprintf(buf, sizeof(buf), "Auto");
+               if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off"));
-               m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               else if (value == INVERSION_ON)    snprintf(buf, sizeof(buf), tr("On"));
-               m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow);
+               else            /*INVERSION_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->CoderateH();
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               if      (value == 0) snprintf(buf, sizeof(buf), "None");
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_Font);
-               else if (value == 1) snprintf(buf, sizeof(buf), "1/2");
+               value = channel->CoderateH();
-               else if (value == 2) snprintf(buf, sizeof(buf), "2/3");
+               if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), tr("None"));
-               else if (value == 3) snprintf(buf, sizeof(buf), "3/4");
+               else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2");
-               else if (value == 4) snprintf(buf, sizeof(buf), "4/5");
+               else if (value == FEC_2_3)   snprintf(buf, sizeof(buf), "2/3");
-               else if (value == 5) snprintf(buf, sizeof(buf), "5/6");
+               else if (value == FEC_3_4)   snprintf(buf, sizeof(buf), "3/4");
-               else if (value == 6) snprintf(buf, sizeof(buf), "6/7");
+               else if (value == FEC_4_5)   snprintf(buf, sizeof(buf), "4/5");
-               else if (value == 7) snprintf(buf, sizeof(buf), "7/8");
+               else if (value == FEC_5_6)   snprintf(buf, sizeof(buf), "5/6");
-               else if (value == 8) snprintf(buf, sizeof(buf), "8/9");
+               else if (value == FEC_6_7)   snprintf(buf, sizeof(buf), "6/7");
-               else                 snprintf(buf, sizeof(buf), "Auto");
+               else if (value == FEC_7_8)   snprintf(buf, sizeof(buf), "7/8");
-               m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               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->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               lines++;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font);
-               snprintf(buf, sizeof(buf), "%d kHz", Channels.GetByNumber(cDevice::CurrentChannel())->Frequency() / 1000);
+               value = channel->Frequency();
-               m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               while (value > 20000) value /= 1000;
-               m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Transmission"), clrWhite, clrBackground, m_InfoWindow);
+               snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->Transmission();
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               if      (value == 0) snprintf(buf, sizeof(buf), "2K");
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Transmission"), clrWhite, clrBackground, m_Font);
-               else if (value == 1) snprintf(buf, sizeof(buf), "8K");
+               value = channel->Transmission();
-               else                 snprintf(buf, sizeof(buf), "Auto");
+               if      (value == TRANSMISSION_MODE_2K)    snprintf(buf, sizeof(buf), "2K");
-               m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               else if (value == TRANSMISSION_MODE_8K)    snprintf(buf, sizeof(buf), "8K");
-               lines++;
+               else            /*TRANSMISSION_MODE_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               m_Osd->Text( OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Bandwidth"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->Bandwidth();
+               offset += m_Font->Height();
-               if      (value == 0) snprintf(buf, sizeof(buf), "6 MHz");
+               m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bandwidth"), clrWhite, clrBackground, m_Font);
-               else if (value == 1) snprintf(buf, sizeof(buf), "7 MHz");
+               value = channel->Bandwidth();
-               else if (value == 2) snprintf(buf, sizeof(buf), "8 MHz");
+               if      (value == BANDWIDTH_8_MHZ) snprintf(buf, sizeof(buf), "8 %s", tr("MHz"));
-               else                 snprintf(buf, sizeof(buf), "Auto");
+               else if (value == BANDWIDTH_7_MHZ) snprintf(buf, sizeof(buf), "7 %s", tr("MHz"));
-               m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               else if (value == BANDWIDTH_6_MHZ) snprintf(buf, sizeof(buf), "6 %s", tr("MHz"));
-               m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Modulation"), clrWhite, clrBackground, m_InfoWindow);
+               else            /*BANDWIDTH_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->Modulation();
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               if      (value == 0) snprintf(buf, sizeof(buf), "QPSK");
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_Font);
-               else if (value == 1) snprintf(buf, sizeof(buf), "QAM 16");
+               value = channel->Modulation();
-               else if (value == 2) snprintf(buf, sizeof(buf), "QAM 32");
+               if      (value == QPSK)      snprintf(buf, sizeof(buf), "QPSK");
-               else if (value == 3) snprintf(buf, sizeof(buf), "QAM 64");
+               else if (value == QAM_16)    snprintf(buf, sizeof(buf), "QAM 16");
-               else if (value == 4) snprintf(buf, sizeof(buf), "QAM 128");
+               else if (value == QAM_32)    snprintf(buf, sizeof(buf), "QAM 32");
-               else if (value == 5) snprintf(buf, sizeof(buf), "QAM 256");
+               else if (value == QAM_64)    snprintf(buf, sizeof(buf), "QAM 64");
-               else                 snprintf(buf, sizeof(buf), "QAM Auto");
+               else if (value == QAM_128)   snprintf(buf, sizeof(buf), "QAM 128");
-               m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               else if (value == QAM_256)   snprintf(buf, sizeof(buf), "QAM 256");
-               lines++;
+               else            /*QAM_AUTO*/ snprintf(buf, sizeof(buf), "QAM %s", tr("Auto"));
-               m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->Inversion();
+               offset += m_Font->Height();
-               if      (value == 0) snprintf(buf, sizeof(buf), "Off");
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_Font);
-               else if (value == 1) snprintf(buf, sizeof(buf), "On");
+               value = channel->Inversion();
-               else                 snprintf(buf, sizeof(buf), "Auto");
+               if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off"));
-               m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               else if (value == INVERSION_ON)    snprintf(buf, sizeof(buf), tr("On"));
-               m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow);
+               else            /*INVERSION_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->CoderateH();
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               if      (value == 0) snprintf(buf, sizeof(buf), "None");
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_Font);
-               else if (value == 1) snprintf(buf, sizeof(buf), "1/2");
+               value = channel->CoderateH();
-               else if (value == 2) snprintf(buf, sizeof(buf), "2/3");
+               if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), tr("None"));
-               else if (value == 3) snprintf(buf, sizeof(buf), "3/4");
+               else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2");
-               else if (value == 4) snprintf(buf, sizeof(buf), "4/5");
+               else if (value == FEC_2_3)   snprintf(buf, sizeof(buf), "2/3");
-               else if (value == 5) snprintf(buf, sizeof(buf), "5/6");
+               else if (value == FEC_3_4)   snprintf(buf, sizeof(buf), "3/4");
-               else if (value == 6) snprintf(buf, sizeof(buf), "6/7");
+               else if (value == FEC_4_5)   snprintf(buf, sizeof(buf), "4/5");
-               else if (value == 7) snprintf(buf, sizeof(buf), "7/8");
+               else if (value == FEC_5_6)   snprintf(buf, sizeof(buf), "5/6");
-               else if (value == 8) snprintf(buf, sizeof(buf), "8/9");
+               else if (value == FEC_6_7)   snprintf(buf, sizeof(buf), "6/7");
-               else                 snprintf(buf, sizeof(buf), "Auto");
+               else if (value == FEC_7_8)   snprintf(buf, sizeof(buf), "7/8");
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->CoderateL();
+               else if (value == FEC_8_9)   snprintf(buf, sizeof(buf), "8/9");
-               if      (value == 0) snprintf(buf2, sizeof(buf2), " - None");
+               else            /*FEC_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               else if (value == 1) snprintf(buf2, sizeof(buf2), " - 1/2");
+               value = channel->CoderateL();
-               else if (value == 2) snprintf(buf2, sizeof(buf2), " - 2/3");
+               if      (value == FEC_NONE)  snprintf(buf2, sizeof(buf2), " - %s", tr("None"));
-               else if (value == 3) snprintf(buf2, sizeof(buf2), " - 3/4");
+               else if (value == FEC_1_2)   snprintf(buf2, sizeof(buf2), " - 1/2");
-               else if (value == 4) snprintf(buf2, sizeof(buf2), " - 4/5");
+               else if (value == FEC_2_3)   snprintf(buf2, sizeof(buf2), " - 2/3");
-               else if (value == 5) snprintf(buf2, sizeof(buf2), " - 5/6");
+               else if (value == FEC_3_4)   snprintf(buf2, sizeof(buf2), " - 3/4");
-               else if (value == 6) snprintf(buf2, sizeof(buf2), " - 6/7");
+               else if (value == FEC_4_5)   snprintf(buf2, sizeof(buf2), " - 4/5");
-               else if (value == 7) snprintf(buf2, sizeof(buf2), " - 7/8");
+               else if (value == FEC_5_6)   snprintf(buf2, sizeof(buf2), " - 5/6");
-               else if (value == 8) snprintf(buf2, sizeof(buf2), " - 8/9");
+               else if (value == FEC_6_7)   snprintf(buf2, sizeof(buf2), " - 6/7");
-               else                 snprintf(buf2, sizeof(buf2), " - Auto");
+               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->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               lines++;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOLCOL1 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Hierarchy"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Hierarchy"), clrWhite, clrBackground, m_Font);
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->Hierarchy();
+               value = channel->Hierarchy();
-               if      (value == 0) snprintf(buf, sizeof(buf), "None");
+               if      (value == HIERARCHY_NONE)  snprintf(buf, sizeof(buf), tr("None"));
-               else if (value == 1) snprintf(buf, sizeof(buf), "1");
+               else if (value == HIERARCHY_1)     snprintf(buf, sizeof(buf), "1");
-               else if (value == 2) snprintf(buf, sizeof(buf), "2");
+               else if (value == HIERARCHY_2)     snprintf(buf, sizeof(buf), "2");
-               else                 snprintf(buf, sizeof(buf), "Auto");
+               else if (value == HIERARCHY_4)     snprintf(buf, sizeof(buf), "4");
-               m_Osd->Text(OSDINFOLCOL2 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               else            /*HIERARCHY_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               m_Osd->Text(OSDINFOLCOL3 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), tr("Guard"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               value = Channels.GetByNumber(cDevice::CurrentChannel())->Guard();
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Guard"), clrWhite, clrBackground, m_Font);
-               if      (value == 0) snprintf(buf, sizeof(buf), "1/4");
+               value = channel->Guard();
-               else if (value == 1) snprintf(buf, sizeof(buf), "1/8");
+               if      (value == GUARD_INTERVAL_1_32)  snprintf(buf, sizeof(buf), "1/32");
-               else if (value == 2) snprintf(buf, sizeof(buf), "1/16");
+               else if (value == GUARD_INTERVAL_1_16)  snprintf(buf, sizeof(buf), "1/16");
-               else if (value == 3) snprintf(buf, sizeof(buf), "1/32");
+               else if (value == GUARD_INTERVAL_1_8)   snprintf(buf, sizeof(buf), "1/8");
-               else                 snprintf(buf, sizeof(buf), "Auto");
+               else if (value == GUARD_INTERVAL_1_4)   snprintf(buf, sizeof(buf), "1/4");
-               m_Osd->Text(OSDINFOLCOL4 * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT + lines) * cOsd::LineHeight() : lines * cOsd::LineHeight(), buf, clrYellow, clrBackground, m_InfoWindow);
+               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;
           }
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
-        m_Osd->SetFont(OldFont);
-#endif
         }
-     else {
+     else if (m_DisplayMode == modeStream) {
-        m_Osd->Fill(0, femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT) * cOsd::LineHeight() : 0, OSDWIDTH * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDINFOHEIGHT + OSDGAPHEIGHT) * cOsd::LineHeight() : OSDINFOHEIGHT * cOsd::LineHeight(), clrTransparent, m_InfoWindow);
+        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("Stream Information"), clrBackground, clrWhite, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Stream"), clrYellow, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "#%d", channel->Vpid());
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s (%.2f %s)", m_Receiver->VideoStreamBitrate(), tr("Mbit/s"), m_Receiver->VideoBitrate(), tr("Mbit/s"));
+        else            snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Aspect Ratio"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) {
+           value =  m_Receiver->VideoAspectRatio();
+           if      (value == 100) snprintf(buf, sizeof(buf), "1:1");
+           else if (value == 133) snprintf(buf, sizeof(buf), "4:3");
+           else if (value == 177) snprintf(buf, sizeof(buf), "16:9");
+           else if (value == 233) snprintf(buf, sizeof(buf), "2.21:1");
+           else                   snprintf(buf, sizeof(buf), "%s", tr("reserved"));
+           }
+        else                      snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Rate"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s", m_Receiver->VideoFrameRate(), tr("Hz"));
+        else            snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Format"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) {
+           value =  m_Receiver->VideoFormat();
+           if      (value == 1) snprintf(buf, sizeof(buf), "%s", tr("PAL"));
+           else if (value == 2) snprintf(buf, sizeof(buf), "%s", tr("NTSC"));
+           else                 snprintf(buf, sizeof(buf), "%s", tr("unknown"));
+           }
+        else                    snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Resolution"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) snprintf(buf, sizeof(buf), "%d x %d", m_Receiver->VideoHorizontalSize(), m_Receiver->VideoVerticalSize());
+        else            snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Stream"), clrYellow, clrBackground, m_Font);
+        snprintf(buf, sizeof(buf), "#%d", channel->Apid1());
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
+        dvalue = m_Receiver->AudioStreamBitrate();
+        if (m_Receiver) {
+            if      (dvalue == -1.0) snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("reserved"), m_Receiver->AudioBitrate(), tr("kbit/s"));
+            else if (dvalue == -2.0) snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("free"), m_Receiver->AudioBitrate(), tr("kbit/s"));
+            else                     snprintf(buf, sizeof(buf), "%.0f %s (%.0f %s)", dvalue, tr("kbit/s"), m_Receiver->AudioBitrate(), tr("kbit/s"));
+            }
+        else                         snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("MPEG Layer"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) snprintf(buf, sizeof(buf), "%d", m_Receiver->AudioMPEGLayer());
+        else            snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_Font);
+        if (m_Receiver) {
+           value =  m_Receiver->AudioSamplingFreq();
+           if      (value == -1) snprintf(buf, sizeof(buf), "%s", tr("reserved"));
+           else                  snprintf(buf, sizeof(buf), "%.1f %s", (value / 1000.0), tr("kHz"));
+           }
+        else                     snprintf(buf, sizeof(buf), "---");
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        }
+     else /* modeBasic */ {
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
         }
      m_Osd->Flush();
      }
@@ -382,9 +454,6 @@ void cFemonOsd::DrawInfoWindow(void)
 void cFemonOsd::Action(void)
 {
   //printf("cFemonOsd::Action()\n");
-#if (VDRVERSNUM < 10300)
-	isyslog("femon plugin: thread started (pid = %d)", getpid());
-#endif
   m_Active = true;
   while (m_Active) {
     if (m_Frontend != -1) {
@@ -395,19 +464,19 @@ void cFemonOsd::Action(void)
        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.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) {
@@ -421,17 +490,25 @@ void cFemonOsd::Show(void)
      close(m_Frontend);
      return;
      }
-  m_Osd = cOsd::OpenRaw((720 - OSDWIDTH * cOsd::CellWidth()) / 2, (576 - (OSDSTATUSHEIGHT + OSDINFOHEIGHT + OSDGAPHEIGHT) * cOsd::LineHeight()) / 2);
+  m_Osd = cOsdProvider::NewOsd(((Setup.OSDWidth - OSDWIDTH) / 2) + Setup.OSDLeft, ((Setup.OSDHeight - OSDHEIGHT) / 2) + Setup.OSDTop);
   if (m_Osd) {
-     m_StatusWindow = m_Osd->Create(0, femonConfig.position ? 0 : (OSDINFOHEIGHT + OSDGAPHEIGHT) * cOsd::LineHeight(), OSDWIDTH * cOsd::CellWidth(), OSDSTATUSHEIGHT * cOsd::LineHeight(), 4);
+     tArea Areas[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, 4 } };
-     m_InfoWindow = m_Osd->Create(0, femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT) * cOsd::LineHeight() : 0, OSDWIDTH * cOsd::CellWidth(), OSDINFOHEIGHT * cOsd::LineHeight(), 2);
+     if (m_Osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk) {
-     m_Osd->Clear();
+        m_Osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
-     m_Osd->Fill(0, femonConfig.position ? (OSDSTATUSHEIGHT + OSDGAPHEIGHT) * cOsd::LineHeight() : 0, OSDWIDTH * cOsd::CellWidth(), femonConfig.position ? (OSDSTATUSHEIGHT + OSDINFOHEIGHT + OSDGAPHEIGHT) * cOsd::LineHeight() : OSDINFOHEIGHT * cOsd::LineHeight(), clrTransparent, m_InfoWindow);
+        }
+     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;
-     if (femonConfig.showbitrate) {
+     if (femonConfig.analyzestream) {
-        m_Receiver = new cFemonReceiver(Channels.GetByNumber(cDevice::CurrentChannel())->Ca(), Channels.GetByNumber(cDevice::CurrentChannel())->Vpid(), Channels.GetByNumber(cDevice::CurrentChannel())->Apid1());
+        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();
@@ -443,7 +520,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) {
@@ -459,8 +536,9 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
      }
   if (m_Receiver)
      delete m_Receiver;
-  if (femonConfig.showbitrate) {
+  if (femonConfig.analyzestream) {
-     m_Receiver = new cFemonReceiver(Channels.GetByNumber(cDevice::CurrentChannel())->Ca(), Channels.GetByNumber(cDevice::CurrentChannel())->Vpid(), Channels.GetByNumber(cDevice::CurrentChannel())->Apid1());
+     channelNumber = cDevice::CurrentChannel();
+     m_Receiver = new cFemonReceiver(Channels.GetByNumber(channelNumber)->Ca(), Channels.GetByNumber(channelNumber)->Vpid(), Channels.GetByNumber(channelNumber)->Apid1());
      cDevice::ActualDevice()->AttachReceiver(m_Receiver);
      }
 }
@@ -472,9 +550,11 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
   if (state == osUnknown) {
      switch (Key & ~k_Repeat) {
        case k0:
-            if (m_Number == 0) {
+            if ((m_Number == 0) && (m_OldNumber != 0)) {
-               // keep the "Toggle channels" function working - however it isn't working now :)
+               m_Number = m_OldNumber;
-               cRemote::Put(Key);
+               m_OldNumber = cDevice::CurrentChannel();
+               Channels.SwitchTo(m_Number);
+               m_Number = 0;
                return osContinue;
                }
        case k1 ... k9:
@@ -498,6 +578,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;
                      }
@@ -506,13 +587,18 @@ 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;
                   }
@@ -523,7 +609,7 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
                }
             break;
        case kOk:
-            m_DisplayMode ^= 1; // toggle between advanced and simple display mode
+            if (++m_DisplayMode >= modeMaxNumber) m_DisplayMode = 0; // toggle between display modes
             DrawInfoWindow();
             break;
        default:

femonosd.h

@@ -16,18 +16,16 @@
 #include <vdr/thread.h>
 #include <vdr/status.h>
 #include <vdr/channels.h>
-#include <vdr/font.h>
 
 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
   bool m_Active;
-  cOsdBase *m_Osd;
+  cOsd *m_Osd;
-  tWindowHandle m_InfoWindow;
-  tWindowHandle m_StatusWindow;
   cFemonReceiver *m_Receiver;
   int m_Frontend;
   struct dvb_frontend_info m_FrontendInfo;
   int m_Number;
+  int m_OldNumber;
   int m_InputTime;
   uint16_t m_SNR;
   uint16_t m_Signal;
@@ -35,6 +33,7 @@ private:
   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);

femonreceiver.c

@@ -10,21 +10,34 @@
 #include "femoncfg.h"
 #include "femonreceiver.h"
 
+#define TS_SIZE       188
+#define PAY_START     0x40
+#define ADAPT_FIELD   0x20
+#define PAYLOAD       0x10
+#define PTS_DTS_FLAGS 0xC0
+
 cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid)
-#if VDRVERSNUM >= 10300
 :cReceiver(Ca, -1, 2, Vpid, Apid), cThread("femon receiver")
-#else
-:cReceiver(Ca, -1, 2, Vpid, Apid)
-#endif
 {
   //printf("cFemonReceiver::cFemonReceiver()\n");
   m_Active = false;
   m_VideoPid = Vpid;
   m_AudioPid = Apid;
   m_VideoPacketCount = 0;
-  m_AudioPacketCount = 0;
+  m_VideoHorizontalSize = 0;
+  m_VideoVerticalSize = 0;
+  m_VideoAspectRatio = 0;
+  m_VideoFormat = 0;
+  m_VideoFrameRate = 0.0;
+  m_VideoStreamBitrate = 0.0;
   m_VideoBitrate = 0.0;
+  m_AudioPacketCount = 0;
+  m_AudioStreamBitrate = -2.0;
   m_AudioBitrate = 0.0;
+  m_AudioSamplingFreq = -1;
+  m_AudioMPEGLayer = 0;
+  m_AudioBitrate = 0.0;
+
 }
  
 cFemonReceiver::~cFemonReceiver(void)
@@ -32,10 +45,127 @@ cFemonReceiver::~cFemonReceiver(void)
   //printf("cFemonReceiver::~cFemonReceiver()\n");
   if (m_Active) {
      m_Active = false;
-     Cancel(5);
+     Cancel(0);
      }
 }
 
+/* the following function originates from libdvbmpeg: */
+void cFemonReceiver::GetVideoInfo(uint8_t *mbuf, int count)
+{
+  //printf("cFemonReceiver::GetVideoInfo()\n");
+  uint8_t *headr;
+  int found = 0;
+  int c = 0;
+  while (found < 4 && c + 4 < count) {
+    uint8_t *b;
+    b = mbuf + c;
+    if (b[0] == 0x00 && b[1] == 0x00 && b[2] == 0x01 && b[3] == 0xb3)
+       found = 4;
+    else
+       c++;
+    }
+  if (!found) return;
+  c += 4;
+  if (c + 12 >= count) return;
+  headr = mbuf + c;
+  m_VideoHorizontalSize = ((headr[1] &0xF0) >> 4) | (headr[0] << 4);
+  m_VideoVerticalSize = ((headr[1] &0x0F) << 8) | (headr[2]);
+  int sw = (int)((headr[3] & 0xF0) >> 4);
+  switch( sw ){
+    case 1:
+      m_VideoAspectRatio = 100;
+      break;
+    case 2:
+      m_VideoAspectRatio = 133;
+      break;
+    case 3:
+      m_VideoAspectRatio = 177;
+      break;
+    case 4:
+      m_VideoAspectRatio = 221;
+      break;
+    case 5 ... 15:
+      m_VideoAspectRatio = 0;
+      break;
+    default:
+      return;
+    }
+  sw = (int)(headr[3] & 0x0F);
+  switch ( sw ) {
+    case 1:
+      m_VideoFrameRate = 24000/1001.0;
+      m_VideoFormat = 0;
+      break;
+    case 2:
+      m_VideoFrameRate = 24.0;
+      m_VideoFormat = 0;
+      break;
+    case 3:
+      m_VideoFrameRate = 25.0;
+      m_VideoFormat = 1;
+      break;
+    case 4:
+      m_VideoFrameRate = 30000/1001.0;
+      m_VideoFormat = 2;
+      break;
+    case 5:
+      m_VideoFrameRate = 30.0;
+      m_VideoFormat = 2;
+      break;
+    case 6:
+      m_VideoFrameRate = 50.0;
+      m_VideoFormat = 1;
+      break;
+    case 7:
+      m_VideoFrameRate = 60.0;
+      m_VideoFormat = 2;
+      break;
+    }
+  m_VideoStreamBitrate = 400 * (((headr[4] << 10) & 0x0003FC00UL) | ((headr[5] << 2) & 0x000003FCUL) | (((headr[6] & 0xC0) >> 6) & 0x00000003UL)) / 1000000.0;
+}
+
+static unsigned int bitrates[3][16] =
+{
+  {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0},
+  {0, 32, 48, 56, 64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 0},
+  {0, 32, 40, 48, 56,  64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 0}
+};
+
+static unsigned int samplerates[4] = {441, 480, 320, 0};
+
+/* the following function originates from libdvbmpeg: */
+void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count)
+{
+  //printf("cFemonReceiver::GetAudioInfo()\n");
+  uint8_t *headr;
+  int found = 0;
+  int c = 0;
+  int tmp = 0;
+  while (!found && c < count) {
+    uint8_t *b = mbuf + c;
+    if (b[0] == 0xff && (b[1] & 0xf8) == 0xf8)
+       found = 1;
+    else
+       c++;
+    }	
+  if (!found) return;
+  if (c + 3 >= count) return;
+  headr = mbuf + c;
+  m_AudioMPEGLayer = 4 - ((headr[1] & 0x06) >> 1);
+  tmp = bitrates[(3 - ((headr[1] & 0x06) >> 1))][(headr[2] >> 4)] * 1000;
+  if (tmp == 0)
+     m_AudioStreamBitrate = -2.0; // free
+  else if (tmp == 0xf)
+     m_AudioStreamBitrate = -1.0; // reserved
+  else
+     m_AudioStreamBitrate = tmp / 1000.0;
+  tmp = samplerates[((headr[2] & 0x0c) >> 2)] * 100;
+  if (tmp == 3)
+     m_AudioSamplingFreq = -1; // reserved
+  else
+     m_AudioSamplingFreq = tmp;
+}
+
 void cFemonReceiver::Activate(bool On)
 {
   //printf("cFemonReceiver::Activate()\n");
@@ -45,6 +175,7 @@ void cFemonReceiver::Activate(bool On)
 void cFemonReceiver::Receive(uchar *Data, int Length)
 {
   //printf("cFemonReceiver::Receive()\n");
+  // TS packet length: TS_SIZE
   if (Length == TS_SIZE) {
      int pid = ((Data[1] & 0x1f) << 8) | (Data[2]);
      if (pid == m_VideoPid) {
@@ -53,25 +184,41 @@ void cFemonReceiver::Receive(uchar *Data, int Length)
      else if (pid == m_AudioPid) {
         m_AudioPacketCount++;
         }
+     /* the following originates from libdvbmpeg: */
+     if (!(Data[3] & PAYLOAD)) {
+        return;
+        }
+     uint8_t off = 0;
+     if (Data[3] & ADAPT_FIELD) {
+        off = Data[4] + 1;
+        }
+     if (Data[1] & PAY_START) {
+        uint8_t *sb = Data + 4 + off;
+        if (sb[7] & PTS_DTS_FLAGS) {
+           uint8_t *pay = sb + sb[8] + 9; 
+           int l = TS_SIZE - 13 - off - sb[8];
+           if (pid == m_VideoPid) {
+              GetVideoInfo(pay, l);
+              }
+           if (pid == m_AudioPid) {
+              GetAudioInfo(pay, l);
+              }
+           }
+        }
+     /* end */
      }
 }
 
 void cFemonReceiver::Action(void)
 {
   //printf("cFemonReceiver::Action()\n");
-#if (VDRVERSNUM < 10300)
-	isyslog("femon receiver: thread started (pid = %d)", getpid());
-#endif
   m_Active = true;
   while (m_Active) {
-        // should we do some averaging to smooth the bitrates ?
+        // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
-        m_VideoBitrate = (8.0 * TS_SIZE * m_VideoPacketCount) / (femonConfig.calcinterval * 102.4 * 1024.0);
+        m_VideoBitrate = (8.0 * 184.0 * m_VideoPacketCount) / (femonConfig.calcinterval * 100000.0);
         m_VideoPacketCount = 0;
-        m_AudioBitrate = (8.0 * TS_SIZE * m_AudioPacketCount) / (femonConfig.calcinterval * 102.4);
+        m_AudioBitrate = (8.0 * 184.0 * m_AudioPacketCount) / (femonConfig.calcinterval * 100.0);
         m_AudioPacketCount = 0;
         usleep(100000L * femonConfig.calcinterval);
     }
-#if (VDRVERSNUM < 10300)
-	isyslog("femon receiver: thread stopped (pid = %d)", getpid());
-#endif
 }

femonreceiver.h

@@ -9,7 +9,6 @@
 #ifndef __FEMONRECEIVER_H
 #define __FEMONRECEIVER_H
 
-#include <vdr/device.h> // only for TS_SIZE
 #include <vdr/thread.h>
 #include <vdr/receiver.h>
 
@@ -19,9 +18,20 @@ private:
   int m_VideoPid;
   int m_AudioPid;
   int m_VideoPacketCount;
-  int m_AudioPacketCount;
+  int m_VideoHorizontalSize;
+  int m_VideoVerticalSize;
+  int m_VideoAspectRatio;
+  int m_VideoFormat;
+  double m_VideoFrameRate;
+  double m_VideoStreamBitrate;
   double m_VideoBitrate;
+  int m_AudioPacketCount;
+  double m_AudioStreamBitrate;
   double m_AudioBitrate;
+  int m_AudioSamplingFreq;
+  int m_AudioMPEGLayer;
+  void GetVideoInfo(uint8_t *mbuf, int count);
+  void GetAudioInfo(uint8_t *mbuf, int count);
 
 protected:
   virtual void Activate(bool On);
@@ -32,8 +42,18 @@ public:
   cFemonReceiver(int Ca, int Vpid, int Apid);
   virtual ~cFemonReceiver();
 
-  double VideoBitrate(void) { return m_VideoBitrate; };
+  int VideoHorizontalSize(void)   { return m_VideoHorizontalSize; }; // pixels
-  double AudioBitrate(void) { return m_AudioBitrate; };
+  int VideoVerticalSize(void)     { return m_VideoVerticalSize; };   // pixels
+  int VideoAspectRatio(void)      { return m_VideoAspectRatio; };    // 4:3 == 133, ...
+  int VideoFormat(void)           { return m_VideoFormat; };         // 0 == unknown, 1 == PAL, 2 == NTSC
+  double VideoFrameRate(void)     { return m_VideoFrameRate; };      // Hz
+  double VideoStreamBitrate(void) { return m_VideoStreamBitrate; };  // Mbit/s
+  double VideoBitrate(void)       { return m_VideoBitrate; };        // Mbit/s
+
+  int AudioMPEGLayer(void)        { return m_AudioMPEGLayer; };      // number
+  int AudioSamplingFreq(void)     { return m_AudioSamplingFreq; };   // Hz
+  double AudioStreamBitrate(void) { return m_AudioStreamBitrate; };  // kbit/s
+  double AudioBitrate(void)       { return m_AudioBitrate; };        // kbit/s
   };
 
 #endif //__FEMONRECEIVER_H