Added some new symbols and beautified the old ones.

Added audio track selection feature.
Added preliminary device switching feature (disabled at the moment).

HISTORY

@@ -81,3 +81,9 @@ 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).

Makefile

@@ -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:
 

README

@@ -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,7 +30,7 @@ Metzler Brothers.
 Terminology:
 
 --------------------------------------------------------------
-|## Channel Name ############################# DD 16:9 PAL ##|
+|## Channel Name ######################### [DD][AR][VF][A][D]|
 |[=====Signal Strength in %  =============|=================]|
 |[=====Signal-to-Noise Ratio in % ========|=================]|
 | STR: #0000 (0%)       BER: #00000000       Video: 0 Mbit/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:
 

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
 

femon.h

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

femoni18n.c

@@ -25,9 +25,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Signal Information", // English
     "Signalinformationen", // Deutsch
@@ -45,9 +44,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Position", // English
     "Position", // Deutsch
@@ -65,9 +63,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Default Display Mode", // English
     "Standard Anzeigemodus", // Deutsch
@@ -85,9 +82,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar  
     "", // Catal<61>  
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "basic", // English
     "Standard", // Deutsch
@@ -105,9 +101,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar  
     "", // Catal<61>  
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "transponder", // English
     "Transponder", // Deutsch
@@ -125,9 +120,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar  
     "", // Catal<61>  
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "stream", // English
     "Stream", // Deutsch
@@ -145,9 +139,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar  
     "", // Catal<61>  
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Hide Mainmenu Entry", // English
     "Hauptmen<EFBFBD>eintrag verstecken", // Deutsch
@@ -165,9 +158,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "OSD Update Interval [0.1s]", // English
     "OSD Updateintervall [0.1s]", // Deutsch
@@ -185,9 +177,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Analyze Stream", // English
     "Stream analysieren", // Deutsch
@@ -205,9 +196,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Calculation Interval [0.1s]", // English
     "Berechnungsintervall [0.1s]", // Deutsch
@@ -225,9 +215,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Red Limit [%]", // English
     "Grenze Rot [%]", // Deutsch
@@ -245,9 +234,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Green Limit [%]", // English
     "Grenze Gr<47>n [%]", // Deutsch
@@ -265,9 +253,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Transponder Information", // English
     "Transponderinformation", // Deutsch
@@ -285,9 +272,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Satellite Card", // English
     "Satellitenkarte", // Deutsch
@@ -305,9 +291,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Cable Card", // English
     "Kabelkarte", // Deutsch
@@ -325,9 +310,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Terrestial Card", // English
     "Terrestrische Karte", // Deutsch
@@ -345,9 +329,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Use Syslog Output", // English
     "Benutze syslog Ausgabe", // Deutsch
@@ -365,9 +348,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> syslog", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "LOCK", // English
     "LOCK", // Deutsch
@@ -385,9 +367,8 @@ const tI18nPhrase Phrases[] = {
     "LOCK", // Romaneste
     "LOCK", // Magyar
     "LOCK", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD>Ų<EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "LOCK", // Hrvatski (Croatian)
   },
   { "SIGNAL", // English
     "SIGNAL", // Deutsch
@@ -405,9 +386,8 @@ const tI18nPhrase Phrases[] = {
     "SIGNAL", // Romaneste
     "SIGNAL", // Magyar
     "SIGNAL", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "SIGNAL", // Hrvatski (Croatian)
   },
   { "CARRIER", // English
     "CARRIER", // Deutsch
@@ -425,9 +405,8 @@ const tI18nPhrase Phrases[] = {
     "CARRIER", // Romaneste
     "CARRIER", // Magyar
     "CARRIER", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɰ<EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "CARRIER", // Hrvatski (Croatian)
   },
   { "VITERBI", // English
     "VITERBI", // Deutsch
@@ -445,9 +424,8 @@ const tI18nPhrase Phrases[] = {
     "VITERBI", // Romaneste
     "VITERBI", // Magyar
     "VITERBI", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD>µ<EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "VITERBI", // Hrvatski (Croatian)
   },
   { "SYNC", // English
     "SYNC", // Deutsch
@@ -465,9 +443,8 @@ const tI18nPhrase Phrases[] = {
     "SYNC", // Romaneste
     "SYNC", // Magyar
     "SYNC", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "SYNC", // Hrvatski (Croatian)
   },
   { "Audio", // English
     "Audio", // Deutsch
@@ -485,9 +462,8 @@ const tI18nPhrase Phrases[] = {
     "Audio", // Romaneste
     "Audio", // Magyar
     "Audio", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "Audio", // Hrvatski (Croatian)
   },
   { "Video", // English
     "Video", // Deutsch
@@ -505,9 +481,8 @@ const tI18nPhrase Phrases[] = {
     "Video", // Romaneste
     "Video", // Magyar
     "Video", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "Video", // Hrvatski (Croatian)
   },
   { "Auto", // English
     "Auto", // Deutsch
@@ -525,9 +500,8 @@ const tI18nPhrase Phrases[] = {
     "Auto", // Romaneste
     "Auto", // Magyar
     "Auto", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "Auto", // Hrvatski (Croatian)
   },
   { "None", // English
     "None", // Deutsch
@@ -545,9 +519,8 @@ const tI18nPhrase Phrases[] = {
     "None", // Romaneste
     "None", // Magyar
     "None", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "None", // Hrvatski (Croatian)
   },
   { "Off", // English
     "Off", // Deutsch
@@ -565,9 +538,8 @@ const tI18nPhrase Phrases[] = {
     "Off", // Romaneste
     "Off", // Magyar
     "Off", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "Off", // Hrvatski (Croatian)
   },
   { "On", // English
     "On", // Deutsch
@@ -585,9 +557,8 @@ const tI18nPhrase Phrases[] = {
     "On", // Romaneste
     "On", // Magyar
     "On", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "On", // Hrvatski (Croatian)
   },
   { "MHz", // English
     "MHz", // Deutsch
@@ -605,9 +576,8 @@ const tI18nPhrase Phrases[] = {
     "MHz", // Romaneste
     "MHz", // Magyar
     "MHz", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "MHz", // Hrvatski (Croatian)
   },
   { "Mbit/s", // English
     "Mbit/s", // Deutsch
@@ -625,9 +595,8 @@ const tI18nPhrase Phrases[] = {
     "Mbit/s", // Romaneste
     "Mbit/s", // Magyar
     "Mbit/s", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "Mbit/s", // Hrvatski (Croatian)
   },
   { "kbit/s", // English
     "kbit/s", // Deutsch
@@ -645,9 +614,8 @@ const tI18nPhrase Phrases[] = {
     "kbit/s", // Romaneste
     "kbit/s", // Magyar
     "kbit/s", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "kbit/s", // Hrvatski (Croatian)
   },
   { "Stream Information", // English
     "Streaminformation", // Deutsch
@@ -665,9 +633,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "MPEG Layer", // English
     "MPEG Layer", // Deutsch
@@ -685,9 +652,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Video Stream", // English
     "Video Stream", // Deutsch
@@ -705,9 +671,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Bitrate", // English
     "Bitrate", // Deutsch
@@ -725,9 +690,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar 
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Frame Rate", // English
     "Bildrate", // Deutsch
@@ -745,9 +709,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Hz", // English
     "Hz", // Deutsch
@@ -765,9 +728,8 @@ const tI18nPhrase Phrases[] = {
     "Hz", // Romaneste
     "Hz", // Magyar
     "Hz", // Catal<61>
-#if VDRVERSNUM >= 10302
     "<EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "Hz", // Hrvatski (Croatian)
   },
   { "Aspect Ratio", // English
     "Seitenverh<EFBFBD>ltnis", // Deutsch
@@ -785,9 +747,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "reserved", // English
     "belegt", // Deutsch
@@ -805,9 +766,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "free", // English
     "frei", // Deutsch
@@ -825,9 +785,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Video Format", // English
     "Bildformat", // Deutsch
@@ -845,9 +804,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "PAL", // English
     "PAL", // Deutsch
@@ -865,9 +823,8 @@ const tI18nPhrase Phrases[] = {
     "PAL", // Romaneste
     "PAL", // Magyar
     "PAL", // Catal<61>
-#if VDRVERSNUM >= 10302
     "PAL", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "PAL", // Hrvatski (Croatian)
   },
   { "NTSC", // English
     "NTSC", // Deutsch
@@ -885,9 +842,8 @@ const tI18nPhrase Phrases[] = {
     "NTSC", // Romaneste
     "NTSC", // Magyar
     "NTSC", // Catal<61>
-#if VDRVERSNUM >= 10302
     "NTSC", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "NTSC", // Hrvatski (Croatian)
   },
   { "unknown", // English
     "unbekannt", // Deutsch
@@ -905,9 +861,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Resolution", // English
     "Aufl<EFBFBD>sung", // Deutsch
@@ -925,9 +880,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Audio Stream", // English
     "Audio Stream", // Deutsch
@@ -945,9 +899,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Sampling Frequency", // English
     "Abtastrate", // Deutsch
@@ -965,9 +918,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "kHz", // English
     "kHz", // Deutsch
@@ -985,9 +937,8 @@ const tI18nPhrase Phrases[] = {
     "kHz", // Romaneste
     "kHz", // Magyar
     "kHz", // Catal<61>
-#if VDRVERSNUM >= 10302
     "ڳ<EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "kHz", // Hrvatski (Croatian)
   },
   { "Nid", // English
     "Nid", // Deutsch
@@ -1005,9 +956,8 @@ const tI18nPhrase Phrases[] = {
     "Nid", // Romaneste
     "Nid", // Magyar
     "Nid", // Catal<61>
-#if VDRVERSNUM >= 10302
     "Nid", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "Nid", // Hrvatski (Croatian)
   },
   { "Tid", // English
     "Tid", // Deutsch
@@ -1025,9 +975,8 @@ const tI18nPhrase Phrases[] = {
     "Tid", // Romaneste
     "Tid", // Magyar
     "Tid", // Catal<61>
-#if VDRVERSNUM >= 10302
     "Tid", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "Tid", // Hrvatski (Croatian)
   },
   { "Rid", // English
     "Rid", // Deutsch
@@ -1045,9 +994,8 @@ const tI18nPhrase Phrases[] = {
     "Rid", // Romaneste
     "Rid", // Magyar
     "Rid", // Catal<61>
-#if VDRVERSNUM >= 10302
     "Rid", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "Rid", // Hrvatski (Croatian)
   },
   { "dB", // English
     "dB", // Deutsch
@@ -1065,12 +1013,11 @@ const tI18nPhrase Phrases[] = {
     "dB", // Romaneste
     "dB", // Magyar
     "dB", // Catal<61>
-#if VDRVERSNUM >= 10302
     "dB", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "dB", // Hrvatski (Croatian)
   },
   { "not indicated", // English
-    "nicht angezeigt", // Deutsch
+    "", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands
@@ -1085,9 +1032,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "AC-3", // English
     "AC-3", // Deutsch
@@ -1105,9 +1051,8 @@ const tI18nPhrase Phrases[] = {
     "AC-3", // Romaneste
     "AC-3", // Magyar
     "AC-3", // Catal<61>
-#if VDRVERSNUM >= 10302
     "AC-3", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "AC-3", // Hrvatski (Croatian)
   },
   { "AC-3 Stream", // English
     "AC-3 Stream", // Deutsch
@@ -1125,9 +1070,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Frame Size", // English
     "Frame Gr<47><72>e", // Deutsch
@@ -1145,9 +1089,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Bit Stream Mode", // English
     "Bitstream Modus", // Deutsch
@@ -1165,9 +1108,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Audio Coding Mode", // English
     "Audio Coding Modus", // Deutsch
@@ -1185,9 +1127,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Center Mix Level", // English
     "Center Mix Pegel", // Deutsch
@@ -1205,9 +1146,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Surround Mix Level", // English
     "Surround Mix Pegel", // Deutsch
@@ -1225,9 +1165,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Dolby Surround Mode", // English
     "Dolby Surround Modus", // Deutsch
@@ -1245,12 +1184,11 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Low Frequency Effects", // English
-    "Tieft<EFBFBD>ner Effekt", // Deutsch
+    "Tieft<EFBFBD>ner Effekte", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands
@@ -1265,12 +1203,11 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Dialogue Normalization", // English
-    "Dialog Normalisation", // Deutsch
+    "Dialog Normalisierung", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands
@@ -1285,9 +1222,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Complete Main (CM)", // English
     "Complete Main (CM)", // Deutsch
@@ -1305,9 +1241,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Music and Effects (ME)", // English
     "Musik und Effekte (ME)", // Deutsch
@@ -1325,9 +1260,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Visually Impaired (VI)", // English
     "Sehbehindert (VI)", // Deutsch
@@ -1345,9 +1279,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Hearing Impaired (HI)", // English
     "H<EFBFBD>rbehindert (HI)", // Deutsch
@@ -1365,9 +1298,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Dialogue (D)", // English
     "Dialog (D)", // Deutsch
@@ -1385,9 +1317,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Commentary (C)", // English
     "Kommentar (C)", // Deutsch
@@ -1405,9 +1336,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Emergency (E)", // English
     "Notfall (E)", // Deutsch
@@ -1425,9 +1355,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Voice Over (VO)", // English
     "<EFBFBD>berlagerte Stimme (VO)", // Deutsch
@@ -1445,9 +1374,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Karaoke", // English
     "Karaoke", // Deutsch
@@ -1465,12 +1393,11 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Ch1", // English "Channel 1"
-    "Kanal1", // Deutsch
+    "Kan1", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands
@@ -1485,12 +1412,11 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "Ch2", // English "Channel 2"
-    "Kanal2", // Deutsch
+    "Kan2", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands
@@ -1505,9 +1431,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "C", // English "Center"
     "C", // Deutsch
@@ -1525,9 +1450,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "L", // English "Left"
     "L", // Deutsch
@@ -1545,9 +1469,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "R", // English "Right"
     "R", // Deutsch
@@ -1565,9 +1488,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "S", // English "Surround"
     "S", // Deutsch
@@ -1585,9 +1507,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "SL", // English "Surround Left"
     "SL", // Deutsch
@@ -1605,9 +1526,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { "SR", // English "Surround Right"
     "SR", // Deutsch
@@ -1625,9 +1545,8 @@ const tI18nPhrase Phrases[] = {
     "", // Romaneste
     "", // Magyar
     "", // Catal<61>
-#if VDRVERSNUM >= 10302
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-#endif
+    "", // Hrvatski (Croatian)
   },
   { NULL }
 };

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,9 +12,21 @@
 #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
@@ -23,23 +35,37 @@
 #define SCREENHEIGHT             576 // in pixels
 #define OSDWIDTH                 600 // in pixels
 #define OSDHEIGHT                480 // 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) ? 470 : (col == 3) ? 300 : (col==2) ? 180 : 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 - cOsd::WidthInCells(txt) * cOsd::CellWidth()) / 2))
+#define OSDSTATUSWIN_XC(col,txt) (((col - 1) * SCREENWIDTH / 6) + ((SCREENWIDTH / 6 - 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;
@@ -54,11 +80,7 @@ cFemonOsd::cFemonOsd(void)
   m_BER = 0;
   m_UNC = 0;
   m_DisplayMode = femonConfig.displaymode;
-#if (VDRVERSNUM >= 10300) || defined(ELCHIAIOVERSION)
+  m_Font = cFont::GetFont(fontSml);
-  m_Font = fontSml;
-#else
-  m_Font = fontOsd;
-#endif
   m_Mutex = new cMutex();
 }
 
@@ -83,75 +105,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);
-#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->Fill(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+cOsd::LineHeight()-1), clrWhite, m_StatusWindow);
+     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+m_Font->Height()-1), clrWhite);
-     m_Osd->Text(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrBlack, clrWhite, m_StatusWindow);
+     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), buf, clrBlack, clrWhite, m_Font);
-     offset += cOsd::LineHeight();
+     if (m_Receiver) {
+        int value = cDevice::ActualDevice()->CardIndex();
+        if (value == 0) {
+           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();
      }
 }
@@ -168,83 +287,78 @@ 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);
         snprintf(buf, sizeof(buf), "%d", channel->Ca());
-        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");
@@ -256,26 +370,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");
@@ -284,15 +398,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");
@@ -304,33 +418,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");
@@ -339,15 +453,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");
@@ -371,42 +485,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");
@@ -416,14 +530,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"));
@@ -431,18 +545,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);
-        snprintf(buf, sizeof(buf), "#%d", channel->Apid1());
+        value = -1;
-        m_Osd->Text(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_InfoWindow);
+        cDevice::PrimaryDevice()->GetAudioTracks(&value);
-        offset += cOsd::LineHeight() - DELTA;
+        snprintf(buf, sizeof(buf), "#%d", (value > 0 ? channel->Apid2() : channel->Apid1()));
-        m_Osd->Text(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_InfoWindow);
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), buf, clrYellow, clrBackground, m_Font);
+        offset += m_Font->Height();
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), clrWhite, clrBackground, m_Font);
         if (m_Receiver) {
            dvalue = m_Receiver->AudioStreamBitrate();
            if      (dvalue == (double)FR_RESERVED) snprintf(buf, sizeof(buf), "%s (%.0f %s)", tr("reserved"), m_Receiver->AudioBitrate(), tr("kbit/s"));
@@ -450,43 +566,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;
@@ -498,9 +614,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;
@@ -515,9 +631,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;
@@ -525,9 +641,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;
@@ -535,36 +651,33 @@ 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();
      }
 }
@@ -572,9 +685,6 @@ void cFemonOsd::DrawInfoWindow(void)
 void cFemonOsd::Action(void)
 {
   //printf("cFemonOsd::Action()\n");
-#if (VDRVERSNUM < 10300)
-	isyslog("femon plugin: thread started (pid = %d)", getpid());
-#endif
   m_Active = true;
   while (m_Active) {
     if (m_Frontend != -1) {
@@ -591,9 +701,6 @@ void cFemonOsd::Action(void)
        }
     usleep(100000L * femonConfig.updateinterval);
     }
-#if (VDRVERSNUM < 10300)
-	isyslog("femon plugin: thread stopped (pid = %d)", getpid());
-#endif
 }
 
 void cFemonOsd::Show(void)
@@ -614,18 +721,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;
@@ -671,9 +779,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;
@@ -712,6 +819,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:

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;
@@ -306,9 +302,6 @@ 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
@@ -320,7 +313,4 @@ void cFemonReceiver::Action(void)
         m_AC3PacketCount = 0;
         usleep(100000L * femonConfig.calcinterval);
     }
-#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",
+"++++++++++++++++++",
+"+................+",
+"+...++++++++.....+",
+"+...+++++++++....+",
+"+...++.....+++...+",
+"+...++......++...+",
+"+...++......++...+",
+"+...++.....+++...+",
+"+...+++++++++....+",
+"+...++++++++.....+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+...++...........+",
+"+................+",
+"++++++++++++++++++"};