Backported changes and fixes from version 0.1.6.

Backported the "AC3 Stream Information" feature from version 0.1.3.
Backported changes and fixes from version 0.1.2.
2023-10-10 11:36:53 +00:00 · 2004-09-11 04:20:00 +03:00 · 2004-06-11 04:20:00 +03:00 · 2004-06-06 04:20:00 +03:00 · 2004-05-31 04:20:00 +03:00
21 changed files with 864 additions and 602 deletions
--- a/29
+++ b/29
@@ -1,5 +1,6 @@
+===================================
 VDR Plugin 'femon' Revision History
-----------------------------------
+===================================

 2004-02-15: Version 0.0.1

@@ -58,7 +59,13 @@ VDR Plugin 'femon' Revision History

 - Backported the "AC3 Stream Information" feature from version 0.1.3.

-------------------------
+2004-09-11: Version 0.0.7
+
+-  Backported changes and fixes from version 0.1.6.
+
+===================================
+VDR Plugin 'femon' Revision History
+===================================

 2004-05-18: Version 0.1.0

@@ -81,3 +88,21 @@ VDR Plugin 'femon' Revision History
 2004-06-11: Version 0.1.3

 - Added "AC-3 Stream Information" display mode (Thanks to Lothar Englisch).
+
+2004-06-24: Version 0.1.4
+
+- Added some new symbols and beautified the old ones.
+- Added audio track selection feature.
+- Added preliminary device switching feature (disabled at the moment).
+
+2004-08-18: Version 0.1.5
+
+- Fixed OSDSTATUSWIN_XC define.
+- Added preliminary NTSC support (make NTSC_SYSTEM=1 plugins).
+- Fixed "Setup/OSD/Use Small Fonts" bug (Thanks to Winni for reporting this one).
+- Added patches directory: CA system names by Lauri Tischler.
+
+2004-09-11: Version 0.1.6
+
+- Yet Another Minor Release.
+- Integrated the CA system names patch: "Setup / Show CA System".
--- a/6
+++ b/6
@@ -11,7 +11,7 @@ PLUGIN = femon

 ### The version number of this plugin (taken from the main source file):

-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ print $$6 }' | sed -e 's/[";]//g')

 ### The C++ compiler and options:

@@ -44,6 +44,10 @@ INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include

 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

+ifdef NTSC_SYSTEM
+DEFINES += -DNTSC_SYSTEM
+endif
+
 ### The object files (add further files here):

 OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femoni18n.o
--- a/34
+++ b/34
@@ -18,7 +18,6 @@ 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 and stream information are also available in advanced display modes.
-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 (see DVB-apps/szap/femon.c for further
@@ -31,8 +30,8 @@ Metzler Brothers.
 Terminology:

 --------------------------------------------------------------
-|## Channel Name ############################# DD 16:9 PAL ##|
-|[=====Signal Strength in %  =============|=================]|
+|## Channel Name ######################### [DD][AR][VF][A][D]|
+|[=====Signal Strength in % ==============|=================]|
 |[=====Signal-to-Noise Ratio in % ========|=================]|
 | STR: #0000 (0%)       BER: #00000000       Video: 0 Mbit/s |
 | SNR: #0000 (0%)       UNC: #00000000       Audio: 0 kbit/s |
@@ -44,7 +43,7 @@ SNR     - Signal-to-noise ratio
 BER     - Bit error rate
 UNC     - Uncorrected blocks
 Video   - Calculated video bitrate in Mbit/s
-Audio   - Calculated audio / AC-3 bitrate in kbit/s (only first PID)
+Audio   - Calculated audio / AC-3 bitrate in kbit/s

 LOCK    - Everything's working...
 SIGNAL  - Found something above the noise level
@@ -52,15 +51,31 @@ CARRIER - Found a DVB signal
 VITERBI - FEC (forward error correction) is stable
 SYNC    - Found sync bytes

+DD      - AC-3 stream (optional)
+AR      - Aspect Ratio: 1:1/4:3/16:9/2.21:1 (optional)
+VF      - Video format: PAL/NTSC (optional)
+A       - Audio track: 1..2 (optional)
+D       - Device number: 0..3 (optional)
+
+Controls:
+
+ChanUp/ChanDn - Switch channel up/down
+Up/Down       - Switch channel up/down
+0-9           - Select channel
+Ok            - Switch between display modes: basic, transponder, stream, AC-3
+Right/Left    - Switch to next/previous device that provides the current channel
+Green         - Select language (APID)
+Back          - Exit plugin
+
 Installation:

 cd /put/your/path/here/VDR/PLUGINS/src
-tar -xzf /put/your/path/here/vdr-femon-X.Y.Z.tar.gz
+tar -xzf /put/your/path/here/vdr-femon-X.Y.Z.tgz
 ln -s femon-X.Y.Z femon
 cd /put/your/path/here/VDR
 make
 make plugins
-./vdr -Pfemon
+./vdr -P femon

 Notes:

@@ -71,3 +86,10 @@ Notes:
  ttxtsubs, but closing and reopening the femon plugin might help temporarily as
  well. Btw., this same thing happens with OSDTeletext plugin too :)
 - Disable the stream analyze to speed up heavy zapping sessions.
+- The signal strength and signal-to-noise ratio values are comparable only
+  between the same brand/model frontends. Due to the lack of proper frontend
+  specifications those values cannot be calculated into any real units.
+- Shrinked OSD is available for NTSC users: make NTSC_SYSTEM=1
+- The device switching feature is still non-functional.
+
+"Femon - A real womon who lives according to her natural feminine inclinations."
--- a/femon.c
+++ b/femon.c
@@ -12,7 +12,7 @@
 #include "femonosd.h"
 #include "femon.h"

-#if VDRVERSNUM < 10307
+#if VDRVERSNUM && VDRVERSNUM >= 10307
 #error "You don't exist! Go away!"
 #endif

@@ -71,6 +71,7 @@ bool cPluginFemon::SetupParse(const char *Name, const char *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, "ShowCASystem"))   femonConfig.showcasystem   = 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);
@@ -101,6 +102,7 @@ void cMenuFemonSetup::Setup(void)
  Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),      tr("yes")));
  Add(new cMenuEditStraItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    modeMaxNumber, dispmodes));
  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"),  tr("top")));
+  Add(new cMenuEditBoolItem(  tr("Show CA System"),              &femonConfig.showcasystem,   tr("no"),      tr("yes")));
  Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,             50));
  Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,            100));
  Add(new cMenuEditIntItem(   tr("OSD Update Interval [0.1s]"),  &femonConfig.updateinterval, 1,             100));
@@ -116,8 +118,9 @@ void cMenuFemonSetup::Store(void)
 {
  SetupStore("HideMenu",       femonConfig.hidemenu);
  SetupStore("SyslogOutput",   femonConfig.syslogoutput);
-  SetupStore("Position",       femonConfig.position);
  SetupStore("DisplayMode",    femonConfig.displaymode);
+  SetupStore("Position",       femonConfig.position);
+  SetupStore("ShowCASystem",   femonConfig.showcasystem);
  SetupStore("RedLimit",       femonConfig.redlimit);
  SetupStore("GreenLimit",     femonConfig.greenlimit);
  SetupStore("UpdateInterval", femonConfig.updateinterval);
--- a/femon.h
+++ b/femon.h
@@ -11,7 +11,7 @@

 #include <vdr/plugin.h>

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

--- a/femoncfg.c
+++ b/femoncfg.c
@@ -21,4 +21,5 @@ cFemonConfig::cFemonConfig(void)
  analyzestream  = 1;
  calcinterval   = 20;
  syslogoutput   = 0;
+  showcasystem   = 0;
 }
--- a/femoncfg.h
+++ b/femoncfg.h
@@ -30,6 +30,7 @@ public:
  int analyzestream;
  int calcinterval;
  int syslogoutput;
+  int showcasystem;
 };

 extern cFemonConfig femonConfig;
--- a/femoni18n.c
+++ b/femoni18n.c
--- a/femoni18n.h
+++ b/femoni18n.h
@@ -9,6 +9,7 @@
 #ifndef __FEMONI18N_H
 #define __FEMONI18N_H

+#include <vdr/config.h> // for VDRVERSNUM
 #include <vdr/i18n.h>

 extern const tI18nPhrase Phrases[];
--- a/femonosd.c
+++ b/femonosd.c
@@ -12,48 +12,39 @@
 #include "femonreceiver.h"
 #include "femonosd.h"

-#include "symbols/ar11.xpm"
-#include "symbols/ar169.xpm"
-#include "symbols/ar2211.xpm"
-#include "symbols/ar43.xpm"
-#include "symbols/ntsc.xpm"
-#include "symbols/pal.xpm"
-#include "symbols/dolbydigital.xpm"
-#include "symbols/dolbydigital20.xpm"
-#include "symbols/dolbydigital51.xpm"
+#if (VDRVERSNUM < 10300) && !defined(ELCHIAIOVERSION)
+#warning You should consider using the small fonts!
+#endif

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

-#define SCREENWIDTH              720 // in pixels
+#ifdef NTSC_SYSTEM
+#define SCREENHEIGHT             480 // in pixels
+#define OSDHEIGHT                420 // in pixels
+#else
 #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)
+#endif
+#define SCREENWIDTH              720 // in pixels
+#define OSDWIDTH                 600 // in pixels
+#define OSDINFOHEIGHT            ((cOsd::LineHeight() - 2) * 11) // in pixels (11 rows)
+#define OSDSTATUSHEIGHT          ((cOsd::LineHeight() - 2) * 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 OSDINFOWIN_X(col)        ((col == 4) ? 455 : (col == 3) ? 305 : (col == 2) ? 155 : 15)
 #define OSDSTATUSWIN_Y(offset)   (femonConfig.position ? offset : (OSDHEIGHT - OSDSTATUSHEIGHT + offset))
-#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 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) * OSDWIDTH / 5) + ((OSDWIDTH / 5 - cOsd::WidthInCells(txt) * cOsd::CellWidth()) / 2))
 #define BARWIDTH(x)              (OSDWIDTH * x / 100)
-#define SPACING                  5
-
-#define clrBackground            clrGray50 // this should be tied somehow into current theme
-
-cBitmap cFemonOsd::bmAspectRatio_1_1(ar11_xpm);
-cBitmap cFemonOsd::bmAspectRatio_16_9(ar169_xpm);
-cBitmap cFemonOsd::bmAspectRatio_2_21_1(ar2211_xpm);
-cBitmap cFemonOsd::bmAspectRatio_4_3(ar43_xpm);
-cBitmap cFemonOsd::bmPAL(pal_xpm);
-cBitmap cFemonOsd::bmNTSC(ntsc_xpm);
-cBitmap cFemonOsd::bmDD(dolbydigital_xpm);
-cBitmap cFemonOsd::bmDD20(dolbydigital20_xpm);
-cBitmap cFemonOsd::bmDD51(dolbydigital51_xpm);
+#define DELTA                    2

 cFemonOsd::cFemonOsd(void)
+#if VDRVERSNUM >= 10300
 :cOsdObject(true), cThread("femon osd")
+#else
+:cOsdObject(true)
+#endif
 {
  //printf("cFemonOsd::cFemonOsd()\n");
  m_Osd = NULL;
@@ -68,7 +59,11 @@ cFemonOsd::cFemonOsd(void)
  m_BER = 0;
  m_UNC = 0;
  m_DisplayMode = femonConfig.displaymode;
-  m_Font = cFont::GetFont(fontSml);
+#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+  m_Font = fontSml;
+#else
+  m_Font = fontOsd;
+#endif
  m_Mutex = new cMutex();
 }

@@ -93,131 +88,75 @@ void cFemonOsd::DrawStatusWindow(void)
  int snr = m_SNR / 655;
  int signal = m_Signal / 655;
  int offset = 0;
-  int x = OSDWIDTH - SPACING;
-  int y = 0;
  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());

  if (m_Osd) {
-     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrBackground);
+#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+     eDvbFont OldFont = m_Osd->SetFont(m_Font);
+#endif
+     m_Osd->Fill(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrBackground, m_StatusWindow);
     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);
-     if (m_Receiver) {
-        int value = m_Receiver->VideoFormat();
-        if (value == VF_PAL) {
-           x -= bmPAL.Width() + SPACING;
-           y = (m_Font->Height() - bmPAL.Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmPAL, clrBlack, clrWhite);
-           }
-        else if (value == VF_NTSC) {
-           x -= bmNTSC.Width() + SPACING;
-           y = (m_Font->Height() - bmNTSC.Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmNTSC, clrBlack, clrWhite);
-           }
-        value = m_Receiver->VideoAspectRatio();
-        if (value == AR_1_1) {
-           x -= bmAspectRatio_1_1.Width() + SPACING;
-           y = (m_Font->Height() - bmAspectRatio_1_1.Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmAspectRatio_1_1, clrBlack, clrWhite);
-           }
-        else if (value == AR_4_3) {
-           x -= bmAspectRatio_4_3.Width() + SPACING;
-           y = (m_Font->Height() - bmAspectRatio_4_3.Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmAspectRatio_4_3, clrBlack, clrWhite);
-           }
-        else if (value == AR_16_9) {
-           x -= bmAspectRatio_16_9.Width() + SPACING;
-           y = (m_Font->Height() - bmAspectRatio_16_9.Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmAspectRatio_16_9, clrBlack, clrWhite);
-           }
-        else if (value == AR_2_21_1) {
-           x -= bmAspectRatio_2_21_1.Width() + SPACING;
-           y = (m_Font->Height() - bmAspectRatio_2_21_1.Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmAspectRatio_2_21_1, clrBlack, clrWhite);
-           }
-        if (m_Receiver && m_Receiver->AC3Valid()) {
-           if (m_Receiver->AC3_5_1()) {
-              x -= bmDD51.Width() + SPACING;
-              y = (m_Font->Height() - bmDD51.Height()) / 2;
-              if (y < 0) y = 0;
-              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDD51, clrBlack, clrWhite);
-              }
-           else if (m_Receiver->AC3_2_0()) {
-              x -= bmDD20.Width() + SPACING;
-              y = (m_Font->Height() - bmDD20.Height()) / 2;
-              if (y < 0) y = 0;
-              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDD20, clrBlack, clrWhite);
-              }
-           else {
-              x -= bmDD.Width() + SPACING;
-              y = (m_Font->Height() - bmDD.Height()) / 2;
-              if (y < 0) y = 0;
-              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDD, clrBlack, clrWhite);
-              }
-           }
-        }
-     offset += m_Font->Height();
+     m_Osd->Fill(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_StatusWindow);
+     m_Osd->Text(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrBlack, clrWhite, m_StatusWindow);
+     offset += cOsd::LineHeight();
     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);
+        m_Osd->Fill(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), signal), OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrRed, m_StatusWindow);
        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);
+           m_Osd->Fill(BARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min((OSDWIDTH * femonConfig.greenlimit / 100), signal), OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrYellow, m_StatusWindow);
           }
        if (signal > BARWIDTH(femonConfig.greenlimit)) {
-           m_Osd->DrawRectangle(BARWIDTH(femonConfig.greenlimit), OSDSTATUSWIN_Y(offset+3), signal, OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrGreen);
+           m_Osd->Fill(BARWIDTH(femonConfig.greenlimit), OSDSTATUSWIN_Y(offset+3), signal, OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrGreen, m_StatusWindow);
           }
        }
-     offset += m_Font->Height();
+     offset += cOsd::LineHeight() - DELTA;
     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);
+        m_Osd->Fill(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), snr), OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrRed, m_StatusWindow);
        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);
+           m_Osd->Fill(BARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.greenlimit), snr), OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrYellow, m_StatusWindow);
           }
        if (snr > BARWIDTH(femonConfig.greenlimit)) {
-           m_Osd->DrawRectangle(BARWIDTH(femonConfig.greenlimit),  OSDSTATUSWIN_Y(offset+3), snr, OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrGreen);
+           m_Osd->Fill(BARWIDTH(femonConfig.greenlimit),  OSDSTATUSWIN_Y(offset+3), snr, OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-3), clrGreen, m_StatusWindow);
           }
        }
-     offset += m_Font->Height();
-     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "STR:", clrWhite, clrBackground, m_Font);
+     offset += cOsd::LineHeight() - DELTA;
+     m_Osd->Text(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "STR:", 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);
+     m_Osd->Text(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
     snprintf(buf, sizeof(buf), "(%2d%%)", m_Signal / 655);
-     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "BER:", clrWhite, clrBackground, m_Font);
+     m_Osd->Text(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->Text(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "BER:", clrWhite, clrBackground, m_StatusWindow);
     snprintf(buf, sizeof(buf), "%08x", m_BER);
-     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     m_Osd->Text(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
     snprintf(buf, sizeof(buf), "%s:", tr("Video"));
-     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     m_Osd->Text(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
     if (m_Receiver) snprintf(buf, sizeof(buf), "%.2f %s", m_Receiver->VideoBitrate(), tr("Mbit/s"));
     else            snprintf(buf, sizeof(buf), "--- %s", tr("Mbit/s"));
-     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);
+     m_Osd->Text(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     offset += cOsd::LineHeight() - DELTA;
+     m_Osd->Text(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "SNR:", clrWhite, clrBackground, m_StatusWindow);
     snprintf(buf, sizeof(buf), "%04x", m_SNR);
-     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     m_Osd->Text(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
     snprintf(buf, sizeof(buf), "(%2d%%)", m_SNR / 655);
-     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "UNC:", clrWhite, clrBackground, m_Font);
+     m_Osd->Text(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->Text(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "UNC:", clrWhite, clrBackground, m_StatusWindow);
     snprintf(buf, sizeof(buf), "%08x", m_UNC);
-     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     m_Osd->Text(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
     snprintf(buf, sizeof(buf), "%s:", (m_Receiver && m_Receiver->AC3Valid()) ? tr("AC-3") : tr("Audio"));
-     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
+     m_Osd->Text(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
     if (m_Receiver) snprintf(buf, sizeof(buf), "%.0f %s", m_Receiver->AC3Valid() ? m_Receiver->AC3Bitrate() : m_Receiver->AudioBitrate(), tr("kbit/s"));
     else            snprintf(buf, sizeof(buf), "--- %s", tr("kbit/s"));
-     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     offset += m_Font->Height();
-     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->DrawText(OSDSTATUSWIN_XC(2,tr("SIGNAL")),  OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_Font);
-     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->DrawText(OSDSTATUSWIN_XC(4,tr("VITERBI")), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_Font);
-     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->Text(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     offset += cOsd::LineHeight() - DELTA;
+     m_Osd->Text(OSDSTATUSWIN_XC(1,tr("LOCK")),    OSDSTATUSWIN_Y(offset), tr("LOCK"),   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+     m_Osd->Text(OSDSTATUSWIN_XC(2,tr("SIGNAL")),  OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+     m_Osd->Text(OSDSTATUSWIN_XC(3,tr("CARRIER")), OSDSTATUSWIN_Y(offset), tr("CARRIER"),(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+     m_Osd->Text(OSDSTATUSWIN_XC(4,tr("VITERBI")), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+     m_Osd->Text(OSDSTATUSWIN_XC(5,tr("SYNC")),    OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+     m_Osd->SetFont(OldFont);
+#endif
     m_Osd->Flush();
     }
 }
@@ -234,78 +173,146 @@ void cFemonOsd::DrawInfoWindow(void)
  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());

  if (m_Osd) {
+#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+     eDvbFont OldFont = m_Osd->SetFont(m_Font);
+#endif
     if (m_DisplayMode == modeTransponder) {
-        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);
+        m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground, m_InfoWindow);
+        m_Osd->Fill(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_InfoWindow);
+        m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), clrBackground, clrWhite, m_InfoWindow);
+        offset += cOsd::LineHeight();
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Vpid"), clrWhite, clrBackground, m_InfoWindow);
        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);
+        m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Ppid"), clrWhite, clrBackground, m_InfoWindow);
        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);
+        m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid1"), clrWhite, clrBackground, m_InfoWindow);
        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);
+        m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid1"), clrWhite, clrBackground, m_InfoWindow);
        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);
+        m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("CA"), clrWhite, clrBackground, m_InfoWindow);
+        value = channel->Ca();
+        if (femonConfig.showcasystem) {
+           /* http://www.dvb.org/index.php?id=174 */
+           switch (value) {
+             case 0x0000:
+                  /* Reserved */
+                  snprintf(buf, sizeof(buf), "%s", tr("Free to Air"));
+                  break;
+             case 0x0001 ... 0x00FF:
+                  /* Standardized systems */
+                  snprintf(buf, sizeof(buf), "%s", tr("Fixed"));
+                  break;
+             case 0x0100 ... 0x01FF:
+                  /* Canal Plus */
+                  snprintf(buf, sizeof(buf), "%s", tr("SECA/Mediaguard"));
+                  break;
+             case 0x0500 ... 0x05FF:
+                  /* France Telecom */
+                  snprintf(buf, sizeof(buf), "%s", tr("Viaccess"));
+                  break;
+             case 0x0600 ... 0x06FF:
+                  /* Irdeto */
+                  snprintf(buf, sizeof(buf), "%s", tr("Irdeto"));
+                  break;
+             case 0x0900 ... 0x09FF:
+                  /* News Datacom */
+                  snprintf(buf, sizeof(buf), "%s", tr("NDS/Videoguard"));
+                  break;
+             case 0x0B00 ... 0x0BFF:
+                  /* Norwegian Telekom */
+                  snprintf(buf, sizeof(buf), "%s", tr("Conax"));
+                  break;
+             case 0x0D00 ... 0x0DFF:
+                  /* Philips */
+                  snprintf(buf, sizeof(buf), "%s", tr("CryptoWorks"));
+                  break;
+             case 0x0E00 ... 0x0EFF:
+                  /* Scientific Atlanta */
+                  snprintf(buf, sizeof(buf), "%s", tr("PowerVu"));
+                  break;
+             case 0x1200 ... 0x12FF:
+                  /* BellVu Express */
+                  snprintf(buf, sizeof(buf), "%s", tr("NagraVision"));
+                  break;
+             case 0x1700 ... 0x17FF:
+                  /* BetaTechnik */
+                  snprintf(buf, sizeof(buf), "%s", tr("BetaCrypt"));
+                  break;
+             case 0x1800 ... 0x18FF:
+                  /* Kudelski SA */
+                  snprintf(buf, sizeof(buf), "%s", tr("NagraVision"));
+                  break;
+             case 0x4A60 ... 0x4A6F:
+                  /* @Sky */
+                  snprintf(buf, sizeof(buf), "%s", tr("SkyCrypt"));
+                  break;
+             default:
+                  snprintf(buf, sizeof(buf), "%X", value);
+                  break;
+             }
+           }
+        else {
+           snprintf(buf, sizeof(buf), "%X", value);
+           }
+        m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Tpid"), clrWhite, clrBackground, m_InfoWindow);
        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);
+        m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sid"), clrWhite, clrBackground, m_InfoWindow);
        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), tr("Nid"), clrWhite, clrBackground, m_Font);
+        m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+#if (VDRVERSNUM >= 10300)
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Nid"), clrWhite, clrBackground, m_InfoWindow);
        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), tr("Tid"), clrWhite, clrBackground, m_Font);
+        m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Tid"), clrWhite, clrBackground, m_InfoWindow);
        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), tr("Rid"), clrWhite, clrBackground, m_Font);
+        m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Rid"), clrWhite, clrBackground, m_InfoWindow);
        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();
+        m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+#endif
+        offset += cOsd::LineHeight() - DELTA;
        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);
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               offset += cOsd::LineHeight() - DELTA;
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               offset += cOsd::LineHeight() - DELTA;
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Polarization"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               offset += cOsd::LineHeight() - DELTA;
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow);
               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");
@@ -317,26 +324,26 @@ void cFemonOsd::DrawInfoWindow(void)
               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);
+               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               offset += cOsd::LineHeight() - DELTA;
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               offset += cOsd::LineHeight() - DELTA;
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_InfoWindow);
               value = channel->Modulation();
               if      (value == QPSK)      snprintf(buf, sizeof(buf), "QPSK");
               else if (value == QAM_16)    snprintf(buf, sizeof(buf), "QAM 16");
@@ -345,15 +352,15 @@ void cFemonOsd::DrawInfoWindow(void)
               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);
+               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               offset += cOsd::LineHeight() - DELTA;
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow);
               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");
@@ -365,33 +372,33 @@ void cFemonOsd::DrawInfoWindow(void)
               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);
+               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               offset += cOsd::LineHeight() - DELTA;
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Transmission"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               offset += cOsd::LineHeight() - DELTA;
+               m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bandwidth"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_InfoWindow);
               value = channel->Modulation();
               if      (value == QPSK)      snprintf(buf, sizeof(buf), "QPSK");
               else if (value == QAM_16)    snprintf(buf, sizeof(buf), "QAM 16");
@@ -400,15 +407,15 @@ void cFemonOsd::DrawInfoWindow(void)
               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);
+               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               offset += cOsd::LineHeight() - DELTA;
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow);
               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");
@@ -432,42 +439,42 @@ void cFemonOsd::DrawInfoWindow(void)
               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);
+               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               offset += cOsd::LineHeight() - DELTA;
+               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Hierarchy"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Guard"), clrWhite, clrBackground, m_InfoWindow);
               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);
+               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
               break;
          }
        }
     else if (m_DisplayMode == modeStream) {
-        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);
+        m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground, m_InfoWindow);
+        m_Osd->Fill(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_InfoWindow);
+        m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Stream Information"), clrBackground, clrWhite, m_InfoWindow);
+        offset += cOsd::LineHeight();
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Stream"), clrYellow, clrBackground, m_InfoWindow);
        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);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_InfoWindow);
        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);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Aspect Ratio"), clrWhite, clrBackground, m_InfoWindow);
        if (m_Receiver) {
           value = m_Receiver->VideoAspectRatio();
           if      (value == AR_1_1)    snprintf(buf, sizeof(buf), "1:1");
@@ -477,14 +484,14 @@ void cFemonOsd::DrawInfoWindow(void)
           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);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Rate"), clrWhite, clrBackground, m_InfoWindow);
        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);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Format"), clrWhite, clrBackground, m_InfoWindow);
        if (m_Receiver) {
           value = m_Receiver->VideoFormat();
           if      (value == VF_PAL)  snprintf(buf, sizeof(buf), "%s", tr("PAL"));
@@ -492,18 +499,20 @@ void cFemonOsd::DrawInfoWindow(void)
           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);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Resolution"), clrWhite, clrBackground, m_InfoWindow);
        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);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Stream"), clrYellow, clrBackground, m_InfoWindow);
+        value = -1;
+        cDevice::PrimaryDevice()->GetAudioTracks(&value);
+        snprintf(buf, sizeof(buf), "#%d", (value > 0 ? channel->Apid2() : channel->Apid1()));
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_InfoWindow);
        if (m_Receiver) {
           dvalue = m_Receiver->AudioStreamBitrate();
           if      (dvalue == (double)FR_RESERVED) snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("reserved"), m_Receiver->AudioBitrate(), tr("kbit/s"));
@@ -511,43 +520,43 @@ void cFemonOsd::DrawInfoWindow(void)
           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);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("MPEG Layer"), clrWhite, clrBackground, m_InfoWindow);
        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);
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
+        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_InfoWindow);
        if (m_Receiver) {
           value = m_Receiver->AudioSamplingFreq();
           if (value == FR_RESERVED) 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);
-        offset += m_Font->Height();
+        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        offset += cOsd::LineHeight() - DELTA;
        }
     else if (m_DisplayMode == modeAC3) {
-        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->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground, m_InfoWindow);
+        m_Osd->Fill(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_InfoWindow);
        snprintf(buf, sizeof(buf), "%s - %s #%d", tr("Stream Information"), tr("AC-3 Stream"), channel->Dpid1());
-        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrBackground, clrWhite, m_Font);
-        offset += m_Font->Height();
+        m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrBackground, clrWhite, m_InfoWindow);
+        offset += cOsd::LineHeight();
        if (m_Receiver && m_Receiver->AC3Valid()) {
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
+           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_InfoWindow);
           snprintf(buf, sizeof(buf), "%.0f %s (%0.f %s)", m_Receiver->AC3StreamBitrate(), tr("kbit/s"), m_Receiver->AC3Bitrate(), tr("kbit/s"));
-           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);
+           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           offset += cOsd::LineHeight() - DELTA;
+           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_InfoWindow);
           snprintf(buf, sizeof(buf), "%.1f %s", m_Receiver->AC3SamplingFreq() / 1000., tr("kHz"));
-           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 Size"), clrWhite, clrBackground, m_Font);
+           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           offset += cOsd::LineHeight() - DELTA;
+           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Size"), clrWhite, clrBackground, m_InfoWindow);
           snprintf(buf, sizeof(buf), "%d", m_Receiver->AC3FrameSize());
-           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("Bit Stream Mode"), clrWhite, clrBackground, m_Font);
+           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           offset += cOsd::LineHeight() - DELTA;
+           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bit Stream Mode"), clrWhite, clrBackground, m_InfoWindow);
           switch (m_Receiver->AC3BitStreamMode()) {
             case 0: snprintf(buf, sizeof(buf), tr("Complete Main (CM)"));     break;
             case 1: snprintf(buf, sizeof(buf), tr("Music and Effects (ME)")); break;
@@ -559,9 +568,9 @@ void cFemonOsd::DrawInfoWindow(void)
             case 7: (m_Receiver->AC3AudioCodingMode() == 1) ? snprintf(buf, sizeof(buf), tr("Voice Over (VO)")) : snprintf(buf, sizeof(buf), tr("Karaoke")); break;
             default: 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 Coding Mode"), clrWhite, clrBackground, m_Font);
+           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           offset += cOsd::LineHeight() - DELTA;
+           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Coding Mode"), clrWhite, clrBackground, m_InfoWindow);
           if (m_Receiver->AC3BitStreamMode() != 7) {
              switch (m_Receiver->AC3AudioCodingMode()) {
                case 0:  snprintf(buf, sizeof(buf), "1+1 - %s, %s",             tr("Ch1"), tr("Ch2"));                           break;
@@ -576,9 +585,9 @@ void cFemonOsd::DrawInfoWindow(void)
                }
             }
 	   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("Center Mix Level"), clrWhite, clrBackground, m_Font);
+           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           offset += cOsd::LineHeight() - DELTA;
+           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Center Mix Level"), clrWhite, clrBackground, m_InfoWindow);
           switch (m_Receiver->AC3CenterMixLevel()) {
             case CML_MINUS_3dB:   snprintf(buf, sizeof(buf), "-3.0 %s", tr("dB"));  break;
             case CML_MINUS_4_5dB: snprintf(buf, sizeof(buf), "-4.5 %s", tr("dB"));  break;
@@ -586,9 +595,9 @@ void cFemonOsd::DrawInfoWindow(void)
             case CML_RESERVED:    snprintf(buf, sizeof(buf), "%s", tr("reserved")); break;
             default:              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("Surround Mix Level"), clrWhite, clrBackground, m_Font);
+           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           offset += cOsd::LineHeight() - DELTA;
+           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Surround Mix Level"), clrWhite, clrBackground, m_InfoWindow);
           switch (m_Receiver->AC3SurroundMixLevel()) {
             case SML_MINUS_3dB: snprintf(buf, sizeof(buf), "-3 %s", tr("dB"));    break;
             case SML_MINUS_6dB: snprintf(buf, sizeof(buf), "-6 %s", tr("dB"));    break;
@@ -596,33 +605,36 @@ void cFemonOsd::DrawInfoWindow(void)
             case SML_RESERVED:  snprintf(buf, sizeof(buf), "%s", tr("reserved")); break;
             default:            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("Dolby Surround Mode"), clrWhite, clrBackground, m_Font);
+           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           offset += cOsd::LineHeight() - DELTA;
+           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dolby Surround Mode"), clrWhite, clrBackground, m_InfoWindow);
           switch (m_Receiver->AC3DolbySurroundMode()) {
             case DSM_NOT_INDICATED:     snprintf(buf, sizeof(buf), "%s", tr("not indicated")); break;
-             case DSM_NOT_DOLBYSURROUND: snprintf(buf, sizeof(buf), "%s", tr("no"));            break;
-             case DSM_DOLBYSURROUND:     snprintf(buf, sizeof(buf), "%s", tr("yes"));           break;
+             case DSM_NOT_DOLBYSURROUND: snprintf(buf, sizeof(buf), "%s", tr("Off"));           break;
+             case DSM_DOLBYSURROUND:     snprintf(buf, sizeof(buf), "%s", tr("On"));            break;
             case DSM_RESERVED:          snprintf(buf, sizeof(buf), "%s", tr("reserved"));      break;
             default:                    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("Low Frequency Effects"), clrWhite, clrBackground, m_Font);
+           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           offset += cOsd::LineHeight() - DELTA;
+           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Low Frequency Effects"), clrWhite, clrBackground, m_InfoWindow);
           snprintf(buf, sizeof(buf), "%s", m_Receiver->AC3LfeOn() ? tr("On") : tr("Off"));
-           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("Dialogue Normalization"), clrWhite, clrBackground, m_Font);
+           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           offset += cOsd::LineHeight() - DELTA;
+           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dialogue Normalization"), clrWhite, clrBackground, m_InfoWindow);
           value = m_Receiver->AC3DialogLevel();
           if (value > 0) snprintf(buf, sizeof(buf), "-%d %s", value, tr("dB"));
           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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           offset += cOsd::LineHeight() - DELTA;
           }
        }
     else /* modeBasic */ {
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
+        m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, m_InfoWindow);
        }
+#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+     m_Osd->SetFont(OldFont);
+#endif
     m_Osd->Flush();
     }
 }
@@ -630,6 +642,9 @@ 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) {
@@ -646,6 +661,9 @@ void cFemonOsd::Action(void)
       }
    usleep(100000L * femonConfig.updateinterval);
    }
+#if (VDRVERSNUM < 10300)
+	isyslog("femon plugin: thread stopped (pid = %d)", getpid());
+#endif
 }

 void cFemonOsd::Show(void)
@@ -666,19 +684,18 @@ void cFemonOsd::Show(void)
     m_Frontend = -1;
     return;
     }
-  m_Osd = cOsdProvider::NewOsd(((Setup.OSDWidth - OSDWIDTH) / 2) + Setup.OSDLeft, ((Setup.OSDHeight - OSDHEIGHT) / 2) + Setup.OSDTop);
+  m_Osd = cOsd::OpenRaw((SCREENWIDTH - OSDWIDTH) / 2, (SCREENHEIGHT - OSDHEIGHT) / 2);
  if (m_Osd) {
-     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);
+#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+     eDvbFont OldFont = m_Osd->SetFont(m_Font);
+#endif
+     m_StatusWindow = m_Osd->Create(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSHEIGHT, 4);
+     m_InfoWindow   = m_Osd->Create(0, OSDINFOWIN_Y(0),   OSDWIDTH, OSDINFOHEIGHT,   2);
+     m_Osd->Clear();
+     m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, m_InfoWindow);
+#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+     m_Osd->SetFont(OldFont);
+#endif
     m_Osd->Flush();
     if (m_Receiver)
        delete m_Receiver;
@@ -724,9 +741,8 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
 eOSState cFemonOsd::ProcessKey(eKeys Key)
 { 
  eOSState state = cOsdObject::ProcessKey(Key);
-
  if (state == osUnknown) {
-     switch (Key & ~k_Repeat) {
+     switch (Key) {
       case k0:
            if ((m_Number == 0) && (m_OldNumber != 0)) {
               m_Number = m_OldNumber;
@@ -765,6 +781,49 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
            break;
       case kBack:
            return osEnd;
+       case kGreen:
+            {
+            int CurrentAudioTrack = -1;
+            const char **AudioTracks = cDevice::PrimaryDevice()->GetAudioTracks(&CurrentAudioTrack);
+            if (AudioTracks) {
+               const char **at = &AudioTracks[CurrentAudioTrack];
+               if (!*++at)
+                  at = AudioTracks;
+               cDevice::PrimaryDevice()->SetAudioTrack(at - AudioTracks);
+               if (femonConfig.analyzestream) {
+                  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+                  if (m_Receiver)
+                     delete m_Receiver;
+                  m_Receiver = new cFemonReceiver(channel->Ca(), channel->Vpid(), (at - AudioTracks) ? channel->Apid2() : channel->Apid1(), channel->Dpid1());
+                  cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+                  }
+               }
+            }
+            break;
+       case kRight:
+       case kLeft:
+            {
+            int device = cDevice::ActualDevice()->DeviceNumber();
+            if (device >= 0) {
+               cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+               for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
+                   if (NORMALKEY(Key) == kRight) {
+                      if (++device >= cDevice::NumDevices()) device = 0;
+                      }
+                   else {
+                      if (--device < 0) device = cDevice::NumDevices() - 1;
+                      }
+                   if (cDevice::GetDevice(device)->ProvidesChannel(channel)) {
+                      //cStatus::MsgChannelSwitch(cDevice::GetDevice(device), 0);
+                      //implement some tuning mechanism here
+                      //cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apid1(), channel->Apid2(), channel->Dpid1(), channel->Dpid2($
+                      //cStatus::MsgChannelSwitch(cDevice::GetDevice(device), channel->Number());
+                      break;
+                      }
+                   }
+               }
+            }
+            break;
       case kUp|k_Repeat:
       case kUp:
       case kDown|k_Repeat:
--- a/femonosd.h
+++ b/femonosd.h
@@ -16,11 +16,14 @@
 #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;
-  cOsd *m_Osd;
+  cOsdBase *m_Osd;
+  tWindowHandle m_InfoWindow;
+  tWindowHandle m_StatusWindow;
  cFemonReceiver *m_Receiver;
  int m_Frontend;
  struct dvb_frontend_info m_FrontendInfo;
@@ -33,9 +36,8 @@ private:
  uint32_t m_UNC;
  fe_status_t m_FrontendStatus;
  int m_DisplayMode;
-  const cFont *m_Font;
+  eDvbFont m_Font;
  cMutex* m_Mutex;
-  static cBitmap bmDD, bmDD20, bmDD51, bmPAL, bmNTSC, bmAspectRatio_1_1, bmAspectRatio_16_9, bmAspectRatio_2_21_1, bmAspectRatio_4_3;
  void DrawStatusWindow(void);
  void DrawInfoWindow(void);

--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -17,7 +17,11 @@
 #define PTS_DTS_FLAGS 0xC0

 cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid)
+#if VDRVERSNUM >= 10300
 :cReceiver(Ca, -1, 3, Vpid, Apid, Dpid), cThread("femon receiver")
+#else
+:cReceiver(Ca, -1, 3, Vpid, Apid, Dpid)
+#endif
 {
  //printf("cFemonReceiver::cFemonReceiver()\n");
  m_Active = false;
@@ -302,6 +306,9 @@ void cFemonReceiver::Receive(uchar *Data, int Length)
 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) {
        // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
@@ -313,4 +320,7 @@ void cFemonReceiver::Action(void)
        m_AC3PacketCount = 0;
        usleep(100000L * femonConfig.calcinterval);
    }
+#if (VDRVERSNUM < 10300)
+  isyslog("femon receiver: thread stopped (pid = %d)", getpid());
+#endif
 }
--- a/symbols/ar11.xpm
+++ b/symbols/ar11.xpm
@@ -1,23 +0,0 @@
-/* XPM */
-static char * ar11_xpm[] = {
-"21 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-".....................",
-".....................",
-"....++...........++..",
-"...+++..........+++..",
-"..++++....++...++++..",
-"..++++...++++..++++..",
-"....++...++++....++..",
-"....++....++.....++..",
-"....++...........++..",
-"....++...........++..",
-"....++....++.....++..",
-"....++...++++....++..",
-"....++...++++....++..",
-"....++....++.....++..",
-"....++...........++..",
-"....++...........++..",
-".....................",
-"....................."};
--- a/symbols/ar169.xpm
+++ b/symbols/ar169.xpm
@@ -1,23 +0,0 @@
-/* XPM */
-static char * ar169_xpm[] = {
-"36 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"....................................",
-"....................................",
-"....++....+++++............+++++....",
-"...+++...+++++++..........+++++++...",
-"..++++..+++...+++...++...+++...+++..",
-"..++++..++.....++..++++..++.....++..",
-"....++..++.........++++..++.....++..",
-"....++..++..........++...+++...+++..",
-"....++..++.++++...........++++++++..",
-"....++..++++++++...........+++++++..",
-"....++..+++...+++...++..........++..",
-"....++..++.....++..++++.........++..",
-"....++..++.....++..++++..++.....++..",
-"....++..+++...+++...++...+++...+++..",
-"....++...+++++++..........+++++++...",
-"....++....+++++............+++++....",
-"....................................",
-"...................................."};
--- a/symbols/ar2211.xpm
+++ b/symbols/ar2211.xpm
@@ -1,23 +0,0 @@
-/* XPM */
-static char * ar2211_xpm[] = {
-"43 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"...........................................",
-"...........................................",
-"....++++........++++......++...........++..",
-"...++++++......++++++....+++..........+++..",
-"..+++..+++....+++..+++..++++....++...++++..",
-"..++....++....++....++..++++...++++..++++..",
-"..++....++....++....++....++...++++....++..",
-".......+++.........+++....++....++.....++..",
-"......+++.........+++.....++...........++..",
-".....+++.........+++......++...........++..",
-"....+++.........+++.......++....++.....++..",
-"...+++.........+++........++...++++....++..",
-"..+++.........+++.........++...++++....++..",
-"..++....++.++.++....++....++....++.....++..",
-"..++++++++.++.++++++++....++...........++..",
-"..++++++++.++.++++++++....++...........++..",
-"...........................................",
-"..........................................."};
--- a/symbols/ar43.xpm
+++ b/symbols/ar43.xpm
@@ -1,23 +0,0 @@
-/* XPM */
-static char * ar43_xpm[] = {
-"32 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"................................",
-"................................",
-"....++..++............++++++....",
-"....++..++...........++++++++...",
-"...+++..++.....++...+++....+++..",
-"...++...++....++++..++......++..",
-"...++...++....++++..++......++..",
-"..+++...++.....++..........+++..",
-"..++....++..............+++++...",
-"..++....++..............+++++...",
-"..++++++++++...++..........+++..",
-"..++++++++++..++++..++......++..",
-"........++....++++..++......++..",
-"........++.....++...+++....+++..",
-"........++...........++++++++...",
-"........++............++++++....",
-"................................",
-"................................"};
--- a/symbols/dolbydigital.xpm
+++ b/symbols/dolbydigital.xpm
@@ -1,23 +0,0 @@
-/* XPM */
-static char * dolbydigital_xpm[] = {
-"27 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"...........................",
-"...........................",
-"..+++++++++++.+++++++++++..",
-"..++.++++++++.++++++++.++..",
-"..++...++++++.++++++...++..",
-"..++.....++++.++++.....++..",
-"..++......+++.+++......++..",
-"..++.......++.++.......++..",
-"..++.......++.++.......++..",
-"..++.......++.++.......++..",
-"..++.......++.++.......++..",
-"..++......+++.+++......++..",
-"..++.....++++.++++.....++..",
-"..++...++++++.++++++...++..",
-"..++.++++++++.++++++++.++..",
-"..+++++++++++.+++++++++++..",
-"...........................",
-"..........................."};
--- a/symbols/dolbydigital20.xpm
+++ b/symbols/dolbydigital20.xpm
@@ -1,23 +0,0 @@
-/* XPM */
-static char * dolbydigital20_xpm[] = {
-"49 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-".................................................",
-".................................................",
-"..+++++++++++.+++++++++++....++++.......++++++...",
-"..++.++++++++.++++++++.++...++++++.....++++++++..",
-"..++...++++++.++++++...++..+++..+++....+++..+++..",
-"..++.....++++.++++.....++..++....++....++....++..",
-"..++......+++.+++......++..++....++....++....++..",
-"..++.......++.++.......++.......+++....++....++..",
-"..++.......++.++.......++......+++.....++....++..",
-"..++.......++.++.......++.....+++......++....++..",
-"..++.......++.++.......++....+++.......++....++..",
-"..++......+++.+++......++...+++........++....++..",
-"..++.....++++.++++.....++..+++.........++....++..",
-"..++...++++++.++++++...++..++....++.++.+++..+++..",
-"..++.++++++++.++++++++.++..++++++++.++.++++++++..",
-"..+++++++++++.+++++++++++..++++++++.++..++++++...",
-".................................................",
-"................................................."};
--- a/symbols/dolbydigital51.xpm
+++ b/symbols/dolbydigital51.xpm
@@ -1,23 +0,0 @@
-/* XPM */
-static char * dolbydigital51_xpm[] = {
-"44 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"............................................",
-"............................................",
-"..+++++++++++.+++++++++++..++++++++.....++..",
-"..++.++++++++.++++++++.++..++++++++....+++..",
-"..++...++++++.++++++...++..++.........++++..",
-"..++.....++++.++++.....++..++.........++++..",
-"..++......+++.+++......++..++...........++..",
-"..++.......++.++.......++..++++++.......++..",
-"..++.......++.++.......++..+++++++......++..",
-"..++.......++.++.......++.......+++.....++..",
-"..++.......++.++.......++........++.....++..",
-"..++......+++.+++......++..++....++.....++..",
-"..++.....++++.++++.....++..++....++.....++..",
-"..++...++++++.++++++...++..+++..+++.++..++..",
-"..++.++++++++.++++++++.++...++++++..++..++..",
-"..+++++++++++.+++++++++++....++++...++..++..",
-"............................................",
-"............................................"};
--- a/symbols/ntsc.xpm
+++ b/symbols/ntsc.xpm
@@ -1,23 +0,0 @@
-/* XPM */
-static char * ntsc_xpm[] = {
-"38 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"......................................",
-"......................................",
-"..++....++.++++++++..+++++....+++++...",
-"..++....++.++++++++.+++++++..+++++++..",
-"..+++...++....++....++...++..++...++..",
-"..+++...++....++....++...++..++...++..",
-"..++++..++....++....++.......++.......",
-"..++++..++....++....++++.....++.......",
-"..++.++.++....++.....+++++...++.......",
-"..++.++.++....++.......++++..++.......",
-"..++..++++....++.........++..++.......",
-"..++..++++....++....++...++..++...++..",
-"..++...+++....++....++...++..++...++..",
-"..++...+++....++....++...++..++...++..",
-"..++....++....++....+++++++..+++++++..",
-"..++....++....++.....+++++....+++++...",
-"......................................",
-"......................................"};
--- a/symbols/pal.xpm
+++ b/symbols/pal.xpm
@@ -1,23 +0,0 @@
-/* XPM */
-static char * pal_xpm[] = {
-"30 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"..............................",
-"..............................",
-"..+++++++....+++++...++.......",
-"..+++..+++..+++++++..++.......",
-"..++....++..++...++..++.......",
-"..++....++.+++...+++.++.......",
-"..++....++.++.....++.++.......",
-"..++....++.++.....++.++.......",
-"..++....++.++.....++.++.......",
-"..+++..+++.+++++++++.++.......",
-"..+++++++..+++++++++.++.......",
-"..++.......++.....++.++.......",
-"..++.......++.....++.++.......",
-"..++.......++.....++.++.......",
-"..++.......++.....++.+++++++..",
-"..++.......++.....++.+++++++..",
-"..............................",
-".............................."};
Author	SHA1	Message	Date
Rolf Ahrenberg	22802773b8	Backported changes and fixes from version 0.1.6.	2004-09-11 04:20:00 +03:00
Rolf Ahrenberg	ca717b0425	Backported the "AC3 Stream Information" feature from version 0.1.3.	2004-06-11 04:20:00 +03:00
Rolf Ahrenberg	9ce3009e39	Backported changes and fixes from version 0.1.2.	2004-06-06 04:20:00 +03:00
Rolf Ahrenberg	b08205607c	Backported "stream information" feature (from version 0.1.1).	2004-05-31 04:20:00 +03:00