Updated for vdr-1.3.17.

Fixed receiver related crash (Thanks to Marco Schluessler).

HISTORY

@@ -106,3 +106,8 @@ VDR Plugin 'femon' Revision History
 
 - Yet Another Minor Release.
 - Integrated the CA system names patch: "Setup / Show CA System".
+
+2004-11-28: Version 0.1.7
+
+- Updated for vdr-1.3.17.
+- Fixed receiver related crash (Thanks to Marco Schluessler).

Makefile

@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -fPIC
 
 ### The directory environment:
 

femon.c

@@ -12,7 +12,7 @@
 #include "femonosd.h"
 #include "femon.h"
 
-#if VDRVERSNUM && VDRVERSNUM >= 10307
+#if VDRVERSNUM && VDRVERSNUM < 10317
 #error "You don't exist! Go away!"
 #endif
 

femon.h

@@ -11,7 +11,7 @@
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.7";
+static const char *VERSION        = "0.1.7";
 static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
 static const char *MAINMENUENTRY  = "Signal Information";
 

femoni18n.h

@@ -9,7 +9,6 @@
 #ifndef __FEMONI18N_H
 #define __FEMONI18N_H
 
-#include <vdr/config.h> // for VDRVERSNUM
 #include <vdr/i18n.h>
 
 extern const tI18nPhrase Phrases[];

femonosd.c

@@ -12,39 +12,62 @@
 #include "femonreceiver.h"
 #include "femonosd.h"
 
-#if (VDRVERSNUM < 10300) && !defined(ELCHIAIOVERSION)
+#include "symbols/dev0.xpm"
-#warning You should consider using the small fonts!
+#include "symbols/dev1.xpm"
-#endif
+#include "symbols/dev2.xpm"
+#include "symbols/dev3.xpm"
+#include "symbols/apid1.xpm"
+#include "symbols/apid2.xpm"
+#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"
 
 #define FRONTEND_DEVICE          "/dev/dvb/adapter%d/frontend%d"
 #define CHANNELINPUT_TIMEOUT     1000
 
 #ifdef NTSC_SYSTEM
-#define SCREENHEIGHT             480 // in pixels
 #define OSDHEIGHT                420 // in pixels
 #else
-#define SCREENHEIGHT             576 // in pixels
 #define OSDHEIGHT                480 // in pixels
 #endif
-#define SCREENWIDTH              720 // in pixels
 #define OSDWIDTH                 600 // in pixels
-#define OSDINFOHEIGHT            ((cOsd::LineHeight() - 2) * 11) // in pixels (11 rows)
+#define OSDINFOHEIGHT            (m_Font->Height() * 11) // in pixels (11 rows)
-#define OSDSTATUSHEIGHT          ((cOsd::LineHeight() - 2) * 6)  // in pixels (6 rows)
+#define OSDSTATUSHEIGHT          (m_Font->Height() * 6)  // in pixels (6 rows)
 
 #define OSDINFOWIN_Y(offset)     (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
 #define OSDINFOWIN_X(col)        ((col == 4) ? 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) * OSDWIDTH / 5) + ((OSDWIDTH / 5 - cOsd::WidthInCells(txt) * cOsd::CellWidth()) / 2))
+#define OSDSTATUSWIN_XC(col,txt) (((col - 1) * OSDWIDTH / 5) + ((OSDWIDTH / 5 - m_Font->Width(txt)) / 2))
 #define BARWIDTH(x)              (OSDWIDTH * x / 100)
-#define DELTA                    2
+#define SPACING                  5
+
+#define clrBackground            clrGray50 // this should be tied somehow into current theme
+
+cBitmap cFemonOsd::bmDevice0(dev0_xpm);
+cBitmap cFemonOsd::bmDevice1(dev1_xpm);
+cBitmap cFemonOsd::bmDevice2(dev2_xpm);
+cBitmap cFemonOsd::bmDevice3(dev3_xpm);
+cBitmap cFemonOsd::bmApid1(apid1_xpm);
+cBitmap cFemonOsd::bmApid2(apid2_xpm);
+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);
 
 cFemonOsd::cFemonOsd(void)
-#if VDRVERSNUM >= 10300
 :cOsdObject(true), cThread("femon osd")
-#else
-:cOsdObject(true)
-#endif
 {
   //printf("cFemonOsd::cFemonOsd()\n");
   m_Osd = NULL;
@@ -59,12 +82,15 @@ cFemonOsd::cFemonOsd(void)
   m_BER = 0;
   m_UNC = 0;
   m_DisplayMode = femonConfig.displaymode;
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
-  m_Font = fontSml;
-#else
-  m_Font = fontOsd;
-#endif
   m_Mutex = new cMutex();
+  if (Setup.UseSmallFont == 0) {
+     // Dirty hack to force the small fonts...
+     Setup.UseSmallFont = 1;
+     m_Font = cFont::GetFont(fontSml);
+     Setup.UseSmallFont = 0;
+     }
+  else
+     m_Font = cFont::GetFont(fontSml);
 }
 
 cFemonOsd::~cFemonOsd(void)
@@ -88,75 +114,172 @@ void cFemonOsd::DrawStatusWindow(void)
   int snr = m_SNR / 655;
   int signal = m_Signal / 655;
   int offset = 0;
+  int x = OSDWIDTH;
+  int y = 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(m_Font);
+     snprintf(buf, sizeof(buf), "%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->ShortName(true));
-#endif
+     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+m_Font->Height()-1), clrWhite);
-     m_Osd->Fill(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrBackground, 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 : channel->Number(), m_Number ? "-" : "", channel->Name());
+     if (m_Receiver) {
-     m_Osd->Fill(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_StatusWindow);
+        int value = cDevice::ActualDevice()->CardIndex();
-     m_Osd->Text(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrBlack, clrWhite, m_StatusWindow);
+        if (value == 0) {
-     offset += cOsd::LineHeight();
+           x -= bmDevice0.Width() + SPACING;
+           y = (m_Font->Height() - bmDevice0.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice0, clrBlack, clrWhite);
+           }
+        else if (value == 1) {
+           x -= bmDevice1.Width() + SPACING;
+           y = (m_Font->Height() - bmDevice1.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice1, clrBlack, clrWhite);
+           }
+        else if (value == 2) {
+           x -= bmDevice2.Width() + SPACING;
+           y = (m_Font->Height() - bmDevice2.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice2, clrBlack, clrWhite);
+           }
+        else if (value == 3) {
+           x -= bmDevice3.Width() + SPACING;
+           y = (m_Font->Height() - bmDevice3.Height()) / 2;
+           if (y < 0) y = 0;
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice3, clrBlack, clrWhite);
+           }
+        value = -1;
+        const char **AudioTracks = cDevice::PrimaryDevice()->GetAudioTracks(&value);
+        if (AudioTracks) {
+           if (value == 0) {
+              x -= bmApid1.Width() + SPACING;
+              y = (m_Font->Height() - bmApid1.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmApid1, clrBlack, clrWhite);
+              }
+           else if (value == 1) {
+              x -= bmApid2.Width() + SPACING;
+              y = (m_Font->Height() - bmApid2.Height()) / 2;
+              if (y < 0) y = 0;
+              m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmApid2, clrBlack, clrWhite);
+              }
+           }
+        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();
      if (signal > 0) {
         signal = BARWIDTH(signal);
-        m_Osd->Fill(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), signal), OSDSTATUSWIN_Y(offset+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 > BARWIDTH(femonConfig.redlimit)) {
-           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);
+           m_Osd->DrawRectangle(BARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min((OSDWIDTH * femonConfig.greenlimit / 100), signal), OSDSTATUSWIN_Y(offset+m_Font->Height()-3), clrYellow);
            }
         if (signal > BARWIDTH(femonConfig.greenlimit)) {
-           m_Osd->Fill(BARWIDTH(femonConfig.greenlimit), OSDSTATUSWIN_Y(offset+3), signal, OSDSTATUSWIN_Y(offset+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);
            }
         }
-     offset += cOsd::LineHeight() - DELTA;
+     offset += m_Font->Height();
      if (snr > 0) {
         snr = BARWIDTH(snr);
-        m_Osd->Fill(0, OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.redlimit), snr), OSDSTATUSWIN_Y(offset+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 > BARWIDTH(femonConfig.redlimit)) {
-           m_Osd->Fill(BARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min(BARWIDTH(femonConfig.greenlimit), snr), OSDSTATUSWIN_Y(offset+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 > BARWIDTH(femonConfig.greenlimit)) {
-           m_Osd->Fill(BARWIDTH(femonConfig.greenlimit),  OSDSTATUSWIN_Y(offset+3), snr, OSDSTATUSWIN_Y(offset+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);
            }
         }
-     offset += cOsd::LineHeight() - DELTA;
+     offset += m_Font->Height();
-     m_Osd->Text(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "STR:", clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "STR:", clrWhite, clrBackground, m_Font);
      snprintf(buf, sizeof(buf), "%04x", m_Signal);
-     m_Osd->Text(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     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(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     m_Osd->Text(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "BER:", clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "BER:", clrWhite, clrBackground, m_Font);
      snprintf(buf, sizeof(buf), "%08x", m_BER);
-     m_Osd->Text(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
      snprintf(buf, sizeof(buf), "%s:", tr("Video"));
-     m_Osd->Text(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
      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->Text(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     offset += cOsd::LineHeight() - DELTA;
+     offset += m_Font->Height();
-     m_Osd->Text(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "SNR:", clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "SNR:", clrWhite, clrBackground, m_Font);
      snprintf(buf, sizeof(buf), "%04x", m_SNR);
-     m_Osd->Text(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     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(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     m_Osd->Text(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "UNC:", clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "UNC:", clrWhite, clrBackground, m_Font);
      snprintf(buf, sizeof(buf), "%08x", m_UNC);
-     m_Osd->Text(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
      snprintf(buf, sizeof(buf), "%s:", (m_Receiver && m_Receiver->AC3Valid()) ? tr("AC-3") : tr("Audio"));
-     m_Osd->Text(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
      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->Text(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), buf, clrWhite, clrBackground, m_Font);
-     offset += cOsd::LineHeight() - DELTA;
+     offset += m_Font->Height();
-     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->DrawText(OSDSTATUSWIN_XC(1,tr("LOCK")),    OSDSTATUSWIN_Y(offset), tr("LOCK"),   (m_FrontendStatus & FE_HAS_LOCK)   ? clrYellow : clrBlack, clrBackground, m_Font);
-     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->DrawText(OSDSTATUSWIN_XC(2,tr("SIGNAL")),  OSDSTATUSWIN_Y(offset), tr("SIGNAL"), (m_FrontendStatus & FE_HAS_SIGNAL) ? clrYellow : clrBlack, clrBackground, m_Font);
-     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->DrawText(OSDSTATUSWIN_XC(3,tr("CARRIER")), OSDSTATUSWIN_Y(offset), tr("CARRIER"),(m_FrontendStatus & FE_HAS_CARRIER)? clrYellow : clrBlack, clrBackground, m_Font);
-     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->DrawText(OSDSTATUSWIN_XC(4,tr("VITERBI")), OSDSTATUSWIN_Y(offset), tr("VITERBI"),(m_FrontendStatus & FE_HAS_VITERBI)? clrYellow : clrBlack, clrBackground, m_Font);
-     m_Osd->Text(OSDSTATUSWIN_XC(5,tr("SYNC")),    OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_XC(5,tr("SYNC")),    OSDSTATUSWIN_Y(offset), tr("SYNC"),   (m_FrontendStatus & FE_HAS_SYNC)   ? clrYellow : clrBlack, clrBackground, m_Font);
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
-     m_Osd->SetFont(OldFont);
-#endif
      m_Osd->Flush();
      }
 }
@@ -173,33 +296,30 @@ 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->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground, m_InfoWindow);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground);
-        m_Osd->Fill(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_InfoWindow);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite);
-        m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), clrBackground, clrWhite, m_InfoWindow);
+        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), clrBackground, clrWhite, m_Font);
-        offset += cOsd::LineHeight();
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Vpid"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Vpid"), clrWhite, clrBackground, m_Font);
         snprintf(buf, sizeof(buf), "%d", channel->Vpid());
-        m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Ppid"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Ppid"), clrWhite, clrBackground, m_Font);
         snprintf(buf, sizeof(buf), "%d", channel->Ppid());
-        m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid1"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid1"), clrWhite, clrBackground, m_Font);
         value = channel->Apid2();
         if (value) snprintf(buf, sizeof(buf), "%d, %d", channel->Apid1(), value);
         else       snprintf(buf, sizeof(buf), "%d", channel->Apid1());
-        m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid1"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid1"), clrWhite, clrBackground, m_Font);
         value = channel->Dpid2();
         if (value) snprintf(buf, sizeof(buf), "%d, %d", channel->Dpid1(), value);
         else       snprintf(buf, sizeof(buf), "%d", channel->Dpid1());
-        m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("CA"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("CA"), clrWhite, clrBackground, m_Font);
         value = channel->Ca();
         if (femonConfig.showcasystem) {
            /* http://www.dvb.org/index.php?id=174 */
@@ -263,56 +383,59 @@ void cFemonOsd::DrawInfoWindow(void)
            }
         else {
            snprintf(buf, sizeof(buf), "%X", value);
+           value = 1;
+           while (channel->Ca(value) && (value < MAXCAIDS)) {
+             snprintf(buf2, sizeof(buf2), ", %X", channel->Ca(value++));
+             strncat(buf, buf2, sizeof(buf));
+             }
            }
-        m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Tpid"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Tpid"), clrWhite, clrBackground, m_Font);
         snprintf(buf, sizeof(buf), "%d", channel->Tpid());
-        m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sid"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sid"), clrWhite, clrBackground, m_Font);
         snprintf(buf, sizeof(buf), "%d", channel->Sid());
-        m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-#if (VDRVERSNUM >= 10300)
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Nid"), clrWhite, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Nid"), clrWhite, clrBackground, m_InfoWindow);
         snprintf(buf, sizeof(buf), "%d", channel->Nid());
-        m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Tid"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Tid"), clrWhite, clrBackground, m_Font);
         snprintf(buf, sizeof(buf), "%d", channel->Tid());
-        m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Rid"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Rid"), clrWhite, clrBackground, m_Font);
         snprintf(buf, sizeof(buf), "%d", channel->Rid());
-        m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-#endif
+        offset += m_Font->Height();
-        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->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               offset += cOsd::LineHeight() - DELTA;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font);
                value = channel->Frequency();
                while (value > 20000) value /= 1000;
                snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
-               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_Font);
                snprintf(buf, sizeof(buf), "%s", cSource::ToString(channel->Source()));
-               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               offset += cOsd::LineHeight() - DELTA;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_Font);
                snprintf(buf, sizeof(buf), "%d", channel->Srate());
-               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Polarization"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Polarization"), clrWhite, clrBackground, m_Font);
                snprintf(buf, sizeof(buf), "%c", toupper(channel->Polarization()));
-               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               offset += cOsd::LineHeight() - DELTA;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_Font);
                value = channel->Inversion();
                if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off"));
                else if (value == INVERSION_ON)    snprintf(buf, sizeof(buf), tr("On"));
                else            /*INVERSION_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_Font);
                value = channel->CoderateH();
                if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), tr("None"));
                else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2");
@@ -324,26 +447,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->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               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(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               offset += cOsd::LineHeight() - DELTA;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font);
                value = channel->Frequency();
                while (value > 20000) value /= 1000;
                snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
-               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Source"), clrWhite, clrBackground, m_Font);
                snprintf(buf, sizeof(buf), "%s", cSource::ToString(channel->Source()));
-               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               offset += cOsd::LineHeight() - DELTA;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Srate"), clrWhite, clrBackground, m_Font);
                snprintf(buf, sizeof(buf), "%d", channel->Srate());
-               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_Font);
                value = channel->Modulation();
                if      (value == QPSK)      snprintf(buf, sizeof(buf), "QPSK");
                else if (value == QAM_16)    snprintf(buf, sizeof(buf), "QAM 16");
@@ -352,15 +475,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->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               offset += cOsd::LineHeight() - DELTA;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_Font);
                value = channel->Inversion();
                if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off"));
                else if (value == INVERSION_ON)    snprintf(buf, sizeof(buf), tr("On"));
                else            /*INVERSION_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_Font);
                value = channel->CoderateH();
                if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), tr("None"));
                else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2");
@@ -372,33 +495,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->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               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(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               offset += cOsd::LineHeight() - DELTA;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), clrWhite, clrBackground, m_Font);
                value = channel->Frequency();
                while (value > 20000) value /= 1000;
                snprintf(buf, sizeof(buf), "%d %s", value, tr("MHz"));
-               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Transmission"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Transmission"), clrWhite, clrBackground, m_Font);
                value = channel->Transmission();
                if      (value == TRANSMISSION_MODE_2K)    snprintf(buf, sizeof(buf), "2K");
                else if (value == TRANSMISSION_MODE_8K)    snprintf(buf, sizeof(buf), "8K");
                else            /*TRANSMISSION_MODE_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               offset += cOsd::LineHeight() - DELTA;
+               offset += m_Font->Height();
-               m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bandwidth"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bandwidth"), clrWhite, clrBackground, m_Font);
                value = channel->Bandwidth();
                if      (value == BANDWIDTH_8_MHZ) snprintf(buf, sizeof(buf), "8 %s", tr("MHz"));
                else if (value == BANDWIDTH_7_MHZ) snprintf(buf, sizeof(buf), "7 %s", tr("MHz"));
                else if (value == BANDWIDTH_6_MHZ) snprintf(buf, sizeof(buf), "6 %s", tr("MHz"));
                else            /*BANDWIDTH_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), clrWhite, clrBackground, m_Font);
                value = channel->Modulation();
                if      (value == QPSK)      snprintf(buf, sizeof(buf), "QPSK");
                else if (value == QAM_16)    snprintf(buf, sizeof(buf), "QAM 16");
@@ -407,15 +530,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->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               offset += cOsd::LineHeight() - DELTA;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Inversion"), clrWhite, clrBackground, m_Font);
                value = channel->Inversion();
                if      (value == INVERSION_OFF)   snprintf(buf, sizeof(buf), tr("Off"));
                else if (value == INVERSION_ON)    snprintf(buf, sizeof(buf), tr("On"));
                else            /*INVERSION_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("CoderateH"), clrWhite, clrBackground, m_Font);
                value = channel->CoderateH();
                if      (value == FEC_NONE)  snprintf(buf, sizeof(buf), tr("None"));
                else if (value == FEC_1_2)   snprintf(buf, sizeof(buf), "1/2");
@@ -439,42 +562,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->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               offset += cOsd::LineHeight() - DELTA;
+               offset += m_Font->Height();
-               m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Hierarchy"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Hierarchy"), clrWhite, clrBackground, m_Font);
                value = channel->Hierarchy();
                if      (value == HIERARCHY_NONE)  snprintf(buf, sizeof(buf), tr("None"));
                else if (value == HIERARCHY_1)     snprintf(buf, sizeof(buf), "1");
                else if (value == HIERARCHY_2)     snprintf(buf, sizeof(buf), "2");
                else if (value == HIERARCHY_4)     snprintf(buf, sizeof(buf), "4");
                else            /*HIERARCHY_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               m_Osd->Text(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-               m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Guard"), clrWhite, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Guard"), clrWhite, clrBackground, m_Font);
                value = channel->Guard();
                if      (value == GUARD_INTERVAL_1_32)  snprintf(buf, sizeof(buf), "1/32");
                else if (value == GUARD_INTERVAL_1_16)  snprintf(buf, sizeof(buf), "1/16");
                else if (value == GUARD_INTERVAL_1_8)   snprintf(buf, sizeof(buf), "1/8");
                else if (value == GUARD_INTERVAL_1_4)   snprintf(buf, sizeof(buf), "1/4");
                else            /*GUARD_INTERVAL_AUTO*/ snprintf(buf, sizeof(buf), tr("Auto"));
-               m_Osd->Text(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
                break;
           }
         }
      else if (m_DisplayMode == modeStream) {
-        m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground, m_InfoWindow);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground);
-        m_Osd->Fill(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_InfoWindow);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite);
-        m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Stream Information"), clrBackground, clrWhite, m_InfoWindow);
+        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Stream Information"), clrBackground, clrWhite, m_Font);
-        offset += cOsd::LineHeight();
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Stream"), clrYellow, clrBackground, m_InfoWindow);
+        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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_InfoWindow);
+        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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Aspect Ratio"), clrWhite, clrBackground, m_InfoWindow);
+        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 == AR_1_1)    snprintf(buf, sizeof(buf), "1:1");
@@ -484,14 +607,14 @@ void cFemonOsd::DrawInfoWindow(void)
            else                         snprintf(buf, sizeof(buf), "%s", tr("reserved"));
            }
         else                            snprintf(buf, sizeof(buf), "---");
-        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Rate"), clrWhite, clrBackground, m_InfoWindow);
+        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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Format"), clrWhite, clrBackground, m_InfoWindow);
+        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 == VF_PAL)  snprintf(buf, sizeof(buf), "%s", tr("PAL"));
@@ -499,20 +622,20 @@ void cFemonOsd::DrawInfoWindow(void)
            else                       snprintf(buf, sizeof(buf), "%s", tr("unknown"));
            }
         else                          snprintf(buf, sizeof(buf), "---");
-        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Resolution"), clrWhite, clrBackground, m_InfoWindow);
+        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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Stream"), clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Stream"), clrYellow, clrBackground, m_Font);
         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);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
         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"));
@@ -520,43 +643,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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("MPEG Layer"), clrWhite, clrBackground, m_InfoWindow);
+        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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_InfoWindow);
+        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 == 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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-        offset += cOsd::LineHeight() - DELTA;
+        offset += m_Font->Height();
         }
      else if (m_DisplayMode == modeAC3) {
-        m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground, m_InfoWindow);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrBackground);
-        m_Osd->Fill(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_InfoWindow);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+m_Font->Height()-1), clrWhite);
         snprintf(buf, sizeof(buf), "%s - %s #%d", tr("Stream Information"), tr("AC-3 Stream"), channel->Dpid1());
-        m_Osd->Text( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrBackground, clrWhite, m_InfoWindow);
+        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, clrBackground, clrWhite, m_Font);
-        offset += cOsd::LineHeight();
+        offset += m_Font->Height();
         if (m_Receiver && m_Receiver->AC3Valid()) {
-           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
            snprintf(buf, sizeof(buf), "%.0f %s (%0.f %s)", m_Receiver->AC3StreamBitrate(), tr("kbit/s"), m_Receiver->AC3Bitrate(), tr("kbit/s"));
-           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-           offset += cOsd::LineHeight() - DELTA;
+           offset += m_Font->Height();
-           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), clrWhite, clrBackground, m_Font);
            snprintf(buf, sizeof(buf), "%.1f %s", m_Receiver->AC3SamplingFreq() / 1000., tr("kHz"));
-           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-           offset += cOsd::LineHeight() - DELTA;
+           offset += m_Font->Height();
-           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Size"), clrWhite, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Size"), clrWhite, clrBackground, m_Font);
            snprintf(buf, sizeof(buf), "%d", m_Receiver->AC3FrameSize());
-           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-           offset += cOsd::LineHeight() - DELTA;
+           offset += m_Font->Height();
-           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bit Stream Mode"), clrWhite, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bit Stream Mode"), clrWhite, clrBackground, m_Font);
            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;
@@ -568,9 +691,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->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-           offset += cOsd::LineHeight() - DELTA;
+           offset += m_Font->Height();
-           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Coding Mode"), clrWhite, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Coding Mode"), clrWhite, clrBackground, m_Font);
            if (m_Receiver->AC3BitStreamMode() != 7) {
               switch (m_Receiver->AC3AudioCodingMode()) {
                 case 0:  snprintf(buf, sizeof(buf), "1+1 - %s, %s",             tr("Ch1"), tr("Ch2"));                           break;
@@ -585,9 +708,9 @@ void cFemonOsd::DrawInfoWindow(void)
                 }
              }
 	   else snprintf(buf, sizeof(buf), "---");
-           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-           offset += cOsd::LineHeight() - DELTA;
+           offset += m_Font->Height();
-           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Center Mix Level"), clrWhite, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Center Mix Level"), clrWhite, clrBackground, m_Font);
            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;
@@ -595,9 +718,9 @@ void cFemonOsd::DrawInfoWindow(void)
              case CML_RESERVED:    snprintf(buf, sizeof(buf), "%s", tr("reserved")); break;
              default:              snprintf(buf, sizeof(buf), "---");
              }
-           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-           offset += cOsd::LineHeight() - DELTA;
+           offset += m_Font->Height();
-           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Surround Mix Level"), clrWhite, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Surround Mix Level"), clrWhite, clrBackground, m_Font);
            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;
@@ -605,48 +728,44 @@ void cFemonOsd::DrawInfoWindow(void)
              case SML_RESERVED:  snprintf(buf, sizeof(buf), "%s", tr("reserved")); break;
              default:            snprintf(buf, sizeof(buf), "---");
              }
-           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-           offset += cOsd::LineHeight() - DELTA;
+           offset += m_Font->Height();
-           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dolby Surround Mode"), clrWhite, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dolby Surround Mode"), clrWhite, clrBackground, m_Font);
            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("Off"));           break;
+             case DSM_NOT_DOLBYSURROUND: snprintf(buf, sizeof(buf), "%s", tr("no"));            break;
-             case DSM_DOLBYSURROUND:     snprintf(buf, sizeof(buf), "%s", tr("On"));            break;
+             case DSM_DOLBYSURROUND:     snprintf(buf, sizeof(buf), "%s", tr("yes"));           break;
              case DSM_RESERVED:          snprintf(buf, sizeof(buf), "%s", tr("reserved"));      break;
              default:                    snprintf(buf, sizeof(buf), "---");
              }
-           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-           offset += cOsd::LineHeight() - DELTA;
+           offset += m_Font->Height();
-           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Low Frequency Effects"), clrWhite, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Low Frequency Effects"), clrWhite, clrBackground, m_Font);
            snprintf(buf, sizeof(buf), "%s", m_Receiver->AC3LfeOn() ? tr("On") : tr("Off"));
-           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-           offset += cOsd::LineHeight() - DELTA;
+           offset += m_Font->Height();
-           m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dialogue Normalization"), clrWhite, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dialogue Normalization"), clrWhite, clrBackground, m_Font);
            value = m_Receiver->AC3DialogLevel();
            if (value > 0) snprintf(buf, sizeof(buf), "-%d %s", value, tr("dB"));
            else           snprintf(buf, sizeof(buf), "---");
-           m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
-           offset += cOsd::LineHeight() - DELTA;
+           offset += m_Font->Height();
            }
         }
      else /* modeBasic */ {
-        m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, m_InfoWindow);
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
         }
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
-     m_Osd->SetFont(OldFont);
-#endif
      m_Osd->Flush();
      }
 }
 
 void cFemonOsd::Action(void)
 {
+  int t0;
   //printf("cFemonOsd::Action()\n");
-#if (VDRVERSNUM < 10300)
-	isyslog("femon plugin: thread started (pid = %d)", getpid());
-#endif
   m_Active = true;
   while (m_Active) {
+    t0 = time_ms();
     if (m_Frontend != -1) {
        CHECK(ioctl(m_Frontend, FE_READ_STATUS, &m_FrontendStatus));
        CHECK(ioctl(m_Frontend, FE_READ_SIGNAL_STRENGTH, &m_Signal));
@@ -659,11 +778,8 @@ void cFemonOsd::Action(void)
           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);
+    cCondWait::SleepMs(100 * femonConfig.updateinterval - (time_ms() - t0));
     }
-#if (VDRVERSNUM < 10300)
-	isyslog("femon plugin: thread stopped (pid = %d)", getpid());
-#endif
 }
 
 void cFemonOsd::Show(void)
@@ -684,18 +800,19 @@ void cFemonOsd::Show(void)
      m_Frontend = -1;
      return;
      }
-  m_Osd = cOsd::OpenRaw((SCREENWIDTH - OSDWIDTH) / 2, (SCREENHEIGHT - OSDHEIGHT) / 2);
+  m_Osd = cOsdProvider::NewOsd(((Setup.OSDWidth - OSDWIDTH) / 2) + Setup.OSDLeft, ((Setup.OSDHeight - OSDHEIGHT) / 2) + Setup.OSDTop);
   if (m_Osd) {
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+     tArea Areas[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, 4 } };
-     eDvbFont OldFont = m_Osd->SetFont(m_Font);
+     if (m_Osd->CanHandleAreas(Areas, sizeof(Areas) / sizeof(tArea)) == oeOk) {
-#endif
+        m_Osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
-     m_StatusWindow = m_Osd->Create(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSHEIGHT, 4);
+        }
-     m_InfoWindow   = m_Osd->Create(0, OSDINFOWIN_Y(0),   OSDWIDTH, OSDINFOHEIGHT,   2);
+     else {
-     m_Osd->Clear();
+        tArea Areas[] = { { 0, OSDSTATUSWIN_Y(0), (OSDWIDTH-1), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-1), 4 },
-     m_Osd->Fill(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, m_InfoWindow);
+                          { 0, OSDINFOWIN_Y(0),   (OSDWIDTH-1), OSDINFOWIN_Y(OSDINFOHEIGHT-1),     2 }
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+                        };
-     m_Osd->SetFont(OldFont);
+        m_Osd->SetAreas(Areas, sizeof(Areas) / sizeof(tArea));
-#endif
+        }
+     m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
      m_Osd->Flush();
      if (m_Receiver)
         delete m_Receiver;
@@ -816,7 +933,7 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
                    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($
+                      //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;
                       }

femonosd.h

@@ -16,14 +16,12 @@
 #include <vdr/thread.h>
 #include <vdr/status.h>
 #include <vdr/channels.h>
-#include <vdr/font.h>
+#include <vdr/transfer.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;
@@ -36,8 +34,10 @@ private:
   uint32_t m_UNC;
   fe_status_t m_FrontendStatus;
   int m_DisplayMode;
-  eDvbFont m_Font;
+  const cFont *m_Font;
   cMutex* m_Mutex;
+  static cBitmap bmDevice0, bmDevice1, bmDevice2, bmDevice3, bmApid1, bmApid2, bmDD, bmDD20, bmDD51;
+  static cBitmap bmPAL, bmNTSC, bmAspectRatio_1_1, bmAspectRatio_16_9, bmAspectRatio_2_21_1, bmAspectRatio_4_3;
   void DrawStatusWindow(void);
   void DrawInfoWindow(void);
 

femonreceiver.c

@@ -17,11 +17,7 @@
 #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;
@@ -62,6 +58,7 @@ cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid)
 cFemonReceiver::~cFemonReceiver(void)
 {
   //printf("cFemonReceiver::~cFemonReceiver()\n");
+  Detach();
   if (m_Active) {
      m_Active = false;
      Cancel(0);
@@ -257,7 +254,14 @@ void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count)
 void cFemonReceiver::Activate(bool On)
 {
   //printf("cFemonReceiver::Activate()\n");
-  Start();
+  if (On) {
+     if (!m_Active)
+        Start();
+     }
+  else if (m_Active) {
+     m_Active = false;
+     Cancel(0);
+     }
 }
 
 void cFemonReceiver::Receive(uchar *Data, int Length)
@@ -305,12 +309,11 @@ void cFemonReceiver::Receive(uchar *Data, int Length)
 
 void cFemonReceiver::Action(void)
 {
+  int t0;
   //printf("cFemonReceiver::Action()\n");
-#if (VDRVERSNUM < 10300)
-  isyslog("femon receiver: thread started (pid = %d)", getpid());
-#endif
   m_Active = true;
   while (m_Active) {
+        t0 = time_ms();
         // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
         m_VideoBitrate = (8.0 * 184.0 * m_VideoPacketCount) / (femonConfig.calcinterval * 100000.0);
         m_VideoPacketCount = 0;
@@ -318,9 +321,6 @@ void cFemonReceiver::Action(void)
         m_AudioPacketCount = 0;
         m_AC3Bitrate   = (8.0 * 184.0 * m_AC3PacketCount)   / (femonConfig.calcinterval * 100.0);
         m_AC3PacketCount = 0;
-        usleep(100000L * femonConfig.calcinterval);
+        cCondWait::SleepMs(100 * femonConfig.calcinterval - (time_ms() - t0));
     }
-#if (VDRVERSNUM < 10300)
-  isyslog("femon receiver: thread stopped (pid = %d)", getpid());
-#endif
 }

symbols/apid1.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * apid1_xpm[] = {
+"32 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++",
+"+..............................+",
+"+..............++.......++.....+",
+"+............++++....+++++.....+",
+"+..........+++.++....+++++.....+",
+"+........+++...++.......++.....+",
+"+...+++++++....++.......++.....+",
+"+...++++++.....++.......++.....+",
+"+...++..++.....++.......++.....+",
+"+...++..++.....++.......++.....+",
+"+...++++++.....++.......++.....+",
+"+...+++++++....++.......++.....+",
+"+........+++...++.......++.....+",
+"+..........+++.++.......++.....+",
+"+............++++.......++.....+",
+"+.............+++.......++.....+",
+"+..............................+",
+"++++++++++++++++++++++++++++++++"};

symbols/apid2.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * apid2_xpm[] = {
+"32 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++",
+"+..............................+",
+"+..............++.....++++.....+",
+"+............++++...+++++++....+",
+"+..........+++.++...++....++...+",
+"+........+++...++.........++...+",
+"+...+++++++....++.........++...+",
+"+...++++++.....++........+++...+",
+"+...++..++.....++.......+++....+",
+"+...++..++.....++......+++.....+",
+"+...++++++.....++.....+++......+",
+"+...+++++++....++....+++.......+",
+"+........+++...++...+++........+",
+"+..........+++.++...++.........+",
+"+............++++...++++++++...+",
+"+.............+++...++++++++...+",
+"+..............................+",
+"++++++++++++++++++++++++++++++++"};

symbols/ar11.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * ar11_xpm[] = {
+"26 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++",
+"+........................+",
+"+......++..........++....+",
+"+...+++++.......+++++....+",
+"+...+++++.......+++++....+",
+"+......++...++.....++....+",
+"+......++...++.....++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++..........++....+",
+"+......++...++.....++....+",
+"+......++...++.....++....+",
+"+........................+",
+"++++++++++++++++++++++++++"};

symbols/ar169.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * ar169_xpm[] = {
+"38 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++++++++",
+"+....................................+",
+"+......++.....++++..........++++.....+",
+"+...+++++....+++++++.......++++++....+",
+"+...+++++....++...++......++...+++...+",
+"+......++...++........++..++....++...+",
+"+......++...++........++..++....++...+",
+"+......++...++............++....++...+",
+"+......++...++.+++.........+++++++...+",
+"+......++...+++++++.........+++.++...+",
+"+......++...++....++............++...+",
+"+......++...++....++............++...+",
+"+......++...++....++............++...+",
+"+......++...+++...++......++...++....+",
+"+......++....++++++...++..+++++++....+",
+"+......++.....++++....++...+++++.....+",
+"+....................................+",
+"++++++++++++++++++++++++++++++++++++++"};

symbols/ar2211.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * ar2211_xpm[] = {
+"52 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"+..................................................+",
+"+.....++++..........++++........++...........++....+",
+"+...+++++++.......+++++++....+++++........+++++....+",
+"+...++....++......++....++...+++++........+++++....+",
+"+.........++............++......++...++......++....+",
+"+.........++............++......++...++......++....+",
+"+........+++...........+++......++...........++....+",
+"+.......+++...........+++.......++...........++....+",
+"+......+++...........+++........++...........++....+",
+"+.....+++...........+++.........++...........++....+",
+"+....+++...........+++..........++...........++....+",
+"+...+++...........+++...........++...........++....+",
+"+...++............++............++...........++....+",
+"+...++++++++..++..++++++++......++...++......++....+",
+"+...++++++++..++..++++++++......++...++......++....+",
+"+..................................................+",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++"};

symbols/ar43.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * ar43_xpm[] = {
+"31 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++++",
+"+.............................+",
+"+.........++.........+++++....+",
+"+........+++........+++++++...+",
+"+.......++++.......++....++...+",
+"+......++.++...++..++....++...+",
+"+.....++..++...++........++...+",
+"+.....++..++............++....+",
+"+....++...++..........+++.....+",
+"+...++....++..........++++....+",
+"+...+++++++++...........+++...+",
+"+...+++++++++............++...+",
+"+.........++.......++....++...+",
+"+.........++.......++...+++...+",
+"+.........++...++...++++++....+",
+"+.........++...++....++++.....+",
+"+.............................+",
+"+++++++++++++++++++++++++++++++"};

symbols/dev0.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * dev0_xpm[] = {
+"29 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++",
+"+...........................+",
+"+.......+..+.......++++.....+",
+"+.......+..+......++++++....+",
+"+.......+..+......++..++....+",
+"+....+++++++++...++....++...+",
+"+....+++++++++...++....++...+",
+"+......+..+......++....++...+",
+"+......+..+......++....++...+",
+"+......+..+......++....++...+",
+"+......+..+......++....++...+",
+"+...+++++++++....++....++...+",
+"+...+++++++++....++....++...+",
+"+.....+..+........++..++....+",
+"+.....+..+........++++++....+",
+"+.....+..+.........++++.....+",
+"+...........................+",
+"+++++++++++++++++++++++++++++"};

symbols/dev1.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * dev1_xpm[] = {
+"29 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++",
+"+...........................+",
+"+.......+..+.........++.....+",
+"+.......+..+......+++++.....+",
+"+.......+..+......+++++.....+",
+"+....+++++++++.......++.....+",
+"+....+++++++++.......++.....+",
+"+......+..+..........++.....+",
+"+......+..+..........++.....+",
+"+......+..+..........++.....+",
+"+......+..+..........++.....+",
+"+...+++++++++........++.....+",
+"+...+++++++++........++.....+",
+"+.....+..+...........++.....+",
+"+.....+..+...........++.....+",
+"+.....+..+...........++.....+",
+"+...........................+",
+"+++++++++++++++++++++++++++++"};

symbols/dev2.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * dev2_xpm[] = {
+"29 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++",
+"+...........................+",
+"+.......+..+.......++++.....+",
+"+.......+..+.....+++++++....+",
+"+.......+..+.....++....++...+",
+"+....+++++++++.........++...+",
+"+....+++++++++.........++...+",
+"+......+..+...........+++...+",
+"+......+..+..........+++....+",
+"+......+..+.........+++.....+",
+"+......+..+........+++......+",
+"+...+++++++++.....+++.......+",
+"+...+++++++++....+++........+",
+"+.....+..+.......++.........+",
+"+.....+..+.......++++++++...+",
+"+.....+..+.......++++++++...+",
+"+...........................+",
+"+++++++++++++++++++++++++++++"};

symbols/dev3.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * dev3_xpm[] = {
+"29 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++",
+"+...........................+",
+"+.......+..+.......+++++....+",
+"+.......+..+......+++++++...+",
+"+.......+..+.....++....++...+",
+"+....+++++++++...++....++...+",
+"+....+++++++++.........++...+",
+"+......+..+...........++....+",
+"+......+..+.........+++.....+",
+"+......+..+.........++++....+",
+"+......+..+...........+++...+",
+"+...+++++++++..........++...+",
+"+...+++++++++....++....++...+",
+"+.....+..+.......++...+++...+",
+"+.....+..+........++++++....+",
+"+.....+..+.........++++.....+",
+"+...........................+",
+"+++++++++++++++++++++++++++++"};

symbols/dolbydigital.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * dolbydigital_xpm[] = {
+"31 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++++",
+"+.............................+",
+"+...+++++++++++.+++++++++++...+",
+"+...++.++++++++.++++++++.++...+",
+"+...++...++++++.++++++...++...+",
+"+...++.....++++.++++.....++...+",
+"+...++......+++.+++......++...+",
+"+...++.......++.++.......++...+",
+"+...++.......++.++.......++...+",
+"+...++.......++.++.......++...+",
+"+...++.......++.++.......++...+",
+"+...++......+++.+++......++...+",
+"+...++.....++++.++++.....++...+",
+"+...++...++++++.++++++...++...+",
+"+...++.++++++++.++++++++.++...+",
+"+...+++++++++++.+++++++++++...+",
+"+.............................+",
+"+++++++++++++++++++++++++++++++"};

symbols/dolbydigital20.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * dolbydigital20_xpm[] = {
+"55 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"+.....................................................+",
+"+...+++++++++++.+++++++++++.....++++.........++++.....+",
+"+...++.++++++++.++++++++.++...+++++++.......++++++....+",
+"+...++...++++++.++++++...++...++....++......++..++....+",
+"+...++.....++++.++++.....++.........++.....++....++...+",
+"+...++......+++.+++......++.........++.....++....++...+",
+"+...++.......++.++.......++........+++.....++....++...+",
+"+...++.......++.++.......++.......+++......++....++...+",
+"+...++.......++.++.......++......+++.......++....++...+",
+"+...++.......++.++.......++.....+++........++....++...+",
+"+...++......+++.+++......++....+++.........++....++...+",
+"+...++.....++++.++++.....++...+++..........++....++...+",
+"+...++...++++++.++++++...++...++............++..++....+",
+"+...++.++++++++.++++++++.++...++++++++..++..++++++....+",
+"+...+++++++++++.+++++++++++...++++++++..++...++++.....+",
+"+.....................................................+",
+"+++++++++++++++++++++++++++++++++++++++++++++++++++++++"};

symbols/dolbydigital51.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * dolbydigital51_xpm[] = {
+"51 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++++++++++++++++++++++++",
+"+.................................................+",
+"+...+++++++++++.+++++++++++...+++++++........++...+",
+"+...++.++++++++.++++++++.++...+++++++.....+++++...+",
+"+...++...++++++.++++++...++...++..........+++++...+",
+"+...++.....++++.++++.....++...++.............++...+",
+"+...++......+++.+++......++...++++++.........++...+",
+"+...++.......++.++.......++...+++++++........++...+",
+"+...++.......++.++.......++...++...+++.......++...+",
+"+...++.......++.++.......++.........++.......++...+",
+"+...++.......++.++.......++.........++.......++...+",
+"+...++......+++.+++......++.........++.......++...+",
+"+...++.....++++.++++.....++...++....++.......++...+",
+"+...++...++++++.++++++...++...++...+++.......++...+",
+"+...++.++++++++.++++++++.++...+++++++...++...++...+",
+"+...+++++++++++.+++++++++++....+++++....++...++...+",
+"+.................................................+",
+"+++++++++++++++++++++++++++++++++++++++++++++++++++"};

symbols/ntsc.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * ntsc_xpm[] = {
+"19 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++",
+"+.................+",
+"+...++.......++...+",
+"+...+++......++...+",
+"+...++++.....++...+",
+"+...++++.....++...+",
+"+...++.++....++...+",
+"+...++..++...++...+",
+"+...++..++...++...+",
+"+...++...++..++...+",
+"+...++...++..++...+",
+"+...++....++.++...+",
+"+...++.....++++...+",
+"+...++.....++++...+",
+"+...++......+++...+",
+"+...++.......++...+",
+"+.................+",
+"+++++++++++++++++++"};

symbols/pal.xpm

@@ -0,0 +1,23 @@
+/* XPM */
+static char * pal_xpm[] = {
+"18 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++",
+"+................+",
+"+...++++++++.....+",
+"+...+++++++++....+",
+"+...++.....+++...+",
+"+...++......++...+",
+"+...++......++...+",
+"+...++.....+++...+",
+"+...+++++++++....+",
+"+...++++++++.....+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+................+",
+"++++++++++++++++++"};