Added missing MINFONTSIZE and MAXFONTSIZE defines.

Added a check for the minimum OSD height.

HISTORY

@@ -1,3 +1,4 @@
+
 ===================================
 VDR Plugin 'femon' Revision History
 ===================================
@@ -28,7 +29,8 @@ VDR Plugin 'femon' Revision History
 
 - Redesigned the user interface.
 - Transponder information is now available in advanced display mode:
-  Press 'OK' key to switch between the simple and the advanced display mode.
+  Press 'OK' key to switch between the simple and the advanced display
+  mode.
 - Moved bitrate calculation to it's own thread for improved accurancy.
 
 2004-03-07: Version 0.0.3a
@@ -40,7 +42,8 @@ VDR Plugin 'femon' Revision History
 2004-03-16: Version 0.0.3b
 
 - Fixed channel toggling with '0' key.
-- Bitrate calculation thread is now canceled immediately to speed up channel switching.
+- Bitrate calculation thread is now canceled immediately to speed up
+  channel switching.
 
 2004-04-04: Version 0.0.3c
 
@@ -87,7 +90,8 @@ VDR Plugin 'femon' Revision History
 
 2004-06-11: Version 0.1.3
 
-- Added "AC-3 Stream Information" display mode (Thanks to Lothar Englisch).
+- Added "AC-3 Stream Information" display mode (Thanks to Lothar
+  Englisch).
 
 2004-06-24: Version 0.1.4
 
@@ -99,7 +103,8 @@ VDR Plugin 'femon' Revision History
 
 - Fixed OSDSTATUSWIN_XC define.
 - Added preliminary NTSC support (make NTSC_SYSTEM=1 plugins).
-- Fixed "Setup/OSD/Use Small Fonts" bug (Thanks to Winni for reporting this one).
+- Fixed "Setup/OSD/Use Small Fonts" bug (Thanks to Winni for reporting
+  this one).
 - Added patches directory: CA system names by Lauri Tischler.
 
 2004-09-11: Version 0.1.6
@@ -145,7 +150,8 @@ VDR Plugin 'femon' Revision History
 2005-04-01: Version 0.8.7
 
 - Default make target is now all.
-- Fixed the access rights of symbols subdirectory (Thanks to Harri Kukkonen).
+- Fixed the access rights of symbols subdirectory (Thanks to Harri
+  Kukkonen).
 - Added a new theme: Moronimo (Thanks to Morone).
 
 2005-04-02: Version 0.8.8
@@ -159,7 +165,8 @@ VDR Plugin 'femon' Revision History
 
 2005-05-20: Version 0.9.0
 
-- Renamed compiling switches ('DEBUG' to 'FEMON_DEBUG' and 'NTSC_SYSTEM' to 'FEMON_NTSC').
+- Renamed compiling switches ('DEBUG' to 'FEMON_DEBUG' and 'NTSC_SYSTEM'
+  to 'FEMON_NTSC').
 - Enabled preliminary support for the device switching.
 
 2005-07-23: Version 0.9.1
@@ -199,7 +206,8 @@ VDR Plugin 'femon' Revision History
 
 - Updated for vdr-1.3.40.
 - Fixed a translation bug (Thanks to Antti Hartikainen).
-- Fixed AC3 header parsing bug (Thanks to Axel Katzur for reporting this one).
+- Fixed AC3 header parsing bug (Thanks to Axel Katzur for reporting this
+  one).
 - Fixed EgalsTry theme (Thanks to Uwe Hanke).
 
 2006-02-06: Version 0.9.7
@@ -247,7 +255,8 @@ VDR Plugin 'femon' Revision History
 
 2007-05-01: Version 1.1.2
 
-- Fixed opening while replaying (Thanks to Antti Seppälä for reporting this one).
+- Fixed opening while replaying (Thanks to Antti Seppälä for reporting
+  this one).
 
 2007-05-15: Version 1.1.3
 
@@ -297,9 +306,61 @@ VDR Plugin 'femon' Revision History
 2008-06-20: Version 1.6.1
 
 - Updated Italian translation (Thanks to Diego Pierotto).
-- Fixed a crash if no channel available (Thanks to Winfried Köhler)
+- Fixed a crash if no channel available (Thanks to Winfried Köhler).
 
 2008-10-12: Version 1.6.2
 
 - Converted HISTORY and fi_FI.po to UTF-8.
 - Optimized receiver and OSD thread termination.
+
+2008-11-09: Version 1.6.3
+
+- Added initial support for H.264 and HE-AAC.
+- Fixed detection of false positives in audio/video streams.
+- Refactored source code.
+
+2008-11-30: Version 1.6.4
+
+- Added new helper functions.
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Fixed a memory leak.
+- Added a check for the minimum OSD height.
+- Replaced "Use single area (8bpp)" option with VDR's
+  "Setup/OSD/Anti-alias".
+- Removed the FEMON_NTSC option.
+- Fixed a deadlock in cFemonReceiver (Thanks to Antti Seppälä for
+  reporting this one).
+
+2008-12-16: Version 1.6.5
+
+- Backported from 1.7.0.
+
+2009-01-06: Version 1.6.6
+
+- Backported from 1.7.1.
+
+2009-06-18: Version 1.6.7
+
+- Backported from 1.7.2.
+
+===================================
+VDR Plugin 'femon' Revision History
+===================================
+
+2008-12-16: Version 1.7.0
+
+- Updated for vdr-1.7.2.
+- Added whitespace cleanups.
+- Changed info window to use the channel source instead of the frontend
+  type.
+- Removed the "Show CA system" setup option.
+
+2009-01-06: Version 1.7.1
+
+- Fixed closing of frontend file handles (Thanks to Brendon Higgins for
+  reporting this one).
+
+2009-06-18: Version 1.7.2
+
+- Cleaned up compilation warnings.
+- Fixed font handling to be thread-safe.

Makefile

@@ -1,14 +1,10 @@
 #
-# Makefile for a Video Disk Recorder plugin
+# Makefile for Frontend Status Monitor plugin
 #
-# $Id$
 
 # Debugging on/off 
 #FEMON_DEBUG = 1
 
-# NTSC on/off 
-#FEMON_NTSC = 1
-
 # Strip debug symbols?  Set eg. to /bin/true if not
 STRIP = strip
 
@@ -27,7 +23,7 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -54,10 +50,6 @@ INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
-ifdef FEMON_NTSC
-DEFINES += -DNTSC
-endif
-
 ifdef FEMON_DEBUG
 DEFINES += -DDEBUG
 endif
@@ -67,7 +59,7 @@ all-redirect: all
 
 ### The object files (add further files here):
 
-OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femontools.o
+OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femontools.o femonmpeg.o femonac3.o femonaac.o femonh264.o femonsymbol.o
 
 ### The main target:
 

README

@@ -15,7 +15,7 @@ See the file COPYING for license information.
 
 Requirements:
 
-VDR & DVB. BMW & Ph.D.. BEER. YARRR!
+VDR and a DVB card.
 
 Description:
 
@@ -28,7 +28,8 @@ 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
 information). The bitrate calculation trick originates from the 'dvbstream'
 application by Dave Chapman and the stream information routines are taken from
-the 'libdvb' library by Metzler Brothers.
+the 'libdvb' library by Metzler Brothers. The H.264 parsing routines are taken
+from vdr-xineliboutput plugin by Petri Hintukainen.
 
 Terminology:
 
@@ -111,7 +112,7 @@ Notes:
 - If the OSD isn't visible, you've configured the OSD height too big or too
   small. Please, try to adjust the variable on the setup page before writing
   any bug reports. NTSC users should use a shrinked default OSD height by
-  compiling the plugin with: make FEMON_NTSC=1
+  modifying VDR's setup.conf: femon.OSDHeight = 420
 
 - If the SVDRP service is used: femon won't notice if the server is tuned
   to a different channel and tuning the channel on the server might annoy

femon.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
  */
 
 #include <vdr/menu.h>
@@ -19,7 +18,7 @@
 #error "VDR-1.6.0 API version or greater is required!"
 #endif
 
-static const char VERSION[]       = "1.6.2";
+static const char VERSION[]       = "1.6.7";
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 
@@ -109,14 +108,12 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)
 {
   // Parse your own setup parameters and store their values.
   if      (!strcasecmp(Name, "HideMenu"))       femonConfig.hidemenu       = atoi(Value);
-  else if (!strcasecmp(Name, "UseSingleArea"))  femonConfig.usesinglearea  = atoi(Value);
   else if (!strcasecmp(Name, "DisplayMode"))    femonConfig.displaymode    = atoi(Value);
   else if (!strcasecmp(Name, "Position"))       femonConfig.position       = atoi(Value);
   else if (!strcasecmp(Name, "OSDHeight"))      femonConfig.osdheight      = atoi(Value);
   else if (!strcasecmp(Name, "OSDOffset"))      femonConfig.osdoffset      = atoi(Value);
   else if (!strcasecmp(Name, "Skin"))           femonConfig.skin           = atoi(Value);
   else if (!strcasecmp(Name, "Theme"))          femonConfig.theme          = atoi(Value);
-  else if (!strcasecmp(Name, "ShowCASystem"))   femonConfig.showcasystem   = atoi(Value);
   else if (!strcasecmp(Name, "RedLimit"))       femonConfig.redlimit       = atoi(Value);
   else if (!strcasecmp(Name, "GreenLimit"))     femonConfig.greenlimit     = atoi(Value);
   else if (!strcasecmp(Name, "UpdateInterval")) femonConfig.updateinterval = atoi(Value);
@@ -312,9 +309,6 @@ void cMenuFemonSetup::Setup(void)
   Add(new cMenuEditBoolItem(tr("Hide main menu entry"), &data.hidemenu));
   help.Append(tr("Define whether the main menu entry is hidden."));
 
-  Add(new cMenuEditBoolItem(tr("Use single area (8bpp)"), &data.usesinglearea));
-  help.Append(tr("Define whether a single 8bpp OSD area is preferred.\n\nRequired by Truetype fonts and anti-aliasing."));
-
   Add(new cMenuEditStraItem(tr("Default display mode"), &data.displaymode, eFemonModeMaxNumber, dispmodes));
   help.Append(tr("Define the default display mode at startup."));
 
@@ -333,9 +327,6 @@ void cMenuFemonSetup::Setup(void)
   Add(new cMenuEditIntItem(tr("Horizontal offset"), &data.osdoffset, -50, 50));
   help.Append(tr("Define the horizontal offset of OSD."));
 
-  Add(new cMenuEditBoolItem(tr("Show CA system"), &data.showcasystem));
-  help.Append(tr("Define whether the CA system is shown as text."));
-
   Add(new cMenuEditIntItem(tr("Red limit [%]"), &data.redlimit, 1, 50));
   help.Append(tr("Define a limit for red bar, which is used to indicate a bad signal."));
 
@@ -373,14 +364,12 @@ void cMenuFemonSetup::Store(void)
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
   femonConfig = data;
   SetupStore("HideMenu",       femonConfig.hidemenu);
-  SetupStore("UseSingleArea",  femonConfig.usesinglearea);
   SetupStore("DisplayMode",    femonConfig.displaymode);
   SetupStore("Skin",           femonConfig.skin);
   SetupStore("Theme",          femonConfig.theme);
   SetupStore("Position",       femonConfig.position);
   SetupStore("OSDHeight",      femonConfig.osdheight);
   SetupStore("OSDOffset",      femonConfig.osdoffset);
-  SetupStore("ShowCASystem",   femonConfig.showcasystem);
   SetupStore("RedLimit",       femonConfig.redlimit);
   SetupStore("GreenLimit",     femonConfig.greenlimit);
   SetupStore("UpdateInterval", femonConfig.updateinterval);

femonaac.c

@@ -0,0 +1,77 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include "femontools.h"
+#include "femonaac.h"
+
+#define IS_HEAAC_AUDIO(buf) (((buf)[0] == 0xFF) && (((buf)[1] & 0xF6) == 0xF0))
+
+static unsigned int samplerates[16] =
+{
+  96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, -1, -1, -1, -1
+};
+
+bool getAACAudioInfo(uint8_t *buf, int len, audio_info_t *info)
+{
+  // HE-AAC audio detection, search for syncword with layer set to 0
+  if ((len < 4) || !IS_HEAAC_AUDIO(buf))
+     return false;
+
+  /* ADTS Fixed Header:
+   * syncword                 12b  always: '111111111111'
+   * id                        1b  0: MPEG-4, 1: MPEG-2
+   * layer                     2b  always: '00'
+   * protection_absent         1b
+   * profile                   2b  0: Main profile AAC MAIN 1: Low Complexity profile (LC) AAC LC 2: Scalable Sample Rate profile (SSR) AAC SSR 3: (reserved) AAC LTP
+   * sampling_frequency_index  4b
+   * private_bit               1b
+   * channel_configuration     3b
+   * original/copy             1b
+   * home                      1b
+   * emphasis                  2b only if ID == 0 (ie MPEG-4)
+   */
+
+  int sampling_frequency_index = (buf[2] & 0x03C) >> 2;
+  int channel_configuration = ((buf[2] & 0x01) << 2) | ((buf[3] & 0xC0) >> 6);
+
+  info->codec = AUDIO_CODEC_HEAAC;
+  info->bitrate = AUDIO_BITRATE_RESERVED;
+
+  switch (channel_configuration) {
+    case 0:
+         info->channelMode = AUDIO_CHANNEL_MODE_STEREO;
+         break;
+
+    case 1:
+         info->channelMode = AUDIO_CHANNEL_MODE_JOINT_STEREO;
+         break;
+
+    case 2:
+         info->channelMode = AUDIO_CHANNEL_MODE_DUAL;
+         break;
+
+    case 3:
+         info->channelMode = AUDIO_CHANNEL_MODE_SINGLE;
+         break;
+
+    default:
+         info->channelMode = AUDIO_CHANNEL_MODE_INVALID;
+         break;
+  }
+
+  switch (sampling_frequency_index) {
+    case 0xC ... 0xF:
+         info->samplingFrequency = AUDIO_SAMPLING_FREQUENCY_RESERVED;
+         break;
+
+    default:
+         info->samplingFrequency = samplerates[sampling_frequency_index];
+         break;
+  }
+
+  return true;
+}

femonaac.h

@@ -0,0 +1,15 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONAAC_H
+#define __FEMONAAC_H
+
+#include "femonaudio.h"
+
+bool getAACAudioInfo(uint8_t *buf, int len, audio_info_t *info);
+
+#endif //__FEMONAAC_H

femonac3.c

@@ -0,0 +1,115 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * AC3 Audio Header: http://www.atsc.org/standards/a_52a.pdf
+ */
+
+#include "femontools.h"
+#include "femonac3.h"
+
+#define IS_AC3_DATA(buf) (((buf)[0] == 0x0b) && ((buf)[1] == 0x77))
+
+static unsigned int ac3_bitrates[32] =
+{
+  32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+static unsigned int ac3_freq[4] =
+{
+  480, 441, 320, 0
+};
+
+//static unsigned int ac3_frames[3][32] =
+//{
+//  {64, 80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768,  896,  1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+//  {69, 87,  104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835,  975,  1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+//  {96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672, 768, 960, 1152, 1344, 1536, 1728, 1920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+//};
+
+bool getAC3AudioInfo(uint8_t *buf, int len, ac3_info_t *info)
+{
+  if (!IS_AC3_DATA(buf) || (len < 8))
+     return false;
+
+  uint8_t *data = buf + 2;
+  uint8_t frame = (uint8_t)(data[2] & 0x3f);
+  info->bitrate = 1000 * ac3_bitrates[frame >> 1];
+  uint8_t fr = (data[2] & 0xc0 ) >> 6;
+  //uint8_t sz = ac3_frames[fr][frame >> 1];
+  //if ((frame & 1) && (fr == 1))
+  //   sz++;
+  //sz <<= 1;
+  info->samplingFrequency = 100 * ac3_freq[fr];
+  info->bitstreamMode = (data[3] & 7);
+  int acm = (data[4] & 0xE0) >> 5;
+  info->audioCodingMode = acm;
+  if ((acm & 0x01) && (acm != 0x01)) {
+     // 3 front channels
+     info->centerMixLevel = (data[4] & 0x18) >> 3;
+     if (acm & 0x04) {
+        // a surround channel exists
+        info->surroundMixLevel = (data[4] & 0x06) >> 1;
+        if (acm == 0x02) {
+           // if in 2/0 mode
+           info->dolbySurroundMode = ((data[4] & 0x01) << 1) | ((data[5] & 0x80) >> 7);
+           info->lfe = (data[5] & 0x40) >> 6;
+           info->dialogLevel = (data[5] & 0x3e) >> 1;
+           }
+        else {
+           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
+           info->lfe = (data[4] & 0x01);
+           info->dialogLevel = (data[5] & 0xF8) >> 3;
+           }
+        }
+     else {
+        info->surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
+        if (acm == 0x02) {
+           // if in 2/0 mode
+            info->dolbySurroundMode = (data[4] & 0x06) >> 1;
+            info->lfe = (data[4] & 0x01);
+            info->dialogLevel = (data[5] & 0xF8) >> 3;
+           }
+        else {
+           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
+           info->lfe = (data[4] & 0x04) >> 2;
+           info->dialogLevel = (data[4] & 0x03) << 3 | ((data[5] & 0xE0) >> 5);
+           }
+        }
+     }
+  else {
+     info->centerMixLevel = AUDIO_CENTER_MIX_LEVEL_INVALID;
+     if (acm & 0x04) {
+        // a surround channel exists
+        info->surroundMixLevel = (data[4] & 0x18) >> 3;
+        if (acm == 0x02) {
+           // if in 2/0 mode
+           info->dolbySurroundMode = (data[4] & 0x06) >> 1;
+           info->lfe = (data[4] & 0x01);
+           info->dialogLevel = (data[5] & 0xF8) >> 3;
+           }
+        else {
+           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
+           info->lfe = (data[4] & 0x04) >> 2;
+           info->dialogLevel = (data[4] & 0x03) << 3 | ((data[5] & 0xE0) >> 5);
+           }
+        }
+     else {
+        info->surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
+        if (acm == 0x02) {
+           // if in 2/0 mode
+           info->dolbySurroundMode = (data[4] & 0x18) >> 3;
+           info->lfe = (data[4] & 0x04) >> 2;
+           info->dialogLevel = (data[4] & 0x03) << 3 | ((data[5] & 0xE0) >> 5);
+           }
+        else {
+           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
+           info->lfe = (data[4] & 0x10) >> 4;
+           info->dialogLevel = ((data[4] & 0x0F) << 1) | ((data[5] & 0x80) >> 7);
+           }
+        }
+     }
+     
+  return true;
+}

femonac3.h

@@ -0,0 +1,15 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONAC3_H
+#define __FEMONAC3_H
+
+#include "femonaudio.h"
+
+bool getAC3AudioInfo(uint8_t *buf, int len, ac3_info_t *info);
+
+#endif //__FEMONAC3_H

femonaudio.h

@@ -0,0 +1,109 @@
+/*
+ * Frontend Status Monitor plugin for the AUDIO Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONAUDIO_H
+#define __FEMONAUDIO_H
+
+enum eAudioCodec {
+  AUDIO_CODEC_INVALID = -1,
+  AUDIO_CODEC_UNKNOWN,
+  AUDIO_CODEC_MPEG1_I,
+  AUDIO_CODEC_MPEG1_II,
+  AUDIO_CODEC_MPEG1_III,
+  AUDIO_CODEC_MPEG2_I,
+  AUDIO_CODEC_MPEG2_II,
+  AUDIO_CODEC_MPEG2_III,
+  AUDIO_CODEC_HEAAC
+  };
+
+enum eAudioChannelMode {
+  AUDIO_CHANNEL_MODE_INVALID = -1,
+  AUDIO_CHANNEL_MODE_STEREO,
+  AUDIO_CHANNEL_MODE_JOINT_STEREO,
+  AUDIO_CHANNEL_MODE_DUAL,
+  AUDIO_CHANNEL_MODE_SINGLE
+  };
+
+enum eAudioBitrate {
+  AUDIO_BITRATE_RESERVED = -3,
+  AUDIO_BITRATE_FREE = -2,
+  AUDIO_BITRATE_INVALID = -1
+  };
+
+enum eAudioSamplingFrequency {
+  AUDIO_SAMPLING_FREQUENCY_RESERVED = -2,
+  AUDIO_SAMPLING_FREQUENCY_INVALID = -1
+  };
+
+enum eAudioCenterMixLevel {
+  AUDIO_CENTER_MIX_LEVEL_INVALID = -1,
+  AUDIO_CENTER_MIX_LEVEL_MINUS_3dB,
+  AUDIO_CENTER_MIX_LEVEL_MINUS_4_5dB,
+  AUDIO_CENTER_MIX_LEVEL_MINUS_6dB,
+  AUDIO_CENTER_MIX_LEVEL_RESERVED
+  };
+
+enum eAudioSurroundMixLevel {
+  AUDIO_SURROUND_MIX_LEVEL_INVALID = -1,
+  AUDIO_SURROUND_MIX_LEVEL_MINUS_3dB,
+  AUDIO_SURROUND_MIX_LEVEL_MINUS_6dB,
+  AUDIO_SURROUND_MIX_LEVEL_0_dB,
+  AUDIO_SURROUND_MIX_LEVEL_RESERVED
+  };
+
+enum eAudioDolbySurroundMode {
+  AUDIO_DOLBY_SURROUND_MODE_INVALID = -1,
+  AUDIO_DOLBY_SURROUND_MODE_NOT_INDICATED,
+  AUDIO_DOLBY_SURROUND_MODE_NOT_DOLBYSURROUND,
+  AUDIO_DOLBY_SURROUND_MODE_DOLBYSURROUND,
+  AUDIO_DOLBY_SURROUND_MODE_RESERVED
+  };
+
+enum eAudioBitstreamMode {
+  AUDIO_BITSTREAM_MODE_INVALID = -1,
+  AUDIO_BITSTREAM_MODE_CM,
+  AUDIO_BITSTREAM_MODE_ME,
+  AUDIO_BITSTREAM_MODE_VI,
+  AUDIO_BITSTREAM_MODE_HI,
+  AUDIO_BITSTREAM_MODE_D,
+  AUDIO_BITSTREAM_MODE_C,
+  AUDIO_BITSTREAM_MODE_E,
+  AUDIO_BITSTREAM_MODE_VO_KAR
+  };
+
+enum eAudioCodingMode {
+  AUDIO_CODING_MODE_INVALID = -1,
+  AUDIO_CODING_MODE_1_1,
+  AUDIO_CODING_MODE_1_0,
+  AUDIO_CODING_MODE_2_0,
+  AUDIO_CODING_MODE_3_0,
+  AUDIO_CODING_MODE_2_1,
+  AUDIO_CODING_MODE_3_1,
+  AUDIO_CODING_MODE_2_2,
+  AUDIO_CODING_MODE_3_2,
+  };
+
+typedef struct audio_info {
+  eAudioCodec codec;             // enum
+  double      bitrate;           // kbit/s or eAudioBitrate
+  int         samplingFrequency; // Hz or eAudioSamplingFrequency
+  int         channelMode;       // eAudioChannelMode
+} audio_info_t;
+
+typedef struct ac3_info {
+  int         bitrate;           // bit/s or eAudioBitrate
+  int         samplingFrequency; // Hz or eAudioSamplingFrequency
+  int         bitstreamMode;     // 0..7 or eAudioBitstreamMode
+  int         audioCodingMode;   // 0..7 or eAudioCodingMode
+  int         dolbySurroundMode; // eAudioDolbySurroundMode
+  int         centerMixLevel;    // eAudioCenterMixLevel
+  int         surroundMixLevel;  // eAudioSurroundMixLevel
+  int         dialogLevel;       // -dB
+  bool        lfe;               // boolean
+} ac3_info_t;
+
+#endif //__FEMONAUDIO_H

femoncfg.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
  */
 
 #include <string.h>
@@ -14,7 +13,6 @@ cFemonConfig femonConfig;
 cFemonConfig::cFemonConfig(void)
 {
   hidemenu       = 0;
-  usesinglearea  = 0;
   displaymode    = 0;
   skin           = 0;
   theme          = 0;
@@ -24,12 +22,7 @@ cFemonConfig::cFemonConfig(void)
   updateinterval = 5;
   analyzestream  = 1;
   calcinterval   = 20;
-  showcasystem   = 0;
-#ifdef NTSC
-  osdheight      = 420;
-#else
   osdheight      = 480;
-#endif
   osdoffset      = 0;
   usesvdrp       = 0;
   svdrpport      = 2001;

femoncfg.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
  */
 
 #ifndef __FEMONCFG_H
@@ -25,7 +24,6 @@ struct cFemonConfig
 public:
   cFemonConfig(void);
   int hidemenu;
-  int usesinglearea;
   int displaymode;
   int skin;
   int theme;
@@ -35,7 +33,6 @@ public:
   int updateinterval;
   int analyzestream;
   int calcinterval;
-  int showcasystem;
   int osdheight;
   int osdoffset;
   int usesvdrp;

femonh264.c

@@ -0,0 +1,425 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ * The original NAL SPS parsing and bitstream functions are taken from
+ * vdr-xineliboutput plugin by Petri Hintukainen. 
+ */
+
+#include "femontools.h"
+#include "femonh264.h"
+
+#define NAL_SEI     0x06 // Supplemental Enhancement Information
+#define NAL_SPS     0x07 // Sequence Parameter Set
+#define NAL_AUD     0x09 // Access Unit Delimiter
+#define NAL_END_SEQ 0x0A // End of Sequence
+
+#define IS_NAL_SEI(buf)     (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == NAL_SEI))
+#define IS_NAL_SPS(buf)     (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == NAL_SPS))
+#define IS_NAL_AUD(buf)     (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == NAL_AUD))
+#define IS_NAL_END_SEQ(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == NAL_END_SEQ))
+
+// Picture types
+#define NO_PICTURE  0
+#define I_FRAME     1
+#define P_FRAME     2
+#define B_FRAME     3
+
+static const eVideoAspectRatio aspect_ratios[] =
+{
+  VIDEO_ASPECT_RATIO_INVALID,
+  VIDEO_ASPECT_RATIO_1_1,
+  VIDEO_ASPECT_RATIO_12_11,
+  VIDEO_ASPECT_RATIO_10_11,
+  VIDEO_ASPECT_RATIO_16_11,
+  VIDEO_ASPECT_RATIO_40_33,
+  VIDEO_ASPECT_RATIO_24_11,
+  VIDEO_ASPECT_RATIO_20_11,
+  VIDEO_ASPECT_RATIO_32_11,
+  VIDEO_ASPECT_RATIO_80_33,
+  VIDEO_ASPECT_RATIO_18_11,
+  VIDEO_ASPECT_RATIO_15_11,
+  VIDEO_ASPECT_RATIO_64_33,
+  VIDEO_ASPECT_RATIO_160_99,
+  VIDEO_ASPECT_RATIO_4_3,
+  VIDEO_ASPECT_RATIO_3_2,
+  VIDEO_ASPECT_RATIO_2_1
+};
+
+static const eVideoFormat video_formats[] =
+{
+  VIDEO_FORMAT_COMPONENT,
+  VIDEO_FORMAT_PAL,
+  VIDEO_FORMAT_NTSC,
+  VIDEO_FORMAT_SECAM,
+  VIDEO_FORMAT_MAC,
+  VIDEO_FORMAT_UNKNOWN,
+  VIDEO_FORMAT_RESERVED
+};
+
+typedef struct {
+  int width;
+  int height;
+  eVideoAspectRatio aspect_ratio;
+  eVideoFormat format;
+} h264_sps_data_t;
+
+typedef struct {
+   double frame_rate;
+   double bitrate;
+   eVideoScan scan;
+} h264_sei_data_t;
+
+typedef struct {
+  const uint8_t *data;
+  int            count; // bits
+  int            index; // bits
+} br_state;
+
+#define BR_INIT(data, bytes)  { (data), 8 * (bytes), 0 }
+#define BR_EOF(br)            ((br)->index >= (br)->count)
+#define br_skip_bit(br)       br_skip_bits(br,1)
+#define br_get_u8(br)         br_get_bits(br, 8)
+#define br_get_u16(br)        ((br_get_bits(br, 8) << 8) | br_get_bits(br, 8))
+#define br_skip_ue_golomb(br) br_skip_golomb(br)
+#define br_skip_se_golomb(br) br_skip_golomb(br)
+
+static inline void br_init(br_state *br, const uint8_t *data, int bytes)
+{
+  br->data  = data;
+  br->count = 8 * bytes;
+  br->index = 0;
+}
+
+static inline int br_get_bit(br_state *br)
+{
+  if (br->index >= br->count)
+    return 1; // -> no infinite colomb's ...
+
+  int r = (br->data[br->index >> 3] >> (7 - (br->index & 7))) & 1;
+  br->index++;
+  return r;
+}
+
+static inline uint32_t br_get_bits(br_state *br, uint32_t n)
+{
+  uint32_t r = 0;
+  while (n--)
+    r = r | (br_get_bit(br) << n);
+  return r;
+}
+
+static inline void br_skip_bits(br_state *br, int n)
+{
+  br->index += n;
+}
+
+static inline uint32_t br_get_ue_golomb(br_state *br)
+{
+  int n = 0;
+  while (!br_get_bit(br) && (n < 32))
+    n++;
+  return n ? ((1 << n) - 1) + br_get_bits(br, n) : 0;
+}
+
+static inline int32_t br_get_se_golomb(br_state *br)
+{
+  uint32_t r = br_get_ue_golomb(br) + 1;
+  return (r & 1) ? -(r >> 1) : (r >> 1);
+}
+
+static inline void br_skip_golomb(br_state *br)
+{
+  int n = 0;
+  while (!br_get_bit(br) && (n < 32))
+    n++;
+  br_skip_bits(br, n);
+}
+
+static inline void br_byte_align(br_state *br)
+{
+  int n = br->index % 8;
+  if (n > 0)
+     br_skip_bits(br, 8 - n);
+}
+
+static bool h264_parse_sps(const uint8_t *buf, int len, h264_sps_data_t *sps)
+{
+  br_state br = BR_INIT(buf, len);
+  int profile_idc, pic_order_cnt_type;
+  int frame_mbs_only;
+  int i, j;
+
+  profile_idc = br_get_u8(&br);
+  
+  //Dprintf("H.264 SPS: profile_idc %d", profile_idc);
+  
+  br_skip_bits(&br, 16);
+  br_skip_ue_golomb(&br);            // seq_parameter_set_id
+  if (profile_idc >= 100) {
+     if (br_get_ue_golomb(&br) == 3) // chroma_format_idc
+        br_skip_bit(&br);            // residual_colour_transform_flag
+     br_skip_ue_golomb(&br);         // bit_depth_luma - 8
+     br_skip_ue_golomb(&br);         // bit_depth_chroma - 8
+     br_skip_bit(&br);               // transform_bypass
+     if (br_get_bit(&br)) {          // seq_scaling_matrix_present
+        for (i = 0; i < 8; i++) {  
+            if (br_get_bit(&br)) {   // seq_scaling_list_present
+               int last = 8, next = 8, size = (i < 6) ? 16 : 64;
+               for (j = 0; j < size; j++) {
+                   if (next)
+                      next = (last + br_get_se_golomb(&br)) & 0xff;
+                   last = next ?: last;
+                   }
+               }
+            }
+        }
+     }
+
+  br_skip_ue_golomb(&br);            // log2_max_frame_num - 4
+  pic_order_cnt_type = br_get_ue_golomb(&br);
+  if (pic_order_cnt_type == 0)
+     br_skip_ue_golomb(&br);         // log2_max_poc_lsb - 4
+  else if (pic_order_cnt_type == 1) {
+     br_skip_bit(&br);               // delta_pic_order_always_zero
+     br_skip_se_golomb(&br);         // offset_for_non_ref_pic
+     br_skip_se_golomb(&br);         // offset_for_top_to_bottom_field
+     j = br_get_ue_golomb(&br);      // num_ref_frames_in_pic_order_cnt_cycle
+     for (i = 0; i < j; i++)
+         br_skip_se_golomb(&br);     // offset_for_ref_frame[i]
+     }
+  br_skip_ue_golomb(&br);            // ref_frames
+  br_skip_bit(&br);                  // gaps_in_frame_num_allowed
+  sps->width      = br_get_ue_golomb(&br) + 1; // mbs
+  sps->height     = br_get_ue_golomb(&br) + 1; // mbs
+  frame_mbs_only  = br_get_bit(&br);
+
+  //Dprintf("H.264 SPS: pic_width:  %u mbs", (unsigned int)sps->width);
+  //Dprintf("H.264 SPS: pic_height: %u mbs", (unsigned int)sps->height);
+  //Dprintf("H.264 SPS: frame only flag: %d", frame_mbs_only);
+
+  sps->width  *= 16;
+  sps->height *= 16 * (2 - frame_mbs_only);
+
+  if (!frame_mbs_only) {
+    if (br_get_bit(&br)) {           // mb_adaptive_frame_field_flag
+       //Dprintf("H.264 SPS: MBAFF");
+       }
+    }
+
+  br_skip_bit(&br);                  // direct_8x8_inference_flag
+  if (br_get_bit(&br)) {             // frame_cropping_flag
+    uint32_t crop_left   = br_get_ue_golomb(&br);
+    uint32_t crop_right  = br_get_ue_golomb(&br);
+    uint32_t crop_top    = br_get_ue_golomb(&br);
+    uint32_t crop_bottom = br_get_ue_golomb(&br);
+    //Dprintf("H.264 SPS: cropping %d %d %d %d", crop_left, crop_top, crop_right, crop_bottom);
+
+    sps->width -= 2 * (crop_left + crop_right);
+    if (frame_mbs_only)
+       sps->height -= 2 * (crop_top + crop_bottom); 
+    else
+       sps->height -= 4 * (crop_top + crop_bottom);
+    }
+
+  // VUI parameters
+  sps->aspect_ratio = VIDEO_ASPECT_RATIO_INVALID;
+  sps->format = VIDEO_FORMAT_INVALID;
+  if (br_get_bit(&br)) {             // vui_parameters_present_flag
+     if (br_get_bit(&br)) {          // aspect_ratio_info_present
+        uint32_t aspect_ratio_idc = br_get_u8(&br);
+        //Dprintf("H.264 SPS: aspect_ratio_idc %d", aspect_ratio_idc);
+        if (aspect_ratio_idc == 255) { // extended sar
+           br_skip_bit(&br);           // sar_width
+           br_skip_bit(&br);           // sar_height
+           sps->aspect_ratio = VIDEO_ASPECT_RATIO_EXTENDED;
+           //Dprintf("H.264 SPS: aspect ratio extended");
+           }
+        else if (aspect_ratio_idc < sizeof(aspect_ratios) / sizeof(aspect_ratios[0])) {
+           sps->aspect_ratio = aspect_ratios[aspect_ratio_idc];
+           //Dprintf("H.264 SPS: -> aspect ratio %d", sps->aspect_ratio);
+           }
+        }
+     if (br_get_bit(&br))            // overscan_info_present_flag
+        br_skip_bit(&br);            // overscan_approriate_flag
+     if (br_get_bit(&br)) {          // video_signal_type_present_flag
+        uint32_t video_format = br_get_bits(&br, 3);
+        if (video_format < sizeof(video_formats) / sizeof(video_formats[0])) {
+           sps->format = video_formats[video_format];
+           //Dprintf("H.264 SPS: -> video format %d", sps->format);
+           }
+        }
+     }
+
+  //Dprintf("H.264 SPS: -> video size %dx%d, aspect %d", sps->width, sps->height, sps->aspect_ratio);
+
+  if (BR_EOF(&br)) {
+     //Dprintf("H.264 SPS: not enough data ?");
+     return false;
+     }
+  
+  return true;
+}
+
+static bool h264_parse_sei(const uint8_t *buf, int len, h264_sei_data_t *sei)
+{
+  int num_referenced_subseqs, i;
+  br_state br = BR_INIT(buf, len);
+
+  while (!BR_EOF(&br)) { // sei_message
+    int lastByte, payloadSize = 0, payloadType = 0;
+
+    // last_payload_type_byte
+    do {
+       lastByte = br_get_u8(&br) & 0xFF;
+       payloadType += lastByte;
+    } while (lastByte == 0xFF);
+
+    // last_payload_size_byte
+    do {
+       lastByte = br_get_u8(&br) & 0xFF;
+       payloadSize += lastByte;
+    } while (lastByte == 0xFF);
+
+    switch (payloadType) {                             // sei_payload
+      //case 1:                                        // pic_timing
+      //     ...
+      //     switch (br_get_bits(&br, 2)) {            // ct_type
+      //       case 0:
+      //            sei->scan = VIDEO_SCAN_PROGRESSIVE;
+      //            break;
+      //       case 1:
+      //            sei->scan = VIDEO_SCAN_INTERLACED;
+      //            break;
+      //       case 2:
+      //            sei->scan = VIDEO_SCAN_UNKNOWN;
+      //            break;
+      //       default:
+      //            sei->scan = VIDEO_SCAN_RESERVED;
+      //            break;
+      //       }
+      //     break;
+
+      case 12:                                         // sub_seq_characteristics
+           br_skip_ue_golomb(&br);                     // sub_seq_layer_num
+           br_skip_ue_golomb(&br);                     // sub_seq_id
+           if (br_get_bit(&br))                        // duration_flag
+              br_skip_bits(&br, 32);                   // sub_seq_duration
+           if (br_get_bit(&br)) {                      // average_rate_flag
+              br_skip_bit(&br);                        // accurate_statistics_flag
+              sei->bitrate = br_get_u16(&br);          // average_bit_rate
+              sei->frame_rate = br_get_u16(&br);       // average_frame_rate
+              //Dprintf("H.264 SEI: -> stream bitrate %.1f, frame rate %.1f", sei->bitrate, sei->frame_rate);
+              }
+           num_referenced_subseqs = br_get_ue_golomb(&br); // num_referenced_subseqs
+           for (i = 0; i < num_referenced_subseqs; ++i) {
+               br_skip_ue_golomb(&br);                 // ref_sub_seq_layer_num
+               br_skip_ue_golomb(&br);                 // ref_sub_seq_id
+               br_get_bit(&br);                        // ref_sub_seq_direction
+               }
+           break;
+
+      default:
+           br_skip_bits(&br, payloadSize);
+           break;
+      }
+
+    // force byte align
+    br_byte_align(&br);
+    }
+
+  return true;
+}
+
+static int h264_nal_unescape(uint8_t *dst, const uint8_t *src, int len)
+{
+  int s = 0, d = 0;
+
+  while (s < len) {
+    if (!src[s] && !src[s + 1]) {
+       // hit 00 00 xx
+       dst[d] = dst[d + 1] = 0;
+       s += 2;
+       d += 2;
+       if (src[s] == 3) {
+          s++; // 00 00 03 xx --> 00 00 xx
+          if (s >= len)
+             return d;
+          }
+       }
+    dst[d++] = src[s++];
+    }
+    
+  return d;
+}
+
+static int h264_get_picture_type(const uint8_t *buf, int len)
+{
+  for (int i = 0; i < (len - 5); ++i) {
+      if (buf[i] == 0 && buf[i + 1] == 0 && buf[i + 2] == 1 && buf[i + 3] == NAL_AUD) {
+         uint8_t type = (uint8_t)(buf[i + 4] >> 5);
+         switch (type) {
+           case 0: case 3: case 5: return I_FRAME;
+           case 1: case 4: case 6: return P_FRAME;
+           case 2: case 7:         return B_FRAME;
+           default:;
+           }
+         }
+      }
+  return NO_PICTURE;
+}
+
+bool getH264VideoInfo(uint8_t *buf, int len, video_info_t *info)
+{
+  bool sps_found = false, sei_found = true; // sei currently disabled
+
+  // H.264 detection, search for NAL AUD
+  if (!IS_NAL_AUD(buf))
+     return false;
+
+  // If I-frame, search for NAL SPS
+  if (h264_get_picture_type(buf, len) != I_FRAME)
+     return false;
+
+  info->codec = VIDEO_CODEC_H264;
+
+  // Scan video packet ...
+  for (int i = 5; i < len - 4; i++) {
+      // ... for sequence parameter set
+      if (!sps_found && (buf[i] == 0x00) && (buf[i + 1] == 0x00) && (buf[i + 2] == 0x01) && (buf[i + 3] & 0x1f) == NAL_SPS) {
+         uint8_t nal_data[len];
+         int nal_len;
+         //Dprintf("H.264: Found NAL SPS at offset %d/%d", i, len);
+         if (0 < (nal_len = h264_nal_unescape(nal_data, buf + i + 4, len - i - 4))) {
+            h264_sps_data_t sps = { 0, 0, VIDEO_ASPECT_RATIO_INVALID, VIDEO_FORMAT_INVALID };
+            if (h264_parse_sps(nal_data, nal_len, &sps)) {
+               info->format = sps.format;
+               info->width = sps.width;
+               info->height = sps.height;
+               info->aspectRatio = sps.aspect_ratio;
+               sps_found = true;
+               }
+            }
+         }
+      // ... for supplemental enhancement information
+      if (!sei_found && (buf[i] == 0x00) && (buf[i + 1] == 0x00) && (buf[i + 2] == 0x01) && (buf[i + 3] & 0x1f) == NAL_SEI) {
+         uint8_t nal_data[len];
+         int nal_len;
+         //Dprintf("H.264: Found NAL SEI at offset %d/%d", i, len);
+         if (0 < (nal_len = h264_nal_unescape(nal_data, buf + i + 4, len - i - 4))) {
+            h264_sei_data_t sei = { 0, 0, VIDEO_SCAN_INVALID };
+            if (h264_parse_sei(nal_data, nal_len, &sei)) {
+               info->frameRate = sei.frame_rate;
+               info->bitrate = sei.bitrate;
+               info->scan = sei.scan;
+               sei_found = true;
+               }
+            }
+         }
+      if (sps_found && sei_found)
+         break;
+      }
+
+  return true;
+}

femonh264.h

@@ -0,0 +1,15 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONH264_H
+#define __FEMONH264_H
+
+#include "femonvideo.h"
+
+bool getH264VideoInfo(uint8_t *buf, int len, video_info_t *info);
+
+#endif //__FEMONH264_H

femonmpeg.c

@@ -0,0 +1,184 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include "femontools.h"
+#include "femonmpeg.h"
+
+#define IS_MPEG_AUDIO(buf)      (((buf)[0] == 0xFF) && ((buf)[1] & 0xF0))
+#define IS_SEQUENCE_HEADER(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == 0xB3))
+
+static unsigned int bitrates[2][3][16] =
+{
+  {
+    {0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, -1}, // MPEG-2 Layer I
+    {0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1}, // MPEG-2 Layer II/III
+    {0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1}  // MPEG-2 Layer II/III
+  },
+  {
+    {0,  32,  64,  96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1}, // MPEG-1 Layer I
+    {0,  32,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 384, -1}, // MPEG-1 Layer II
+    {0,  32,  40,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, -1}  // MPEG-1 Layer III
+  }
+};
+
+static unsigned int samplerates[2][4] =
+{
+  {22050, 24000, 16000, -1}, // MPEG-2
+  {44100, 48000, 32000, -1}  // MPEG-1
+};
+
+static eAudioCodec formats[2][4] =
+{
+  {AUDIO_CODEC_MPEG2_I, AUDIO_CODEC_MPEG2_II, AUDIO_CODEC_MPEG2_III, AUDIO_CODEC_UNKNOWN}, // MPEG-2
+  {AUDIO_CODEC_MPEG1_I, AUDIO_CODEC_MPEG1_II, AUDIO_CODEC_MPEG1_III, AUDIO_CODEC_UNKNOWN}  // MPEG-1
+};
+
+bool getMPEGAudioInfo(uint8_t *buf, int len, audio_info_t *info)
+{
+  // MPEG audio detection, search for syncword
+  if ((len < 4) || !IS_MPEG_AUDIO(buf))
+     return false;
+
+  int mpegIndex = (buf[1] & 0x08) >> 3;        // MPEG-2=0, MPEG-1=1
+  int layerIndex = 3 - ((buf[1] & 0x06) >> 1); // I=11, II=10, III=01 
+  int bitrateIndex = (buf[2] & 0xF0) >> 4;
+  int frequency = (buf[2] & 0x0C) >> 2;
+  int channelMode = (buf[3] & 0xC0) >> 6;
+
+  info->codec = formats[mpegIndex][layerIndex];
+
+  switch (channelMode) {
+    case 0:
+         info->channelMode = AUDIO_CHANNEL_MODE_STEREO;
+         break;
+         
+    case 1:
+         info->channelMode = AUDIO_CHANNEL_MODE_JOINT_STEREO;
+         break;
+
+    case 2:
+         info->channelMode = AUDIO_CHANNEL_MODE_DUAL;
+         break;
+
+    case 3:
+         info->channelMode = AUDIO_CHANNEL_MODE_SINGLE;
+         break;
+
+    default:
+         info->channelMode = AUDIO_CHANNEL_MODE_INVALID;
+         break;
+  }
+
+  switch (bitrateIndex) {
+    case 0:
+         info->bitrate = AUDIO_BITRATE_FREE;
+         break;
+         
+    case 0xF:
+         info->bitrate = AUDIO_BITRATE_RESERVED;
+         break;
+
+    default:
+         info->bitrate = 1000 * bitrates[mpegIndex][layerIndex][bitrateIndex];
+         break;
+  }
+  
+  switch (frequency) {
+    case 3:
+         info->samplingFrequency = AUDIO_SAMPLING_FREQUENCY_RESERVED;
+         break;
+
+    default:
+         info->samplingFrequency = samplerates[mpegIndex][frequency];
+         break;
+  }
+
+  return true;
+}
+
+bool getMPEGVideoInfo(uint8_t *buf, int len, video_info_t *info)
+{
+  // MPEG-2 video detection, search for sequence header
+  if ((len < 7) || !IS_SEQUENCE_HEADER(buf))
+     return false;
+
+  // Parse header   
+  uint8_t *data = buf + 4;
+  info->codec = VIDEO_CODEC_MPEG2;
+  info->width = ((data[1] & 0xF0) >> 4) | (data[0] << 4);
+  info->height = ((data[1] & 0x0F) << 8) | (data[2]);
+  switch ((data[3] & 0xF0) >> 4) {
+    case 1:
+      info->aspectRatio = VIDEO_ASPECT_RATIO_1_1;
+      break;
+    case 2:
+      info->aspectRatio = VIDEO_ASPECT_RATIO_4_3;
+      break;
+    case 3:
+      info->aspectRatio = VIDEO_ASPECT_RATIO_16_9;
+      break;
+    case 4:
+      info->aspectRatio = VIDEO_ASPECT_RATIO_2_21_1;
+      break;
+    case 5 ... 15:
+    default:
+      info->aspectRatio = VIDEO_ASPECT_RATIO_RESERVED;
+      break;
+    }
+  // Video scan should be read from progressive_sequence field in sequence extension
+  switch (data[3] & 0x0F) {
+    case 1:
+      info->frameRate   = 24000 / 1001.0;
+      info->scan        = VIDEO_SCAN_PROGRESSIVE;
+      info->format      = VIDEO_FORMAT_UNKNOWN;
+      break;
+    case 2:
+      info->frameRate   = 24.0;
+      info->scan        = VIDEO_SCAN_PROGRESSIVE;
+      info->format      = VIDEO_FORMAT_UNKNOWN;
+      break;
+    case 3:
+      info->frameRate   = 25.0;
+      info->scan        = VIDEO_SCAN_UNKNOWN;  // interlaced or progressive
+      info->format      = VIDEO_FORMAT_PAL;
+      break;
+    case 4:
+      info->frameRate   = 30000 / 1001.0;
+      info->scan        = VIDEO_SCAN_UNKNOWN; // interlaced or progressive
+      info->format      = VIDEO_FORMAT_NTSC;
+      break;
+    case 5:
+      info->frameRate   = 30.0;
+      info->scan        = VIDEO_SCAN_UNKNOWN;  // interlaced or progressive
+      info->format      = VIDEO_FORMAT_NTSC;
+      break;
+    case 6:
+      info->frameRate   = 50.0;
+      info->scan        = VIDEO_SCAN_PROGRESSIVE;
+      info->format      = VIDEO_FORMAT_PAL;
+      break;
+    case 7:
+      info->frameRate   = 60.0;
+      info->scan        = VIDEO_SCAN_PROGRESSIVE;
+      info->format      = VIDEO_FORMAT_NTSC;
+      break;
+    case 8:
+      info->frameRate   = 60000 / 1001.0;
+      info->scan        = VIDEO_SCAN_PROGRESSIVE;
+      info->format      = VIDEO_FORMAT_NTSC;
+      break;
+    case 9 ... 15:
+    default:
+      info->frameRate   = 0;
+      info->scan        = VIDEO_SCAN_UNKNOWN;
+      info->format      = VIDEO_FORMAT_UNKNOWN;
+      break;
+    }
+  info->bitrate = 400.0 * (double)(((data[4] << 10) & 0x0003FC00UL) | ((data[5] << 2) & 0x000003FCUL) | (((data[6] & 0xC0) >> 6) & 0x00000003UL));
+
+  return true;
+}

femonmpeg.h

@@ -0,0 +1,17 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONMPEG_H
+#define __FEMONMPEG_H
+
+#include "femonaudio.h"
+#include "femonvideo.h"
+
+bool getMPEGAudioInfo(uint8_t *buf, int len, audio_info_t *info);
+bool getMPEGVideoInfo(uint8_t *buf, int len, video_info_t *info);
+
+#endif //__FEMONMPEG_H

femonosd.c

@@ -3,51 +3,26 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
  */
 
 #include <ctype.h>
 #include "femoncfg.h"
 #include "femonreceiver.h"
 #include "femontools.h"
+#include "femonsymbol.h"
 #include "femonosd.h"
 
-#include "symbols/device.xpm"
-#include "symbols/stereo.xpm"
-#include "symbols/monoleft.xpm"
-#include "symbols/monoright.xpm"
-#include "symbols/zero.xpm"
-#include "symbols/one.xpm"
-#include "symbols/two.xpm"
-#include "symbols/three.xpm"
-#include "symbols/four.xpm"
-#include "symbols/five.xpm"
-#include "symbols/svdrp.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"
-#include "symbols/lock.xpm"
-#include "symbols/signal.xpm"
-#include "symbols/carrier.xpm"
-#include "symbols/viterbi.xpm"
-#include "symbols/sync.xpm"
-
 #define CHANNELINPUT_TIMEOUT      1000
+#define SVDRPPLUGIN               "svdrpservice"
 
 #define OSDHEIGHT                 femonConfig.osdheight   // in pixels
 #define OSDWIDTH                  600                     // in pixels
 #define OSDROWHEIGHT              m_Font->Height()        // in pixels
-#define OSDINFOHEIGHT             (OSDROWHEIGHT * 12)     // in pixels (12 rows)
+#define OSDINFOHEIGHT             (OSDROWHEIGHT * 13)     // in pixels (13 rows)
 #define OSDSTATUSHEIGHT           (OSDROWHEIGHT * 6)      // in pixels (6 rows)
 #define OSDSPACING                5
-#define OSDCORNERING              10
+#define OSDROUNDING               10
-#define IS_OSDCORNERING           (femonConfig.skin == eFemonSkinElchi)
+#define IS_OSDROUNDING            (femonConfig.skin == eFemonSkinElchi)
 
 #define OSDINFOWIN_Y(offset)      (femonConfig.position ? (OSDHEIGHT - OSDINFOHEIGHT + offset) : offset)
 #define OSDINFOWIN_X(col)         ((col == 4) ? 455 : (col == 3) ? 305 : (col == 2) ? 155 : 15)
@@ -56,38 +31,113 @@
 #define OSDSTATUSWIN_XSYMBOL(c,w) (c * ((OSDWIDTH - (5 * w)) / 6) + ((c - 1) * w))
 #define OSDBARWIDTH(x)            (OSDWIDTH * x / 100)
 
-#define SVDRPPLUGIN               "svdrpservice"
+#define OSDDRAWSTATUSBM(spacing) \
+        if (bm) { \
+           x -= bm->Width() + spacing; \
+           y = (OSDROWHEIGHT - bm->Height()) / 2; \
+           if (y < 0) y = 0; \
+           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset) + y, *bm, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground); \
+           }
 
-cBitmap cFemonOsd::bmDevice(device_xpm);
+#define OSDDRAWSTATUSFRONTEND(column, bitmap, status) \
-cBitmap cFemonOsd::bmStereo(stereo_xpm);
+        m_Osd->DrawBitmap(OSDSTATUSWIN_XSYMBOL(column, x), OSDSTATUSWIN_Y(offset) + y, bitmap, (m_FrontendStatus & status) ? femonTheme[femonConfig.theme].clrActiveText : femonTheme[femonConfig.theme].clrRed, femonTheme[femonConfig.theme].clrBackground)
-cBitmap cFemonOsd::bmMonoLeft(monoleft_xpm);
+
-cBitmap cFemonOsd::bmMonoRight(monoright_xpm);
+#define OSDDRAWSTATUSVALUES(label1, label2, label3, label4, label5, label6, label7) \
-cBitmap cFemonOsd::bmNumbers[MAX_BMNUMBERS] = {
+        m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), label1, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
-   cBitmap(zero_xpm),  cBitmap(one_xpm),  cBitmap(two_xpm),
+        m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), label2, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
-   cBitmap(three_xpm), cBitmap(four_xpm), cBitmap(five_xpm)
+        m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), label3, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
+        m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), label4, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
+        m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), label5, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
+        m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), label6, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
+        m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), label7, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font)
+
+#define OSDDRAWSTATUSBAR(value) \
+        if (value > 0) { \
+           value = OSDBARWIDTH(value); \
+           m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset) + 3, min(OSDBARWIDTH(femonConfig.redlimit), value), OSDSTATUSWIN_Y(offset) + OSDROWHEIGHT - 3, femonTheme[femonConfig.theme].clrRed); \
+           if (value > OSDBARWIDTH(femonConfig.redlimit)) \
+              m_Osd->DrawRectangle(OSDBARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset) + 3, min((OSDWIDTH * femonConfig.greenlimit / 100), value), OSDSTATUSWIN_Y(offset) + OSDROWHEIGHT - 3, femonTheme[femonConfig.theme].clrYellow); \
+           if (value > OSDBARWIDTH(femonConfig.greenlimit)) \
+              m_Osd->DrawRectangle(OSDBARWIDTH(femonConfig.greenlimit), OSDSTATUSWIN_Y(offset) + 3, value, OSDSTATUSWIN_Y(offset) + OSDROWHEIGHT - 3, femonTheme[femonConfig.theme].clrGreen); \
+           }
+
+#define OSDDRAWSTATUSTITLEBAR(title) \
+        m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset) + OSDROWHEIGHT - 1, femonTheme[femonConfig.theme].clrTitleBackground); \
+        m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), title, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font); \
+        if (IS_OSDROUNDING) { \
+           m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(0), OSDROUNDING, OSDSTATUSWIN_Y(OSDROUNDING), clrTransparent, -2); \
+           m_Osd->DrawEllipse(OSDWIDTH - OSDROUNDING, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDROUNDING), clrTransparent, -1); \
+           } \
+        m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset) + OSDROWHEIGHT, OSDWIDTH, OSDSTATUSWIN_Y(offset) + OSDSTATUSHEIGHT - 1, femonTheme[femonConfig.theme].clrBackground)
+
+#define OSDDRAWSTATUSBOTTOMBAR() \
+        if (IS_OSDROUNDING) { \
+           m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT) - OSDROUNDING, OSDROUNDING, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -3); \
+           m_Osd->DrawEllipse(OSDWIDTH - OSDROUNDING, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT) - OSDROUNDING, OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -4); \
+           }
+
+#define OSDCLEARSTATUS() \
+        m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT) - 1, clrTransparent)
+
+#define OSDDRAWINFOLEFT(label, value) \
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), label, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
+        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), value, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font)
+
+#define OSDDRAWINFORIGHT(label, value) \
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), label, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
+        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), value, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font)
+
+#define OSDDRAWINFOACTIVE(label, value) \
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), label, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), value, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font)
+
+#define OSDDRAWINFOINACTIVE(label, value) \
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), label, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
+        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), value, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font)
+
+#define OSDDRAWINFOLINE(label) \
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), label, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font)
+
+#define OSDDRAWINFOTITLEBAR(title) \
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset) + OSDROWHEIGHT - 1, femonTheme[femonConfig.theme].clrTitleBackground); \
+        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), title, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font); \
+        if (IS_OSDROUNDING) { \
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDROUNDING, OSDINFOWIN_Y(OSDROUNDING), clrTransparent, -2); \
+           m_Osd->DrawEllipse(OSDWIDTH - OSDROUNDING, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDROUNDING), clrTransparent, -1); \
+           } \
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset) + OSDROWHEIGHT, OSDWIDTH, OSDINFOWIN_Y(offset) + OSDINFOHEIGHT - 1, femonTheme[femonConfig.theme].clrBackground)
+
+#define OSDDRAWINFOBOTTOMBAR() \
+        if (IS_OSDROUNDING) { \
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT) - OSDROUNDING, OSDROUNDING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3); \
+           m_Osd->DrawEllipse((OSDWIDTH - OSDROUNDING), OSDINFOWIN_Y(OSDINFOHEIGHT) - OSDROUNDING, OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4); \
+           }
+
+#define OSDCLEARINFO() \
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT) - 1, clrTransparent)
+
+#ifndef MINFONTSIZE
+#define MINFONTSIZE 10
+#endif
+
+#ifndef MAXFONTSIZE
+#define MAXFONTSIZE 64
+#endif
+
+class cFemonDummyFont : public cFont {
+public:
+  virtual int Width(uint c) const { return 10; }
+  virtual int Width(const char *s) const { return 50; }
+  virtual int Height(void) const { return 20; }
+  virtual void DrawText(cBitmap *Bitmap, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int Width) const {}
 };
-cBitmap cFemonOsd::bmSVDRP(svdrp_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);
-cBitmap cFemonOsd::bmLock(lock_xpm);
-cBitmap cFemonOsd::bmSignal(signal_xpm);
-cBitmap cFemonOsd::bmCarrier(carrier_xpm);
-cBitmap cFemonOsd::bmViterbi(viterbi_xpm);
-cBitmap cFemonOsd::bmSync(sync_xpm);
 
 cFemonOsd *cFemonOsd::pInstance = NULL;
 
 cFemonOsd *cFemonOsd::Instance(bool create)
 {
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  if (pInstance == NULL && create)
+  if ((pInstance == NULL) && create)
   {
      pInstance = new cFemonOsd();
   }
@@ -95,34 +145,34 @@ cFemonOsd *cFemonOsd::Instance(bool create)
 }
 
 cFemonOsd::cFemonOsd()
-:cOsdObject(true), cThread("femon osd")
+: cOsdObject(true), cThread("femon osd"),
+  m_Osd(NULL),
+  m_Receiver(NULL),
+  m_Frontend(-1),
+  m_SvdrpFrontend(-1),
+  m_SvdrpVideoBitrate(-1),
+  m_SvdrpAudioBitrate(-1),
+  m_SvdrpPlugin(NULL),
+  m_Number(0),
+  m_OldNumber(0),
+  m_SNR(0),
+  m_Signal(0),
+  m_BER(0),
+  m_UNC(0),
+  m_DisplayMode(femonConfig.displaymode),
+  m_InputTime(0),
+  m_Sleep(),
+  m_Mutex()
 {
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  m_Osd = NULL;
-  m_Receiver = NULL;
-  m_Frontend = -1;
-  m_SvdrpVideoBitrate = -1.0;
-  m_SvdrpAudioBitrate = -1.0;
-  m_SvdrpFrontend = -1;
   m_SvdrpConnection.handle = -1;
-  m_SvdrpPlugin = NULL;
+  m_Font = cFont::CreateFont(Setup.FontSml, min(max(Setup.FontSmlSize, MINFONTSIZE), MAXFONTSIZE));
-  m_Number = 0;
+  if (!m_Font || !m_Font->Height()) {
-  m_OldNumber = 0;
+     m_Font = new cFemonDummyFont;
-  m_Signal = 0;
+     esyslog("ERROR: cFemonOsd::cFemonOsd() cannot create required font.");
-  m_SNR = 0;
-  m_BER = 0;
-  m_UNC = 0;
-  m_DisplayMode = femonConfig.displaymode;
-  m_InputTime.Set(0);
-  m_Mutex = new cMutex();
-  if (Setup.UseSmallFont == 0) {
-     // Dirty hack to force the small fonts...
-     Setup.UseSmallFont = 1;
-     m_Font = cFont::GetFont(fontSml);
-     Setup.UseSmallFont = 0;
      }
-  else
+  if (OSDHEIGHT < (OSDINFOHEIGHT + OSDROWHEIGHT + OSDSTATUSHEIGHT))
-     m_Font = cFont::GetFont(fontSml);
+     OSDHEIGHT = (OSDINFOHEIGHT + OSDROWHEIGHT + OSDSTATUSHEIGHT);
 }
 
 cFemonOsd::~cFemonOsd(void)
@@ -136,373 +186,265 @@ cFemonOsd::~cFemonOsd(void)
      if (m_SvdrpPlugin)
         m_SvdrpPlugin->Service("SvdrpConnection-v1.0", &m_SvdrpConnection);
      }
-  if (m_Receiver)
+  if (m_Receiver) {
-     delete m_Receiver;
+     m_Receiver->Deactivate();
+     DELETENULL(m_Receiver);
+     }
   if (m_Osd)
-     delete m_Osd;
+     DELETENULL(m_Osd);
+  if (m_Font)
+     DELETENULL(m_Font);
+  if (m_Frontend >= 0) {
+     close(m_Frontend);
+     m_Frontend = -1;
+     }
   pInstance = NULL;
 }
 
 void cFemonOsd::DrawStatusWindow(void)
 {
-  cMutexLock lock(m_Mutex);
+  cMutexLock lock(&m_Mutex);
-  unsigned int number = 0;
   cBitmap *bm = NULL;
   int snr = m_SNR / 655;
   int signal = m_Signal / 655;
   int offset = 0;
-  int x = OSDWIDTH - OSDCORNERING;
+  int x = OSDWIDTH - OSDROUNDING;
   int y = 0;
   eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
 
   if (m_Osd && channel) {
-     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), femonTheme[femonConfig.theme].clrBackground);
+     OSDDRAWSTATUSTITLEBAR(*cString::sprintf("%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->ShortName(true)));
-     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset), OSDWIDTH, OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground);
-     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), *cString::sprintf("%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->ShortName(true)), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
-     if (IS_OSDCORNERING) {
-        m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(0), OSDCORNERING, OSDSTATUSWIN_Y(OSDCORNERING), clrTransparent, -2);
-        m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDCORNERING), clrTransparent, -1);
-        }
      if (m_SvdrpFrontend >= 0) {
-        x -= bmSVDRP.Width() + OSDSPACING;
+        bm = &bmSymbol[SYMBOL_SVDRP];
-        y = (OSDROWHEIGHT - bmSVDRP.Height()) / 2;
+        OSDDRAWSTATUSBM(OSDSPACING);
-        if (y < 0) y = 0;
-        m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmSVDRP, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
         }
-    number = cDevice::ActualDevice()->CardIndex();
+     switch (cDevice::ActualDevice()->CardIndex()) {
-    if (number < MAX_BMNUMBERS) {
+       case 1:  bm = &bmSymbol[SYMBOL_ONE];   break;
-       x -= bmNumbers[number].Width() + OSDSPACING;
+       case 2:  bm = &bmSymbol[SYMBOL_TWO];   break;
-       y = (OSDROWHEIGHT - bmNumbers[number].Height()) / 2;
+       case 3:  bm = &bmSymbol[SYMBOL_THREE]; break;
-       if (y < 0) y = 0;
+       case 4:  bm = &bmSymbol[SYMBOL_FOUR];  break;
-       m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmNumbers[number], femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
+       case 5:  bm = &bmSymbol[SYMBOL_FIVE];  break;
-       x -= bmDevice.Width();
+       case 6:  bm = &bmSymbol[SYMBOL_SIX];   break;
-       y = (OSDROWHEIGHT - bmDevice.Height()) / 2;
+       case 7:  bm = &bmSymbol[SYMBOL_SEVEN]; break;
-       if (y < 0) y = 0;
+       default: bm = &bmSymbol[SYMBOL_ZERO];  break;
-       m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
        }
+     OSDDRAWSTATUSBM(OSDSPACING);
+     bm = &bmSymbol[SYMBOL_DEVICE];
+     OSDDRAWSTATUSBM(0);
      if (IS_AUDIO_TRACK(track)) {
-        number = int(track - ttAudioFirst);
+        switch (int(track - ttAudioFirst)) {
-        if (number < MAX_BMNUMBERS) {
+           case 1:  bm = &bmSymbol[SYMBOL_ONE];   break;
-           x -= bmNumbers[number].Width() + OSDSPACING;
+           case 2:  bm = &bmSymbol[SYMBOL_TWO];   break;
-           y = (OSDROWHEIGHT - bmNumbers[number].Height()) / 2;
+           case 3:  bm = &bmSymbol[SYMBOL_THREE]; break;
-           if (y < 0) y = 0;
+           case 4:  bm = &bmSymbol[SYMBOL_FOUR];  break;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmNumbers[number], femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
+           case 5:  bm = &bmSymbol[SYMBOL_FIVE];  break;
+           case 6:  bm = &bmSymbol[SYMBOL_SIX];   break;
+           case 7:  bm = &bmSymbol[SYMBOL_SEVEN]; break;
+           default: bm = &bmSymbol[SYMBOL_ZERO];  break;
            }
+        OSDDRAWSTATUSBM(OSDSPACING);
         switch (cDevice::PrimaryDevice()->GetAudioChannel()) {
-           case 1:  bm = &bmMonoLeft;  break;
+           case 1:  bm = &bmSymbol[SYMBOL_MONO_LEFT];  break;
-           case 2:  bm = &bmMonoRight; break;
+           case 2:  bm = &bmSymbol[SYMBOL_MONO_RIGHT]; break;
-           default: bm = &bmStereo;    break;
+           default: bm = &bmSymbol[SYMBOL_STEREO];     break;
-           }
-        if (bm) {
-           x -= bm->Width();
-           y = (OSDROWHEIGHT - bm->Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), *bm, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
            }
+        OSDDRAWSTATUSBM(0);
         }
      else if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
-        if (m_Receiver->AC3_5_1())      bm = &bmDD51;
+        if      (m_Receiver->AC3_5_1()) bm = &bmSymbol[SYMBOL_DD51];
-        else if (m_Receiver->AC3_2_0()) bm = &bmDD20;
+        else if (m_Receiver->AC3_2_0()) bm = &bmSymbol[SYMBOL_DD20];
-        else                            bm = &bmDD;
+        else                            bm = &bmSymbol[SYMBOL_DD];
-        if (bm) {
+        OSDDRAWSTATUSBM(OSDSPACING);
-           x -= bm->Width() + OSDSPACING;
-           y = (OSDROWHEIGHT - bm->Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), *bm, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
-           }
         }
      if (m_Receiver) {
+        switch (m_Receiver->VideoCodec()) {
+           case VIDEO_CODEC_MPEG2: bm = &bmSymbol[SYMBOL_MPEG2]; break;
+           case VIDEO_CODEC_H264:  bm = &bmSymbol[SYMBOL_H264];  break;
+           default:                bm = NULL;                    break;
+           }
+        OSDDRAWSTATUSBM(OSDSPACING);
         switch (m_Receiver->VideoFormat()) {
-           case VF_PAL:  bm = &bmPAL;  break;
+           case VIDEO_FORMAT_PAL:  bm = &bmSymbol[SYMBOL_PAL];  break;
-           case VF_NTSC: bm = &bmNTSC; break;
+           case VIDEO_FORMAT_NTSC: bm = &bmSymbol[SYMBOL_NTSC]; break;
-           default:      bm = NULL;    break;
+           default:                bm = NULL;                   break;
-           }
-        if (bm) {
-           x -= bm->Width() + OSDSPACING;
-           y = (OSDROWHEIGHT - bm->Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), *bm, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
            }
+        OSDDRAWSTATUSBM(OSDSPACING);
         switch (m_Receiver->VideoAspectRatio()) {
-           case AR_1_1:    bm = &bmAspectRatio_1_1;    break;
+           case VIDEO_ASPECT_RATIO_1_1:    bm = &bmSymbol[SYMBOL_AR_1_1];    break;
-           case AR_4_3:    bm = &bmAspectRatio_4_3;    break;
+           case VIDEO_ASPECT_RATIO_4_3:    bm = &bmSymbol[SYMBOL_AR_4_3];    break;
-           case AR_16_9:   bm = &bmAspectRatio_16_9;   break;
+           case VIDEO_ASPECT_RATIO_16_9:   bm = &bmSymbol[SYMBOL_AR_16_9];   break;
-           case AR_2_21_1: bm = &bmAspectRatio_2_21_1; break;
+           case VIDEO_ASPECT_RATIO_2_21_1: bm = &bmSymbol[SYMBOL_AR_2_21_1]; break;
-           default:        bm = NULL;                  break;
+           default:                        bm = NULL;                        break;
-           }
-        if (bm) {
-           x -= bm->Width() + OSDSPACING;
-           y = (OSDROWHEIGHT - bm->Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), *bm, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
            }
+        OSDDRAWSTATUSBM(OSDSPACING);
+        }
+     if (channel->Ca() > 0xFF) {
+        bm = &bmSymbol[SYMBOL_ENCRYPTED];
+        OSDDRAWSTATUSBM(OSDSPACING);
         }
      offset += OSDROWHEIGHT;
-     if (signal > 0) {
+     OSDDRAWSTATUSBAR(signal);
-        signal = OSDBARWIDTH(signal);
-        m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset+3), min(OSDBARWIDTH(femonConfig.redlimit), signal), OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-3), femonTheme[femonConfig.theme].clrRed);
-        if (signal > OSDBARWIDTH(femonConfig.redlimit)) {
-           m_Osd->DrawRectangle(OSDBARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min((OSDWIDTH * femonConfig.greenlimit / 100), signal), OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-3), femonTheme[femonConfig.theme].clrYellow);
-           }
-        if (signal > OSDBARWIDTH(femonConfig.greenlimit)) {
-           m_Osd->DrawRectangle(OSDBARWIDTH(femonConfig.greenlimit), OSDSTATUSWIN_Y(offset+3), signal, OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-3), femonTheme[femonConfig.theme].clrGreen);
-           }
-        }
      offset += OSDROWHEIGHT;
-     if (snr > 0) {
+     OSDDRAWSTATUSBAR(snr);
-        snr = OSDBARWIDTH(snr);
-        m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(offset+3), min(OSDBARWIDTH(femonConfig.redlimit), snr), OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-3), femonTheme[femonConfig.theme].clrRed);
-        if (snr > OSDBARWIDTH(femonConfig.redlimit)) {
-           m_Osd->DrawRectangle(OSDBARWIDTH(femonConfig.redlimit), OSDSTATUSWIN_Y(offset+3), min(OSDBARWIDTH(femonConfig.greenlimit), snr), OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-3), femonTheme[femonConfig.theme].clrYellow);
-           }
-        if (snr > OSDBARWIDTH(femonConfig.greenlimit)) {
-           m_Osd->DrawRectangle(OSDBARWIDTH(femonConfig.greenlimit),  OSDSTATUSWIN_Y(offset+3), snr, OSDSTATUSWIN_Y(offset+OSDROWHEIGHT-3), femonTheme[femonConfig.theme].clrGreen);
-           }
-        }
      offset += OSDROWHEIGHT;
-     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "STR:", femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+     OSDDRAWSTATUSVALUES("STR:", *cString::sprintf("%04x", m_Signal), *cString::sprintf("(%2d%%)", m_Signal / 655), "BER:", *cString::sprintf("%08x", m_BER),
-     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), *cString::sprintf("%04x", m_Signal), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                         *cString::sprintf("%s:", tr("Video")), *getBitrateMbits(m_Receiver ? m_Receiver->VideoBitrate() : (m_SvdrpFrontend >= 0 ? m_SvdrpVideoBitrate : -1.0)));
-     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), *cString::sprintf("(%2d%%)", m_Signal / 655), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "BER:", femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), *cString::sprintf("%08x", m_BER), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), *cString::sprintf("%s:", tr("Video")), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), *getBitrateMbits(m_Receiver ? m_Receiver->VideoBitrate() : (m_SvdrpFrontend >= 0 ? m_SvdrpVideoBitrate : -1.0)), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
      offset += OSDROWHEIGHT;
-     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "SNR:", femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+     OSDDRAWSTATUSVALUES("SNR:", *cString::sprintf("%04x", m_SNR), *cString::sprintf("(%2d%%)", m_SNR / 655), "UNC:", *cString::sprintf("%08x", m_UNC),
-     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), *cString::sprintf("%04x", m_SNR), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                         *cString::sprintf("%s:", (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) ? tr("AC-3") : tr("Audio")),
-     m_Osd->DrawText(OSDSTATUSWIN_X(3), OSDSTATUSWIN_Y(offset), *cString::sprintf("(%2d%%)", m_SNR / 655), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                         *getBitrateKbits(m_Receiver ? ((m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) ? m_Receiver->AC3Bitrate() : m_Receiver->AudioBitrate()) : (m_SvdrpFrontend >= 0 ? m_SvdrpAudioBitrate : -1.0)));
-     m_Osd->DrawText(OSDSTATUSWIN_X(4), OSDSTATUSWIN_Y(offset), "UNC:", femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(5), OSDSTATUSWIN_Y(offset), *cString::sprintf("%08x", m_UNC), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(6), OSDSTATUSWIN_Y(offset), *cString::sprintf("%s:", (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) ? tr("AC-3") : tr("Audio")), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(7), OSDSTATUSWIN_Y(offset), *getBitrateKbits(m_Receiver ? ((m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) ? m_Receiver->AC3Bitrate() : m_Receiver->AudioBitrate()) : (m_SvdrpFrontend >= 0 ? m_SvdrpAudioBitrate : -1.0)), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
      offset += OSDROWHEIGHT;
-     x = bmLock.Width();
+     x = bmSymbol[SYMBOL_LOCK].Width();
-     y = (OSDROWHEIGHT - bmLock.Height()) / 2;
+     y = (OSDROWHEIGHT - bmSymbol[SYMBOL_LOCK].Height()) / 2;
-     m_Osd->DrawBitmap(OSDSTATUSWIN_XSYMBOL(1, x), OSDSTATUSWIN_Y(offset + y), bmLock, (m_FrontendStatus & FE_HAS_LOCK) ? femonTheme[femonConfig.theme].clrActiveText : femonTheme[femonConfig.theme].clrRed, femonTheme[femonConfig.theme].clrBackground);
+     OSDDRAWSTATUSFRONTEND(1, bmSymbol[SYMBOL_LOCK],    FE_HAS_LOCK);
-     m_Osd->DrawBitmap(OSDSTATUSWIN_XSYMBOL(2, x), OSDSTATUSWIN_Y(offset + y), bmSignal, (m_FrontendStatus & FE_HAS_SIGNAL) ? femonTheme[femonConfig.theme].clrActiveText : femonTheme[femonConfig.theme].clrRed, femonTheme[femonConfig.theme].clrBackground);
+     OSDDRAWSTATUSFRONTEND(2, bmSymbol[SYMBOL_SIGNAL],  FE_HAS_SIGNAL);
-     m_Osd->DrawBitmap(OSDSTATUSWIN_XSYMBOL(3, x), OSDSTATUSWIN_Y(offset + y), bmCarrier, (m_FrontendStatus & FE_HAS_CARRIER) ? femonTheme[femonConfig.theme].clrActiveText : femonTheme[femonConfig.theme].clrRed, femonTheme[femonConfig.theme].clrBackground);
+     OSDDRAWSTATUSFRONTEND(3, bmSymbol[SYMBOL_CARRIER], FE_HAS_CARRIER);
-     m_Osd->DrawBitmap(OSDSTATUSWIN_XSYMBOL(4, x), OSDSTATUSWIN_Y(offset + y), bmViterbi, (m_FrontendStatus & FE_HAS_VITERBI) ? femonTheme[femonConfig.theme].clrActiveText : femonTheme[femonConfig.theme].clrRed, femonTheme[femonConfig.theme].clrBackground);
+     OSDDRAWSTATUSFRONTEND(4, bmSymbol[SYMBOL_VITERBI], FE_HAS_VITERBI);
-     m_Osd->DrawBitmap(OSDSTATUSWIN_XSYMBOL(5, x), OSDSTATUSWIN_Y(offset + y), bmSync, (m_FrontendStatus & FE_HAS_SYNC) ? femonTheme[femonConfig.theme].clrActiveText : femonTheme[femonConfig.theme].clrRed, femonTheme[femonConfig.theme].clrBackground);
+     OSDDRAWSTATUSFRONTEND(5, bmSymbol[SYMBOL_SYNC],    FE_HAS_SYNC);
-     if (IS_OSDCORNERING) {
+     OSDDRAWSTATUSBOTTOMBAR();
-        m_Osd->DrawEllipse(0, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-OSDCORNERING), OSDCORNERING, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -3);
-        m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-OSDCORNERING), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), clrTransparent, -4);
-        }
      m_Osd->Flush();
      }
 }
 
 void cFemonOsd::DrawInfoWindow(void)
 {
-  cMutexLock lock(m_Mutex);
+  cMutexLock lock(&m_Mutex);
   int offset = 0;
   cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
   eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
 
   if (m_Osd && channel) {
-     if (m_DisplayMode == eFemonModeTransponder) {
+     switch (m_DisplayMode) {
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground);
+       case eFemonModeTransponder:
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground);
+            OSDDRAWINFOTITLEBAR(tr("Transponder Information"));
-        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Transponder Information"), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
+            offset += OSDROWHEIGHT;
-        if (IS_OSDCORNERING) {
+            OSDDRAWINFOLEFT( trVDR("Vpid"), *cString::sprintf("%d", channel->Vpid()));
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
+            OSDDRAWINFORIGHT(trVDR("Ppid"), *cString::sprintf("%d", channel->Ppid()));
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
+            offset += OSDROWHEIGHT;
-           }
+            OSDDRAWINFOLEFT(    tr("Apid"), *getApids(channel));
-        offset += OSDROWHEIGHT;
+            OSDDRAWINFORIGHT(   tr("Dpid"), *getDpids(channel));
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Vpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Vpid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFOLEFT(    tr("Spid"), *getSpids(channel));
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Ppid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFORIGHT(trVDR("Tpid"), *cString::sprintf("%d", channel->Tpid()));
-        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Ppid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            offset += OSDROWHEIGHT;
-        offset += OSDROWHEIGHT;
+            OSDDRAWINFOLEFT( trVDR("Sid"),  *cString::sprintf("%d", channel->Sid()));
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFORIGHT(   tr("Nid"),  *cString::sprintf("%d", channel->Nid()));
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getApids(channel), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFOLEFT(    tr("Tid"),  *cString::sprintf("%d", channel->Tid()));
-        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getDpids(channel), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFORIGHT(   tr("Rid"),  *cString::sprintf("%d", channel->Rid()));
-        offset += OSDROWHEIGHT;
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Spid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFOLEFT( trVDR("CA"),   *getCAids(channel));
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getSpids(channel), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Tpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            switch (channel->Source() & cSource::st_Mask) {
-        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Tpid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+              case cSource::stSat:
-        offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLINE(*cString::sprintf("DVB-S #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Sid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Sid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Nid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFORIGHT(trVDR("Source"),       *cSource::ToString(channel->Source()));
-        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Nid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   offset += OSDROWHEIGHT;
-        offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Srate"),        *cString::sprintf("%d", channel->Srate()));
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Tid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFORIGHT(trVDR("Polarization"), *cString::sprintf("%c", toupper(channel->Polarization())));
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Tid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Rid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFOLEFT( trVDR("Inversion"),    *getInversion(channel->Inversion()));
-        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Rid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFORIGHT(trVDR("CoderateH"),    *getCoderate(channel->CoderateH()));
-        offset += OSDROWHEIGHT;
+                   break;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("CA"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getCAids(channel, femonConfig.showcasystem), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        offset += OSDROWHEIGHT;
-        switch (m_FrontendInfo.type) {
-          case FE_QPSK:
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), *cString::sprintf("%s #%d - %s", tr("Satellite Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getFrequencyMHz(channel->Frequency()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Source"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cSource::ToString(channel->Source()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Srate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Srate()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Polarization"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%c", toupper(channel->Polarization())), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Inversion"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getInversion(channel->Inversion()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("CoderateH"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getCoderate(channel->CoderateH()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               break;
 
-          case FE_QAM:
+              case cSource::stCable:
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), *cString::sprintf("%s #%d - %s", tr("Cable Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFOLINE(*cString::sprintf("DVB-C #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
-               offset += OSDROWHEIGHT;
+                   offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getFrequencyMHz(channel->Frequency()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFORIGHT(trVDR("Source"),       *cSource::ToString(channel->Source()));
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Source"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cSource::ToString(channel->Source()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFOLEFT( trVDR("Srate"),        *cString::sprintf("%d", channel->Srate()));
-               offset += OSDROWHEIGHT;
+                   OSDDRAWINFORIGHT(trVDR("Modulation"),   *getModulation(channel->Modulation()));
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Srate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Srate()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFOLEFT( trVDR("Inversion"),    *getInversion(channel->Inversion()));
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Modulation"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFORIGHT(trVDR("CoderateH"),    *getCoderate(channel->CoderateH()));
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getModulation(channel->Modulation()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   break;
-               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Inversion"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getInversion(channel->Inversion()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("CoderateH"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getCoderate(channel->CoderateH()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               break;
 
-          case FE_OFDM:
+              case cSource::stTerr:
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), *cString::sprintf("%s #%d - %s", tr("Terrestrial Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFOLINE(*cString::sprintf("DVB-T #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
-               offset += OSDROWHEIGHT;
+                   offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getFrequencyMHz(channel->Frequency()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFORIGHT(trVDR("Transmission"), *getTransmission(channel->Transmission()));
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Transmission"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getTransmission(channel->Transmission()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFOLEFT( trVDR("Bandwidth"),    *getBandwidth(channel->Bandwidth()));
-               offset += OSDROWHEIGHT;
+                   OSDDRAWINFORIGHT(trVDR("Modulation"),   *getModulation(channel->Modulation()));
-               m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Bandwidth"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getBandwidth(channel->Bandwidth()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFOLEFT( trVDR("Inversion"),    *getInversion(channel->Inversion()));
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Modulation"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFORIGHT(tr   ("Coderate"),     *cString::sprintf("%s (H) %s (L)", *getCoderate(channel->CoderateH()), *getCoderate(channel->CoderateL())));
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getModulation(channel->Modulation()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   offset += OSDROWHEIGHT;
-               offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Hierarchy"),    *getHierarchy(channel->Hierarchy()));
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Inversion"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   OSDDRAWINFORIGHT(trVDR("Guard"),        *getGuard(channel->Guard()));
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getInversion(channel->Inversion()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+                   break;
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Coderate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%s (H) %s (L)", *getCoderate(channel->CoderateH()), *getCoderate(channel->CoderateL())), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), trVDR("Hierarchy"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getHierarchy(channel->Hierarchy()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), trVDR("Guard"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getGuard(channel->Guard()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               break;
 
-          default:
+              default:
-               break;
+                   break;
-          }
+              }
-        if (IS_OSDCORNERING) {
+            OSDDRAWINFOBOTTOMBAR();
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDCORNERING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3);
+            break;
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4);
+
-           }
+       case eFemonModeStream:
-        }
+            OSDDRAWINFOTITLEBAR(tr("Stream Information"));
-     else if (m_DisplayMode == eFemonModeStream) {
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground);
+            OSDDRAWINFOACTIVE(  tr("Video Stream"),       *getVideoStream(channel->Vpid()));
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground);
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Stream Information"), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
+            OSDDRAWINFOINACTIVE(tr("Codec"),              *getVideoCodec(m_Receiver ? m_Receiver->VideoCodec() : VIDEO_CODEC_INVALID));
-        if (IS_OSDCORNERING) {
+            offset += OSDROWHEIGHT;
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
+            OSDDRAWINFOINACTIVE(tr("Bitrate"),            *getVideoBitrate(m_Receiver ? m_Receiver->VideoBitrate() : 0, m_Receiver ? m_Receiver->VideoStreamBitrate() : 0));
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
+            offset += OSDROWHEIGHT;
-           }
+            OSDDRAWINFOINACTIVE(tr("Aspect Ratio"),       *getAspectRatio(m_Receiver ? m_Receiver->VideoAspectRatio() : VIDEO_ASPECT_RATIO_INVALID));
-        offset += OSDROWHEIGHT;
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Stream"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFOINACTIVE(tr("Frame Rate"),         *getFrameRate(m_Receiver ? m_Receiver->VideoFrameRate() : 0));
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("#%d", channel->Vpid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            offset += OSDROWHEIGHT;
-        offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Video Format"),       *getVideoFormat(m_Receiver ? m_Receiver->VideoFormat() : VIDEO_CODEC_INVALID));
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), m_Receiver ? *cString::sprintf("%s (%s)", *getBitrateMbits(m_Receiver->VideoStreamBitrate()), *getBitrateMbits(m_Receiver->VideoBitrate())) : *cString::sprintf("---"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFOINACTIVE(tr("Resolution"),         *getResolution(m_Receiver ? m_Receiver->VideoHorizontalSize() : 0, m_Receiver ? m_Receiver->VideoVerticalSize() : 0, m_Receiver ? m_Receiver->VideoScan() : VIDEO_SCAN_INVALID));
-        offset += OSDROWHEIGHT;
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Aspect Ratio"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFOACTIVE(  tr("Audio Stream"),       *getAudioStream(track, channel));
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAspectRatio(m_Receiver ? m_Receiver->VideoAspectRatio() : -1), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            offset += OSDROWHEIGHT;
-        offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Codec"),              *getAudioCodec(m_Receiver ? m_Receiver->AudioCodec() : AUDIO_CODEC_INVALID));
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Rate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), m_Receiver ? *cString::sprintf("%.2f %s", m_Receiver->VideoFrameRate(), tr("Hz")) : *cString::sprintf("---"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFOINACTIVE(tr("Channel Mode"),       *getAudioChannelMode(m_Receiver ? m_Receiver->AudioChannelMode() : AUDIO_CHANNEL_MODE_INVALID));
-        offset += OSDROWHEIGHT;
+            offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Format"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFOINACTIVE(tr("Bitrate"),            *getAudioBitrate(m_Receiver ? m_Receiver->AudioBitrate() : 0, m_Receiver ? m_Receiver->AudioStreamBitrate() : 0));
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getVideoFormat(m_Receiver ? m_Receiver->VideoFormat() : -1), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            offset += OSDROWHEIGHT;
-        offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Sampling Frequency"), *getAudioSamplingFreq(m_Receiver ? m_Receiver->AudioSamplingFreq() : AUDIO_SAMPLING_FREQUENCY_INVALID));
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Resolution"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFOBOTTOMBAR();
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), m_Receiver ? *cString::sprintf("%d x %d", m_Receiver->VideoHorizontalSize(), m_Receiver->VideoVerticalSize()) : *cString::sprintf("---"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            break;
-        offset += OSDROWHEIGHT;
+
-        offset += OSDROWHEIGHT;
+       case eFemonModeAC3:
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Stream"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            OSDDRAWINFOTITLEBAR(tr("Stream Information"));
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("#%d %s", IS_AUDIO_TRACK(track) ? channel->Apid(int(track - ttAudioFirst)) : channel->Apid(0), IS_AUDIO_TRACK(track) ? channel->Alang(int(track - ttAudioFirst)) : channel->Alang(0)), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+            if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
-        offset += OSDROWHEIGHT;
+               offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               OSDDRAWINFOACTIVE(  tr("AC-3 Stream"),            *getAC3Stream(track, channel));
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAudioBitrate(m_Receiver ? m_Receiver->AudioBitrate() : (double)FR_NOTVALID, m_Receiver ? m_Receiver->AudioStreamBitrate() : (double)FR_NOTVALID), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               offset += OSDROWHEIGHT;
-        offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("Bitrate"),                *getAudioBitrate(m_Receiver->AC3Bitrate(), m_Receiver->AC3StreamBitrate()));
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("MPEG Layer"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), m_Receiver ? *cString::sprintf("%d", m_Receiver->AudioMPEGLayer()) : *cString::sprintf("---"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               OSDDRAWINFOINACTIVE(tr("Sampling Frequency"),     *getAudioSamplingFreq(m_Receiver->AC3SamplingFreq()));
-        offset += OSDROWHEIGHT;
+               offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               OSDDRAWINFOINACTIVE(tr("Bit Stream Mode"),        *getAC3BitStreamMode(m_Receiver->AC3BitStreamMode(), m_Receiver->AC3AudioCodingMode()));
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAudioSamplingFreq(m_Receiver ? m_Receiver->AudioSamplingFreq() : FR_NOTVALID), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+               offset += OSDROWHEIGHT;
-        if (IS_OSDCORNERING) {
+               OSDDRAWINFOINACTIVE(tr("Audio Coding Mode"),      *getAC3AudioCodingMode(m_Receiver->AC3AudioCodingMode(), m_Receiver->AC3BitStreamMode()));
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDCORNERING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3);
+               offset += OSDROWHEIGHT;
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4);
+               OSDDRAWINFOINACTIVE(tr("Center Mix Level"),       *getAC3CenterMixLevel(m_Receiver->AC3CenterMixLevel()));
-           }
+               offset += OSDROWHEIGHT;
-        }
+               OSDDRAWINFOINACTIVE(tr("Surround Mix Level"),     *getAC3SurroundMixLevel(m_Receiver->AC3SurroundMixLevel()));
-     else if (m_DisplayMode == eFemonModeAC3) {
+               offset += OSDROWHEIGHT;
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground);
+               OSDDRAWINFOINACTIVE(tr("Dolby Surround Mode"),    *getAC3DolbySurroundMode(m_Receiver->AC3DolbySurroundMode()));
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(offset), OSDWIDTH, OSDINFOWIN_Y(offset+OSDROWHEIGHT-1), femonTheme[femonConfig.theme].clrTitleBackground);
+               offset += OSDROWHEIGHT;
-        m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Stream Information"), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
+               OSDDRAWINFOINACTIVE(tr("Low Frequency Effects"),  *cString::sprintf("%s", m_Receiver->AC3Lfe() ? tr("on") : tr("off")));
-        if (IS_OSDCORNERING) {
+               offset += OSDROWHEIGHT;
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
+               OSDDRAWINFOINACTIVE(tr("Dialogue Normalization"), *getAC3DialogLevel(m_Receiver->AC3DialogLevel()));
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
+               }
-           }
+            OSDDRAWINFOBOTTOMBAR();
-        offset += OSDROWHEIGHT;
+            break;
-        if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
+
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("AC-3 Stream"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+       default:
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("#%d %s", channel->Dpid(int(track - ttDolbyFirst)), channel->Dlang(int(track - ttDolbyFirst))), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
+            OSDCLEARINFO();
-           offset += OSDROWHEIGHT;
+            break;
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bitrate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
+       }
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("%s (%s)", *getBitrateKbits(m_Receiver->AC3StreamBitrate()), *getBitrateKbits(m_Receiver->AC3Bitrate())), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           offset += OSDROWHEIGHT;
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sampling Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("%.1f %s", m_Receiver->AC3SamplingFreq() / 1000., tr("kHz")), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           offset += OSDROWHEIGHT;
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Size"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("%d", m_Receiver->AC3FrameSize()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           offset += OSDROWHEIGHT;
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bit Stream Mode"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAC3BitStreamMode(m_Receiver->AC3BitStreamMode(), m_Receiver->AC3AudioCodingMode()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           offset += OSDROWHEIGHT;
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Coding Mode"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAC3AudioCodingMode(m_Receiver->AC3AudioCodingMode(), m_Receiver->AC3BitStreamMode()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           offset += OSDROWHEIGHT;
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Center Mix Level"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAC3CenterMixLevel(m_Receiver->AC3CenterMixLevel()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           offset += OSDROWHEIGHT;
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Surround Mix Level"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAC3SurroundMixLevel(m_Receiver->AC3SurroundMixLevel()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           offset += OSDROWHEIGHT;
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dolby Surround Mode"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAC3DolbySurroundMode(m_Receiver->AC3DolbySurroundMode()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           offset += OSDROWHEIGHT;
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Low Frequency Effects"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *cString::sprintf("%s", m_Receiver->AC3LfeOn() ? tr("on") : tr("off")), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           offset += OSDROWHEIGHT;
-           m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Dialogue Normalization"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), *getAC3DialogLevel(m_Receiver->AC3DialogLevel()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-           }
-        if (IS_OSDCORNERING) {
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDCORNERING, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -3);
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(OSDINFOHEIGHT-OSDCORNERING), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent, -4);
-           }
-        }
-     else /* eFemonModeBasic */ {
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
-        }
      m_Osd->Flush();
      }
 }
@@ -532,28 +474,28 @@ void cFemonOsd::Action(void)
        m_SvdrpPlugin->Service("SvdrpCommand-v1.0", &cmd);
        if (cmd.responseCode == 900) {
           for (cLine *line = cmd.reply.First(); line; line = cmd.reply.Next(line)) {
-             const char *s = line->Text();
+              const char *s = line->Text();
-	      if (strncasecmp(s, "CARD:", 5) == 0)
+	      if (!strncasecmp(s, "CARD:", 5))
-                m_SvdrpFrontend = strtol(s + 5, NULL, 10);
+                 m_SvdrpFrontend = (int)strtol(s + 5, NULL, 10);
-             else if (strncasecmp(s, "TYPE:", 5) == 0)
+              else if (!strncasecmp(s, "TYPE:", 5))
-                m_FrontendInfo.type = (fe_type_t) strtol(s + 5, NULL, 10);
+                 m_FrontendInfo.type = (fe_type_t)strtol(s + 5, NULL, 10);
-             else if (strncasecmp(s, "NAME:", 5) == 0)
+              else if (!strncasecmp(s, "NAME:", 5))
-                strn0cpy(m_FrontendInfo.name, s + 5, sizeof(m_FrontendInfo.name));
+                 strn0cpy(m_FrontendInfo.name, s + 5, sizeof(m_FrontendInfo.name));
-             else if (strncasecmp(s, "STAT:", 5) == 0)
+              else if (!strncasecmp(s, "STAT:", 5))
-                m_FrontendStatus = (fe_status_t) strtol(s + 5, NULL, 16);
+                 m_FrontendStatus = (fe_status_t)strtol(s + 5, NULL, 16);
-             else if (strncasecmp(s, "SGNL:", 5) == 0)
+              else if (!strncasecmp(s, "SGNL:", 5))
-                m_Signal = strtol(s + 5, NULL, 16);
+                 m_Signal = (uint16_t)strtol(s + 5, NULL, 16);
-             else if (strncasecmp(s, "SNRA:", 5) == 0)
+              else if (!strncasecmp(s, "SNRA:", 5))
-                m_SNR = strtol(s + 5, NULL, 16);
+                 m_SNR = (uint16_t)strtol(s + 5, NULL, 16);
-             else if (strncasecmp(s, "BERA:", 5) == 0)
+              else if (!strncasecmp(s, "BERA:", 5))
-                m_BER = strtol(s + 5, NULL, 16);
+                 m_BER = (uint32_t)strtol(s + 5, NULL, 16);
-             else if (strncasecmp(s, "UNCB:", 5) == 0)
+              else if (!strncasecmp(s, "UNCB:", 5))
-                m_UNC = strtol(s + 5, NULL, 16);
+                 m_UNC = (uint32_t)strtol(s + 5, NULL, 16);
-             else if (strncasecmp(s, "VIBR:", 5) == 0)
+              else if (!strncasecmp(s, "VIBR:", 5))
-                m_SvdrpVideoBitrate = strtol(s + 5, NULL, 10);
+                 m_SvdrpVideoBitrate = (double)strtol(s + 5, NULL, 10);
-             else if (strncasecmp(s, "AUBR:", 5) == 0)
+              else if (!strncasecmp(s, "AUBR:", 5))
-                m_SvdrpAudioBitrate = strtol(s + 5, NULL, 10);
+                 m_SvdrpAudioBitrate = (double)strtol(s + 5, NULL, 10);
-             }
+              }
           }
        DrawInfoWindow();
        DrawStatusWindow();
@@ -589,21 +531,23 @@ void cFemonOsd::Show(void)
 
   m_Osd = cOsdProvider::NewOsd(((cOsd::OsdWidth() - OSDWIDTH) / 2) + cOsd::OsdLeft() + femonConfig.osdoffset, ((cOsd::OsdHeight() - OSDHEIGHT) / 2) + cOsd::OsdTop());
   if (m_Osd) {
-     // try to use single 8bpp area
+     tArea Areas1[] = { { 0, 0, OSDWIDTH - 1, OSDHEIGHT - 1, 8 } };
-     tArea Areas1[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, 8 } };
+     if (Setup.AntiAlias && m_Osd->CanHandleAreas(Areas1, sizeof(Areas1) / sizeof(tArea)) == oeOk) {
-     if (femonConfig.usesinglearea && m_Osd->CanHandleAreas(Areas1, sizeof(Areas1) / sizeof(tArea)) == oeOk) {
         m_Osd->SetAreas(Areas1, sizeof(Areas1) / sizeof(tArea));
         }
      else {
-        tArea Areas2[] = { { 0, OSDSTATUSWIN_Y(0),          (OSDWIDTH-1), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT-1), femonTheme[femonConfig.theme].bpp },
+        tArea Areas2[] = { { 0, OSDSTATUSWIN_Y(0),          OSDWIDTH - 1, OSDSTATUSWIN_Y(0) + OSDSTATUSHEIGHT - 1, femonTheme[femonConfig.theme].bpp },
-                           { 0, OSDINFOWIN_Y(0),            (OSDWIDTH-1), OSDINFOWIN_Y(OSDROWHEIGHT-1),      femonTheme[femonConfig.theme].bpp },
+                           { 0, OSDINFOWIN_Y(0),            OSDWIDTH - 1, OSDINFOWIN_Y(0)   + OSDROWHEIGHT    - 1, femonTheme[femonConfig.theme].bpp },
-                           { 0, OSDINFOWIN_Y(OSDROWHEIGHT), (OSDWIDTH-1), OSDINFOWIN_Y(OSDINFOHEIGHT-1),     2 } };
+                           { 0, OSDINFOWIN_Y(OSDROWHEIGHT), OSDWIDTH - 1, OSDINFOWIN_Y(0)   + OSDINFOHEIGHT   - 1, 2                                 } };
         m_Osd->SetAreas(Areas2, sizeof(Areas2) / sizeof(tArea));
         }
-     m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
+     OSDCLEARSTATUS();
+     OSDCLEARINFO();
      m_Osd->Flush();
-     if (m_Receiver)
+     if (m_Receiver) {
-        delete m_Receiver;
+        m_Receiver->Deactivate();
+        DELETENULL(m_Receiver);
+        }
      if (femonConfig.analyzestream) {
         cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
         if (channel) {
@@ -645,8 +589,10 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
      return;
      }
 
-  if (m_Receiver)
+  if (m_Receiver) {
-     delete m_Receiver;
+     m_Receiver->Deactivate();
+     DELETENULL(m_Receiver);
+     }
   if (femonConfig.analyzestream) {
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
      if (channel) {
@@ -664,8 +610,10 @@ void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks)
   int apid[2] = {0, 0};
   int dpid[2] = {0, 0};
   eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-  if (m_Receiver)
+  if (m_Receiver) {
-     delete m_Receiver;
+     m_Receiver->Deactivate();
+     DELETENULL(m_Receiver);
+     }
   if (femonConfig.analyzestream) {
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
      if (channel) {
@@ -717,7 +665,7 @@ bool cFemonOsd::SvdrpConnect(void)
       m_SvdrpPlugin = cPluginManager::GetPlugin(SVDRPPLUGIN);
       if (m_SvdrpPlugin) {
          m_SvdrpConnection.serverIp = femonConfig.svdrpip;
-         m_SvdrpConnection.serverPort = femonConfig.svdrpport;
+         m_SvdrpConnection.serverPort = (unsigned short)femonConfig.svdrpport;
          m_SvdrpConnection.shared = true;
          m_SvdrpPlugin->Service("SvdrpConnection-v1.0", &m_SvdrpConnection);
          if (m_SvdrpConnection.handle >= 0) {
@@ -912,6 +860,6 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
             break;
        }
      state = osContinue;
-  }
+     }
   return state;
 }

femonosd.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
  */
 
 #ifndef __FEMONOSD_H
@@ -21,38 +20,34 @@
 #include <vdr/tools.h>
 #include "svdrpservice.h"
 
-#define MAX_BM_NUMBER 5
+#define MAX_BM_NUMBER 8
 
 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
-  enum { MAX_BMNUMBERS = 6 };
   static cFemonOsd *pInstance;
-  cOsd *m_Osd;
+
-  cFemonReceiver *m_Receiver;
+  cOsd             *m_Osd;
-  int m_Frontend;
+  cFemonReceiver   *m_Receiver;
-  int m_SvdrpFrontend;
+  int               m_Frontend;
-  double m_SvdrpVideoBitrate;
+  int               m_SvdrpFrontend;
-  double m_SvdrpAudioBitrate;
+  double            m_SvdrpVideoBitrate;
+  double            m_SvdrpAudioBitrate;
   SvdrpConnection_v1_0 m_SvdrpConnection;
-  cPlugin *m_SvdrpPlugin;
+  cPlugin          *m_SvdrpPlugin;
-  struct dvb_frontend_info m_FrontendInfo;
+  dvb_frontend_info m_FrontendInfo;
-  int m_Number;
+  int               m_Number;
-  int m_OldNumber;
+  int               m_OldNumber;
-  uint16_t m_SNR;
+  uint16_t          m_SNR;
-  uint16_t m_Signal;
+  uint16_t          m_Signal;
-  uint32_t m_BER;
+  uint32_t          m_BER;
-  uint32_t m_UNC;
+  uint32_t          m_UNC;
-  fe_status_t m_FrontendStatus;
+  fe_status_t       m_FrontendStatus;
-  int m_DisplayMode;
+  int               m_DisplayMode;
-  const cFont *m_Font;
+  cFont            *m_Font;
-  cTimeMs m_InputTime;
+  cTimeMs           m_InputTime;
-  cCondWait m_Sleep;
+  cCondWait         m_Sleep;
-  cMutex* m_Mutex;
+  cMutex            m_Mutex;
-  static cBitmap bmStereo, bmMonoLeft, bmMonoRight, bmDD, bmDD20, bmDD51;
+
-  static cBitmap bmNumbers[MAX_BMNUMBERS];
-  static cBitmap bmDevice, bmPAL, bmNTSC, bmSVDRP;
-  static cBitmap bmAspectRatio_1_1, bmAspectRatio_16_9, bmAspectRatio_2_21_1, bmAspectRatio_4_3;
-  static cBitmap bmLock, bmSignal, bmCarrier, bmViterbi, bmSync;
   void DrawStatusWindow(void);
   void DrawInfoWindow(void);
   bool SvdrpConnect(void);
@@ -73,10 +68,10 @@ public:
   virtual void Show(void);
   virtual eOSState ProcessKey(eKeys Key);
 
-  bool DeviceSwitch(int direction);
+  bool    DeviceSwitch(int direction);
-  double GetVideoBitrate(void);
+  double  GetVideoBitrate(void);
-  double GetAudioBitrate(void);
+  double  GetAudioBitrate(void);
-  double GetDolbyBitrate(void);
+  double  GetDolbyBitrate(void);
 };
 
 #endif //__FEMONOSD_H

femonreceiver.c

@@ -3,12 +3,15 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
  */
 
 #include <unistd.h>
 #include "femontools.h"
 #include "femoncfg.h"
+#include "femonmpeg.h"
+#include "femonaac.h"
+#include "femonac3.h"
+#include "femonh264.h"
 #include "femonreceiver.h"
 
 #define TS_SIZE       188
@@ -18,285 +21,153 @@
 #define PTS_DTS_FLAGS 0xC0
 
 cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[])
-:cReceiver(ChannelID, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
+: cReceiver(ChannelID, -1, Vpid, Apid, Dpid, NULL),
+  cThread("femon receiver"),
+  m_Sleep(),
+  m_Active(false),
+  m_VideoPid(Vpid),
+  m_VideoPacketCount(0),
+  m_VideoBitrate(0.0),
+  m_VideoValid(false),
+  m_VideoInfoBufferIndex(0),
+  m_AudioPid(Apid[0]),
+  m_AudioPacketCount(0),
+  m_AudioBitrate(0.0),
+  m_AudioValid(false),
+  m_AudioInfoBufferIndex(0),
+  m_AC3Pid(Dpid[0]),
+  m_AC3PacketCount(0), 
+  m_AC3Bitrate(0),
+  m_AC3Valid(false),
+  m_AC3InfoBufferIndex(0)
 {
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  m_VideoPid = Vpid;
+
-  m_AudioPid = Apid[0];
+  m_VideoInfo.codec = VIDEO_CODEC_INVALID;
-  m_AC3Pid = Dpid[0];
+  m_VideoInfo.format = VIDEO_FORMAT_INVALID;
-  m_VideoValid = false;
+  m_VideoInfo.scan = VIDEO_SCAN_INVALID;
-  m_VideoPacketCount = 0;
+  m_VideoInfo.aspectRatio = VIDEO_ASPECT_RATIO_INVALID;
-  m_VideoHorizontalSize = 0;
+  m_VideoInfo.width = 0;
-  m_VideoVerticalSize = 0;
+  m_VideoInfo.height = 0;
-  m_VideoAspectRatio = AR_RESERVED;
+  m_VideoInfo.frameRate = 0;
-  m_VideoFormat = VF_UNKNOWN;
+  m_VideoInfo.bitrate = AUDIO_BITRATE_INVALID;
-  m_VideoFrameRate = 0.0;
+  for (unsigned int i = 0; i < ELEMENTS(m_VideoInfoBuffer); ++i)
-  m_VideoStreamBitrate = 0.0;
+      memcpy(&m_VideoInfoBuffer[i], &m_VideoInfo, sizeof(video_info_t));
-  m_VideoBitrate = 0.0;
+
-  m_AudioValid = false;
+  m_AudioInfo.codec = AUDIO_CODEC_UNKNOWN;
-  m_AudioPacketCount = 0;
+  m_AudioInfo.bitrate = AUDIO_BITRATE_INVALID;
-  m_AudioStreamBitrate = -2.0;
+  m_AudioInfo.samplingFrequency = AUDIO_SAMPLING_FREQUENCY_INVALID;
-  m_AudioBitrate = 0.0;
+  m_AudioInfo.channelMode = AUDIO_CHANNEL_MODE_INVALID;
-  m_AudioSamplingFreq = -1;
+  for (unsigned int i = 0; i < ELEMENTS(m_AudioInfoBuffer); ++i)
-  m_AudioMPEGLayer = 0;
+      memcpy(&m_AudioInfoBuffer[i], &m_AudioInfo, sizeof(audio_info_t));
-  m_AudioBitrate = 0.0;
+
-  m_AC3Valid = false;
+  m_AC3Info.bitrate = AUDIO_BITRATE_INVALID;
-  m_AC3PacketCount = 0; 
+  m_AC3Info.samplingFrequency = AUDIO_SAMPLING_FREQUENCY_INVALID;
-  m_AC3StreamBitrate = 0;
+  m_AC3Info.bitstreamMode = AUDIO_BITSTREAM_MODE_INVALID;
-  m_AC3SamplingFreq = 0;
+  m_AC3Info.audioCodingMode = AUDIO_CODING_MODE_INVALID;
-  m_AC3Bitrate = 0;
+  m_AC3Info.dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
-  m_AC3FrameSize = 0;
+  m_AC3Info.centerMixLevel = AUDIO_CENTER_MIX_LEVEL_INVALID;
-  m_AC3BitStreamMode = FR_NOTVALID;
+  m_AC3Info.surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
-  m_AC3AudioCodingMode = FR_NOTVALID;
+  m_AC3Info.dialogLevel = 0;
-  m_AC3CenterMixLevel = FR_NOTVALID;
+  m_AC3Info.lfe = false;
-  m_AC3SurroundMixLevel = FR_NOTVALID;
+  for (unsigned int i = 0; i < ELEMENTS(m_AC3InfoBuffer); ++i)
-  m_AC3DolbySurroundMode = FR_NOTVALID;
+      memcpy(&m_AC3InfoBuffer[i], &m_AC3Info, sizeof(ac3_info_t));
-  m_AC3LfeOn = false;
-  m_AC3DialogLevel = FR_NOTVALID;
 }
- 
+
 cFemonReceiver::~cFemonReceiver(void)
 {
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  m_Sleep.Signal();
+  Deactivate();
-  if (Running())
-     Cancel(3);
-  Detach();
 }
 
-/* The following function originates from libdvbmpeg: */
+void cFemonReceiver::Deactivate(void)
-void cFemonReceiver::GetVideoInfo(uint8_t *mbuf, int count)
 {
-  uint8_t *headr;
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  int found = 0;
+  if (m_Active) {
-  int c = 0;
+     m_Active = false;
-  //m_VideoValid = false;
+     m_Sleep.Signal();
-  while ((found < 4) && ((c + 4) < count)) {
+     if (Running())
-    uint8_t *b;
+        Cancel(3);
-    b = mbuf + c;
+     Detach();
-    if ((b[0] == 0x00) && (b[1] == 0x00) && (b[2] == 0x01) && (b[3] == 0xb3))
+     }
-       found = 4;
-    else
-       c++;
-    }
-  if ((!found) || ((c + 16) >= count)) return;
-  m_VideoValid = true;
-  headr = mbuf + c + 4;
-  m_VideoHorizontalSize = ((headr[1] & 0xF0) >> 4) | (headr[0] << 4);
-  m_VideoVerticalSize = ((headr[1] & 0x0F) << 8) | (headr[2]);
-  int sw = (int)((headr[3] & 0xF0) >> 4);
-  switch ( sw ){
-    case 1:
-      m_VideoAspectRatio = AR_1_1;
-      break;
-    case 2:
-      m_VideoAspectRatio = AR_4_3;
-      break;
-    case 3:
-      m_VideoAspectRatio = AR_16_9;
-      break;
-    case 4:
-      m_VideoAspectRatio = AR_2_21_1;
-      break;
-    case 5 ... 15:
-    default:
-      m_VideoAspectRatio = AR_RESERVED;
-      break;
-    }
-  sw = (int)(headr[3] & 0x0F);
-  switch ( sw ) {
-    case 1:
-      m_VideoFrameRate = 24000 / 1001.0;
-      m_VideoFormat = VF_UNKNOWN;
-      break;
-    case 2:
-      m_VideoFrameRate = 24.0;
-      m_VideoFormat = VF_UNKNOWN;
-      break;
-    case 3:
-      m_VideoFrameRate = 25.0;
-      m_VideoFormat = VF_PAL;
-      break;
-    case 4:
-      m_VideoFrameRate = 30000 / 1001.0;
-      m_VideoFormat = VF_NTSC;
-      break;
-    case 5:
-      m_VideoFrameRate = 30.0;
-      m_VideoFormat = VF_NTSC;
-      break;
-    case 6:
-      m_VideoFrameRate = 50.0;
-      m_VideoFormat = VF_PAL;
-      break;
-    case 7:
-      m_VideoFrameRate = 60.0;
-      m_VideoFormat = VF_NTSC;
-      break;
-    case 8:
-      m_VideoFrameRate = 60000 / 1001.0;
-      m_VideoFormat = VF_NTSC;
-      break;
-    case 9 ... 15:
-    default:
-      m_VideoFrameRate = 0;
-      m_VideoFormat = VF_UNKNOWN;
-      break;
-    }
-  m_VideoStreamBitrate = 400.0 * (((headr[4] << 10) & 0x0003FC00UL) | ((headr[5] << 2) & 0x000003FCUL) | (((headr[6] & 0xC0) >> 6) & 0x00000003UL));
 }
 
-static unsigned int bitrates[3][16] =
+void cFemonReceiver::GetVideoInfo(uint8_t *buf, int len)
 {
-  {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0},
-  {0, 32, 48, 56, 64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 0},
-  {0, 32, 40, 48, 56,  64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 0}
-};
-
-static unsigned int samplerates[4] =
-{441, 480, 320, 0};
-
-/* The following function originates from libdvbmpeg: */
-void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count)
-{
-  uint8_t *headr;
-  int found = 0;
   int c = 0;
-  int tmp = 0;
+
-  //m_AudioValid = false;
+  while (c < len) {
-  while (!found && (c < count)) {
+    video_info_t tmp;
-    uint8_t *b = mbuf + c;
+    uint8_t *b = buf + c;
-    if ((b[0] == 0xff) && ((b[1] & 0xf8) == 0xf8))
+    if (getMPEGVideoInfo(b, len - c, &tmp) || getH264VideoInfo(b, len - c, &tmp)) {
-       found = 1;
+       bool coherent = true;
-    else
+       memcpy(&m_VideoInfoBuffer[m_VideoInfoBufferIndex], &tmp, sizeof(video_info_t));
-       c++;
+       m_VideoInfoBufferIndex = (m_VideoInfoBufferIndex + 1) % ELEMENTS(m_VideoInfoBuffer);
+       for (unsigned int i = 1; i < ELEMENTS(m_VideoInfoBuffer); ++i) {
+           if (memcmp(&m_VideoInfoBuffer[0], &m_VideoInfoBuffer[i], sizeof(video_info_t)))
+              coherent = false;
+              break;
+           }
+       if (!m_VideoValid || coherent) {
+          m_VideoValid = true;
+          memcpy(&m_VideoInfo, &m_VideoInfoBuffer[0], sizeof(video_info_t));
+          }
+       return;
+       }
+    c++;
+    }
+}
+
+void cFemonReceiver::GetAudioInfo(uint8_t *buf, int len)
+{
+  int c = 0;
+
+  while (c < len) {
+    audio_info_t tmp;
+    uint8_t *b = buf + c;
+    if (getAACAudioInfo(b, len - c, &tmp) || getMPEGAudioInfo(b, len - c, &tmp)) {
+       bool coherent = true;
+       memcpy(&m_AudioInfoBuffer[m_AudioInfoBufferIndex], &tmp, sizeof(audio_info_t));
+       m_AudioInfoBufferIndex = (m_AudioInfoBufferIndex + 1) % ELEMENTS(m_AudioInfoBuffer);
+       for (unsigned int i = 1; i < ELEMENTS(m_AudioInfoBuffer); ++i) {
+           if (memcmp(&m_AudioInfoBuffer[0], &m_AudioInfoBuffer[i], sizeof(audio_info_t)))
+              coherent = false;
+              break;
+           }
+       if (!m_AudioValid || coherent) {
+          m_AudioValid = true;
+          memcpy(&m_AudioInfo, &m_AudioInfoBuffer[0], sizeof(audio_info_t));
+          }
+       return;
+       }
+    c++;
     }	
-  if ((!found) || ((c + 3) >= count)) return;
-  m_AudioValid = true;
-  headr = mbuf + c;
-  m_AudioMPEGLayer = 4 - ((headr[1] & 0x06) >> 1);
-  tmp = bitrates[(3 - ((headr[1] & 0x06) >> 1))][(headr[2] >> 4)] * 1000;
-  if (tmp == 0)
-     m_AudioStreamBitrate = (double)FR_FREE;
-  else if (tmp == 0xf)
-     m_AudioStreamBitrate = (double)FR_RESERVED;
-  else
-     m_AudioStreamBitrate = tmp;
-  tmp = samplerates[((headr[2] & 0x0c) >> 2)] * 100;
-  if (tmp == 3)
-     m_AudioSamplingFreq = FR_RESERVED;
-  else
-     m_AudioSamplingFreq = tmp;
 }
 
-static unsigned int ac3_bitrates[32] =
+void cFemonReceiver::GetAC3Info(uint8_t *buf, int len)
-{32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-static unsigned int ac3_freq[4] =
-{480, 441, 320, 0};
-
-static unsigned int ac3_frames[3][32] =
 {
-  {64, 80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768,  896,  1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-  {69, 87,  104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835,  975,  1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-  {96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672, 768, 960, 1152, 1344, 1536, 1728, 1920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-};
-
-/*
-** AC3 Audio Header: http://www.atsc.org/standards/a_52a.pdf
-** The following function originates from libdvbmpeg:
-*/
-void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count)
-{
-  uint8_t *headr;
-  int found = 0;
   int c = 0;
-  uint8_t frame;
+
-  //m_AC3Valid = false;
+  while (c < len) {
-  while (!found && (c < count)) {
+    ac3_info_t tmp;
-    uint8_t *b = mbuf + c;
+    uint8_t *b = buf + c;
-    if ((b[0] == 0x0b) && (b[1] == 0x77))
+    if (getAC3AudioInfo(b, len - c, &tmp)) {
-       found = 1;
+       bool coherent = true;
-    else
+       memcpy(&m_AC3InfoBuffer[m_AC3InfoBufferIndex], &tmp, sizeof(ac3_info_t));
-       c++;
+       m_AC3InfoBufferIndex = (m_AC3InfoBufferIndex + 1) % ELEMENTS(m_AC3InfoBuffer);
+       for (unsigned int i = 1; i < ELEMENTS(m_AC3InfoBuffer); ++i) {
+           if (memcmp(&m_AC3InfoBuffer[0], &m_AC3InfoBuffer[i], sizeof(ac3_info_t)))
+              coherent = false;
+              break;
+           }
+       if (!m_AC3Valid || coherent) {
+          m_AC3Valid = true;
+          memcpy(&m_AC3Info, &m_AC3InfoBuffer[0], sizeof(ac3_info_t));
+          }   
+       return;
+       }
+    c++;
     }
-  if ((!found) || ((c + 5) >= count)) return;
-  m_AC3Valid = true;
-  headr = mbuf + c + 2;
-  frame = (headr[2] & 0x3f);
-  m_AC3StreamBitrate = ac3_bitrates[frame >> 1] * 1000;
-  int fr = (headr[2] & 0xc0 ) >> 6;
-  m_AC3SamplingFreq = ac3_freq[fr] * 100;
-  m_AC3FrameSize = ac3_frames[fr][frame >> 1];
-  if ((frame & 1) && (fr == 1)) m_AC3FrameSize++;
-     m_AC3FrameSize <<= 1;
-  m_AC3BitStreamMode = (headr[3] & 7);
-  m_AC3AudioCodingMode = (headr[4] & 0xE0) >> 5;
-  if ((m_AC3AudioCodingMode & 0x01) && (m_AC3AudioCodingMode != 0x01)) {
-     // 3 front channels
-     m_AC3CenterMixLevel = (headr[4] & 0x18) >> 3;
-     if (m_AC3AudioCodingMode & 0x04) {
-        // a surround channel exists
-        m_AC3SurroundMixLevel = (headr[4] & 0x06) >> 1;
-        if (m_AC3AudioCodingMode == 0x02) {
-           // if in 2/0 mode
-           m_AC3DolbySurroundMode = ((headr[4] & 0x01) << 1) | ((headr[5] & 0x80) >> 7);
-           m_AC3LfeOn = (headr[5] & 0x40) >> 6;
-           m_AC3DialogLevel = (headr[5] & 0x3e) >> 1;
-           }
-        else {
-           m_AC3DolbySurroundMode = FR_NOTVALID;
-           m_AC3LfeOn = (headr[4] & 0x01);
-           m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
-           }
-        }
-     else {
-        m_AC3SurroundMixLevel = FR_NOTVALID;
-        if (m_AC3AudioCodingMode == 0x02) {
-           // if in 2/0 mode
-            m_AC3DolbySurroundMode = (headr[4] & 0x06) >> 1;
-            m_AC3LfeOn = (headr[4] & 0x01);
-            m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
-           }
-        else {
-           m_AC3DolbySurroundMode = FR_NOTVALID;
-           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
-           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
-           }
-        }
-     }
-  else {
-     m_AC3CenterMixLevel = FR_NOTVALID;
-     if (m_AC3AudioCodingMode & 0x04) {
-        // a surround channel exists
-        m_AC3SurroundMixLevel = (headr[4] & 0x18) >> 3;
-        if (m_AC3AudioCodingMode == 0x02) {
-           // if in 2/0 mode
-           m_AC3DolbySurroundMode = (headr[4] & 0x06) >> 1;
-           m_AC3LfeOn = (headr[4] & 0x01);
-           m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
-           }
-        else {
-           m_AC3DolbySurroundMode = FR_NOTVALID;
-           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
-           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
-           }
-        }
-     else {
-        m_AC3SurroundMixLevel = FR_NOTVALID;
-        if (m_AC3AudioCodingMode == 0x02) {
-           // if in 2/0 mode
-           m_AC3DolbySurroundMode = (headr[4] & 0x18) >> 3;
-           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
-           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
-           }
-        else {
-           m_AC3DolbySurroundMode = FR_NOTVALID;
-           m_AC3LfeOn = (headr[4] & 0x10) >> 4;
-           m_AC3DialogLevel = ((headr[4] & 0x0F) << 1) | ((headr[5] & 0x80) >> 7);
-           }
-        }
-     }
 }
 
 void cFemonReceiver::Activate(bool On)
@@ -305,7 +176,7 @@ void cFemonReceiver::Activate(bool On)
   if (On)
      Start();
   else
-     Cancel();
+     Deactivate();
 }
 
 void cFemonReceiver::Receive(uchar *Data, int Length)
@@ -328,7 +199,7 @@ void cFemonReceiver::Receive(uchar *Data, int Length)
         }
      uint8_t off = 0;
      if (Data[3] & ADAPT_FIELD) {
-        off = Data[4] + 1;
+        off = (uint8_t)(Data[4] + 1);
         }
      if (Data[1] & PAY_START) {
         uint8_t *sb = Data + 4 + off;
@@ -354,7 +225,8 @@ void cFemonReceiver::Action(void)
 {
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
   cTimeMs t;
-  while (Running()) {
+  m_Active = true;
+  while (Running() && m_Active) {
         t.Set(0);
         // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
         m_VideoBitrate = (10.0 * 8.0 * 184.0 * m_VideoPacketCount) / femonConfig.calcinterval;

femonreceiver.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
  */
 
 #ifndef __FEMONRECEIVER_H
@@ -12,84 +11,41 @@
 #include <vdr/thread.h>
 #include <vdr/receiver.h>
 
-enum eVideoFormat {
+#include "femonaudio.h"
-  VF_UNKNOWN = 0,
+#include "femonvideo.h"
-  VF_PAL     = 1,
-  VF_NTSC    = 2,
-  };
-
-enum eAspectRatio {
-  AR_RESERVED = 0,
-  AR_1_1      = 100,
-  AR_4_3      = 133,
-  AR_16_9     = 177,
-  AR_2_21_1   = 233,
-  };
-
-enum eCenterMixLevel {
-  CML_MINUS_3dB   = 0,
-  CML_MINUS_4_5dB = 1,
-  CML_MINUS_6dB   = 2,
-  CML_RESERVED    = 3,
-  };
-
-enum eSurroundMixLevel {
-  SML_MINUS_3dB = 0,
-  SML_MINUS_6dB = 1,
-  SML_0_dB      = 2,
-  SML_RESERVED  = 3,
-  };
-
-enum eDolbySurroundMode {
-  DSM_NOT_INDICATED     = 0,
-  DSM_NOT_DOLBYSURROUND = 1,
-  DSM_DOLBYSURROUND     = 2,
-  DSM_RESERVED          = 3,
-  };
-
-enum eReceiverCodes {
-  FR_RESERVED = -1,
-  FR_FREE     = -2,
-  FR_NOTVALID = -3
-  };
 
 class cFemonReceiver : public cReceiver, public cThread {
 private:
-  cCondWait m_Sleep;
+  cCondWait     m_Sleep;
-  int       m_VideoPid;
+  bool          m_Active;
-  int       m_AudioPid;
+
-  int       m_AC3Pid;
+  int           m_VideoPid;
-  bool      m_VideoValid;
+  int           m_VideoPacketCount;
-  int       m_VideoPacketCount;
+  double        m_VideoBitrate;
-  int       m_VideoHorizontalSize;
+  bool          m_VideoValid;
-  int       m_VideoVerticalSize;
+  video_info_t  m_VideoInfo;
-  int       m_VideoAspectRatio;
+  video_info_t  m_VideoInfoBuffer[3];
-  int       m_VideoFormat;
+  unsigned int  m_VideoInfoBufferIndex;
-  double    m_VideoFrameRate;
+
-  double    m_VideoStreamBitrate;
+  int           m_AudioPid;
-  double    m_VideoBitrate;
+  int           m_AudioPacketCount;
-  bool      m_AudioValid;
+  double        m_AudioBitrate;
-  int       m_AudioPacketCount;
+  bool          m_AudioValid;
-  double    m_AudioStreamBitrate;
+  audio_info_t  m_AudioInfo;
-  double    m_AudioBitrate;
+  audio_info_t  m_AudioInfoBuffer[3];
-  int       m_AudioSamplingFreq;
+  unsigned int  m_AudioInfoBufferIndex;
-  int       m_AudioMPEGLayer;
+
-  bool      m_AC3Valid;
+  int           m_AC3Pid;
-  int       m_AC3PacketCount;
+  int           m_AC3PacketCount;
-  double    m_AC3Bitrate;
+  double        m_AC3Bitrate;
-  int       m_AC3FrameSize;
+  bool          m_AC3Valid;
-  int       m_AC3SamplingFreq;
+  ac3_info_t    m_AC3Info;
-  int       m_AC3StreamBitrate;
+  ac3_info_t    m_AC3InfoBuffer[3];
-  int       m_AC3BitStreamMode;
+  unsigned int  m_AC3InfoBufferIndex;
-  int       m_AC3AudioCodingMode;
+
-  int       m_AC3CenterMixLevel;
+  void          GetVideoInfo(uint8_t *buf, int len);
-  int       m_AC3SurroundMixLevel;
+  void          GetAudioInfo(uint8_t *buf, int len);
-  int       m_AC3DolbySurroundMode;
+  void          GetAC3Info(uint8_t *buf, int len);
-  bool      m_AC3LfeOn;
-  int       m_AC3DialogLevel;  
-  void      GetVideoInfo(uint8_t *mbuf, int count);
-  void      GetAudioInfo(uint8_t *mbuf, int count);
-  void      GetAC3Info(uint8_t *mbuf, int count);
 
 protected:
   virtual void Activate(bool On);
@@ -99,36 +55,39 @@ protected:
 public:
   cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[]);
   virtual ~cFemonReceiver();
+  void Deactivate(void);
 
-  bool VideoValid(void)           { return m_VideoValid; };          // boolean
+  bool   VideoValid(void)           { return m_VideoValid; };                  // boolean
-  int VideoHorizontalSize(void)   { return m_VideoHorizontalSize; }; // pixels
+  double VideoBitrate(void)         { return m_VideoBitrate; };                // bit/s
-  int VideoVerticalSize(void)     { return m_VideoVerticalSize; };   // pixels
+  int    VideoCodec(void)           { return m_VideoInfo.codec; };             // eVideoCodec
-  int VideoAspectRatio(void)      { return m_VideoAspectRatio; };    // eAspectRatio
+  int    VideoFormat(void)          { return m_VideoInfo.format; };            // eVideoFormat
-  int VideoFormat(void)           { return m_VideoFormat; };         // eVideoFormat
+  int    VideoScan(void)            { return m_VideoInfo.scan; };              // eVideoScan
-  double VideoFrameRate(void)     { return m_VideoFrameRate; };      // Hz
+  int    VideoAspectRatio(void)     { return m_VideoInfo.aspectRatio; };       // eVideoAspectRatio
-  double VideoStreamBitrate(void) { return m_VideoStreamBitrate; };  // bit/s
+  int    VideoHorizontalSize(void)  { return m_VideoInfo.width; };             // pixels
-  double VideoBitrate(void)       { return m_VideoBitrate; };        // bit/s
+  int    VideoVerticalSize(void)    { return m_VideoInfo.height; };            // pixels
+  double VideoFrameRate(void)       { return m_VideoInfo.frameRate; };         // Hz
+  double VideoStreamBitrate(void)   { return m_VideoInfo.bitrate; };           // bit/s
 
-  bool AudioValid(void)           { return m_AudioValid; };          // boolean
+  bool   AudioValid(void)           { return m_AudioValid; };                  // boolean
-  int AudioMPEGLayer(void)        { return m_AudioMPEGLayer; };      // layer number
+  double AudioBitrate(void)         { return m_AudioBitrate; };                // bit/s
-  int AudioSamplingFreq(void)     { return m_AudioSamplingFreq; };   // Hz
+  int    AudioCodec(void)           { return m_AudioInfo.codec; };             // eAudioCodec
-  double AudioStreamBitrate(void) { return m_AudioStreamBitrate; };  // bit/s
+  int    AudioChannelMode(void)     { return m_AudioInfo.channelMode; };       // eAudioChannelMode
-  double AudioBitrate(void)       { return m_AudioBitrate; };        // bit/s
+  double AudioStreamBitrate(void)   { return m_AudioInfo.bitrate; };           // bit/s or eAudioBitrate
+  int    AudioSamplingFreq(void)    { return m_AudioInfo.samplingFrequency; }; // Hz or eAudioSamplingFrequency
 
-  bool AC3Valid(void)             { return m_AC3Valid; };                // boolean
+  bool   AC3Valid(void)             { return m_AC3Valid; };                    // boolean
-  int AC3SamplingFreq(void)       { return m_AC3SamplingFreq; };         // Hz
+  double AC3Bitrate(void)           { return m_AC3Bitrate; };                  // bit/s
-  double AC3StreamBitrate(void)   { return m_AC3StreamBitrate; };        // bit/s
+  double AC3StreamBitrate(void)     { return m_AC3Info.bitrate; };             // bit/s or eAudioBitrate
-  double AC3Bitrate(void)         { return m_AC3Bitrate; };              // bit/s
+  int    AC3SamplingFreq(void)      { return m_AC3Info.samplingFrequency; };   // Hz or eAudioSamplingFrequency
-  int AC3FrameSize(void)          { return m_AC3FrameSize; };            // Bytes
+  int    AC3BitStreamMode(void)     { return m_AC3Info.bitstreamMode; };       // 0..7 or eAudioBitstreamMode
-  int AC3BitStreamMode(void)      { return m_AC3BitStreamMode; };        // 0..7
+  int    AC3AudioCodingMode(void)   { return m_AC3Info.audioCodingMode; };     // 0..7 or eAudioCodingMode
-  int AC3AudioCodingMode(void)    { return m_AC3AudioCodingMode; };      // 0..7
+  bool   AC3_2_0(void)              { return m_AC3Info.audioCodingMode == AUDIO_CODING_MODE_2_0; }; // boolean
-  bool AC3_2_0(void)		  { return m_AC3AudioCodingMode == 2; }; // DD 2.0
+  bool   AC3_5_1(void)	            { return m_AC3Info.audioCodingMode == AUDIO_CODING_MODE_3_2; }; // boolean
-  bool AC3_5_1(void)	          { return m_AC3AudioCodingMode == 7; }; // DD 5.1
+  int    AC3DolbySurroundMode(void) { return m_AC3Info.dolbySurroundMode; };   // eAudioDolbySurroundMode
-  int AC3CenterMixLevel(void)     { return m_AC3CenterMixLevel; };       // eCenterMixLevel
+  int    AC3CenterMixLevel(void)    { return m_AC3Info.centerMixLevel; };      // eAudioCenterMixLevel
-  int AC3SurroundMixLevel(void)   { return m_AC3SurroundMixLevel; };     // eSurroundMixLevel
+  int    AC3SurroundMixLevel(void)  { return m_AC3Info.surroundMixLevel; };    // eAudioSurroundMixLevel
-  int AC3DolbySurroundMode(void)  { return m_AC3DolbySurroundMode; };    // eDolbySurroundMode
+  int    AC3DialogLevel(void)       { return m_AC3Info.dialogLevel; };         // -dB
-  bool AC3LfeOn(void)             { return m_AC3LfeOn; };                // boolean
+  bool   AC3Lfe(void)               { return m_AC3Info.lfe; };                 // boolean
-  int AC3DialogLevel(void)        { return m_AC3DialogLevel; };          // -dB
   };
 
 #endif //__FEMONRECEIVER_H

femonservice.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
  */
 
 #ifndef __FEMONSERVICE_H

femonsymbol.c

@@ -0,0 +1,73 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include "femonsymbol.h"
+
+#include "symbols/stereo.xpm"
+#include "symbols/monoleft.xpm"
+#include "symbols/monoright.xpm"
+#include "symbols/dolbydigital.xpm"
+#include "symbols/dolbydigital20.xpm"
+#include "symbols/dolbydigital51.xpm"
+#include "symbols/mpeg2.xpm"
+#include "symbols/h264.xpm"
+#include "symbols/ntsc.xpm"
+#include "symbols/pal.xpm"
+#include "symbols/encrypted.xpm"
+#include "symbols/svdrp.xpm"
+#include "symbols/lock.xpm"
+#include "symbols/signal.xpm"
+#include "symbols/carrier.xpm"
+#include "symbols/viterbi.xpm"
+#include "symbols/sync.xpm"
+#include "symbols/ar11.xpm"
+#include "symbols/ar169.xpm"
+#include "symbols/ar2211.xpm"
+#include "symbols/ar43.xpm"
+#include "symbols/device.xpm"
+#include "symbols/zero.xpm"
+#include "symbols/one.xpm"
+#include "symbols/two.xpm"
+#include "symbols/three.xpm"
+#include "symbols/four.xpm"
+#include "symbols/five.xpm"
+#include "symbols/six.xpm"
+#include "symbols/seven.xpm"
+
+cBitmap bmSymbol[SYMBOL_MAX_COUNT] =
+{
+  cBitmap(stereo_xpm),         // SYMBOL_STEREO
+  cBitmap(monoleft_xpm),       // SYMBOL_MONO_LEFT
+  cBitmap(monoright_xpm),      // SYMBOL_MONO_RIGHT
+  cBitmap(dolbydigital_xpm),   // SYMBOL_DD
+  cBitmap(dolbydigital20_xpm), // SYMBOL_DD20
+  cBitmap(dolbydigital51_xpm), // SYMBOL_DD51
+  cBitmap(mpeg2_xpm),          // SYMBOL_MPEG2
+  cBitmap(h264_xpm),           // SYMBOL_H264
+  cBitmap(pal_xpm),            // SYMBOL_PAL
+  cBitmap(ntsc_xpm),           // SYMBOL_NTSC
+  cBitmap(encrypted_xpm),      // SYMBOL_ENCRYPTED
+  cBitmap(svdrp_xpm),          // SYMBOL_SVDRP
+  cBitmap(lock_xpm),           // SYMBOL_LOCK
+  cBitmap(signal_xpm),         // SYMBOL_SIGNAL
+  cBitmap(carrier_xpm),        // SYMBOL_CARRIER
+  cBitmap(viterbi_xpm),        // SYMBOL_VITERBI
+  cBitmap(sync_xpm),           // SYMBOL_SYNC
+  cBitmap(ar11_xpm),           // SYMBOL_AR_1_1
+  cBitmap(ar169_xpm),          // SYMBOL_AR_16_9
+  cBitmap(ar2211_xpm),         // SYMBOL_AR_2_21_1
+  cBitmap(ar43_xpm),           // SYMBOL_AR_4_3
+  cBitmap(device_xpm),         // SYMBOL_DEVICE
+  cBitmap(zero_xpm),           // SYMBOL_ZERO
+  cBitmap(one_xpm),            // SYMBOL_ONE
+  cBitmap(two_xpm),            // SYMBOL_TWO
+  cBitmap(three_xpm),          // SYMBOL_THREE
+  cBitmap(four_xpm),           // SYMBOL_FOUR
+  cBitmap(five_xpm),           // SYMBOL_FIVE
+  cBitmap(six_xpm),            // SYMBOL_SIX
+  cBitmap(seven_xpm)           // SYMBOL_SEVEN
+};

femonsymbol.h

@@ -0,0 +1,49 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONSYMBOL_H
+#define __FEMONSYMBOL_H
+
+#include <vdr/osd.h>
+
+enum eSymbols {
+  SYMBOL_STEREO,
+  SYMBOL_MONO_LEFT,
+  SYMBOL_MONO_RIGHT,
+  SYMBOL_DD,
+  SYMBOL_DD20,
+  SYMBOL_DD51,
+  SYMBOL_MPEG2,
+  SYMBOL_H264,
+  SYMBOL_PAL,
+  SYMBOL_NTSC,
+  SYMBOL_ENCRYPTED,
+  SYMBOL_SVDRP,
+  SYMBOL_LOCK,
+  SYMBOL_SIGNAL,
+  SYMBOL_CARRIER,
+  SYMBOL_VITERBI,
+  SYMBOL_SYNC,
+  SYMBOL_AR_1_1,
+  SYMBOL_AR_16_9,
+  SYMBOL_AR_2_21_1,
+  SYMBOL_AR_4_3,
+  SYMBOL_DEVICE,
+  SYMBOL_ZERO,
+  SYMBOL_ONE,
+  SYMBOL_TWO,
+  SYMBOL_THREE,
+  SYMBOL_FOUR,
+  SYMBOL_FIVE,
+  SYMBOL_SIX,
+  SYMBOL_SEVEN,
+  SYMBOL_MAX_COUNT
+  };
+
+extern cBitmap bmSymbol[SYMBOL_MAX_COUNT];
+
+#endif // __FEMONSYMBOL_H

femontools.c

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
  */
 
 #include <stdlib.h>
@@ -14,6 +13,53 @@
 #include "femonosd.h"
 #include "femontools.h"
 
+static cString getCA(int value)
+{
+  // http://www.dvb.org/index.php?id=174
+  // http://en.wikipedia.org/wiki/Conditional_access_system
+  switch (value) {
+    case 0x0000:            return cString::sprintf("%s (%X)", trVDR("Free To Air"), value);  // Reserved
+    case 0x0001 ... 0x009F:
+    case 0x00A2 ... 0x00FF: return cString::sprintf("%s (%X)", tr("Fixed"),          value); // Standardized systems
+    case 0x00A0 ... 0x00A1: return cString::sprintf("%s (%X)", tr("Analog"),         value); // Analog signals
+    case 0x0100 ... 0x01FF: return cString::sprintf("%s (%X)", "SECA Mediaguard",    value); // Canal Plus
+    case 0x0464:            return cString::sprintf("%s (%X)", "EuroDec",            value); // EuroDec
+    case 0x0500 ... 0x05FF: return cString::sprintf("%s (%X)", "Viaccess",           value); // France Telecom
+    case 0x0600 ... 0x06FF: return cString::sprintf("%s (%X)", "Irdeto",             value); // Irdeto
+    case 0x0900 ... 0x09FF: return cString::sprintf("%s (%X)", "NDS Videoguard",     value); // News Datacom
+    case 0x0B00 ... 0x0BFF: return cString::sprintf("%s (%X)", "Conax",              value); // Norwegian Telekom
+    case 0x0D00 ... 0x0DFF: return cString::sprintf("%s (%X)", "CryptoWorks",        value); // Philips
+    case 0x0E00 ... 0x0EFF: return cString::sprintf("%s (%X)", "PowerVu",            value); // Scientific Atlanta
+    case 0x1000:            return cString::sprintf("%s (%X)", "RAS",                value); // Tandberg Television
+    case 0x1200 ... 0x12FF: return cString::sprintf("%s (%X)", "NagraVision",        value); // BellVu Express
+    case 0x1700 ... 0x17FF: return cString::sprintf("%s (%X)", "BetaCrypt",          value); // BetaTechnik
+    case 0x1800 ... 0x18FF: return cString::sprintf("%s (%X)", "NagraVision",        value); // Kudelski SA
+    case 0x22F0:            return cString::sprintf("%s (%X)", "Codicrypt",          value); // Scopus Network Technologies
+    case 0x2600:            return cString::sprintf("%s (%X)", "BISS",               value); // European Broadcasting Union
+    case 0x4347:            return cString::sprintf("%s (%X)", "CryptOn",            value); // CryptOn
+    case 0x4800:            return cString::sprintf("%s (%X)", "Accessgate",         value); // Telemann
+    case 0x4900:            return cString::sprintf("%s (%X)", "China Crypt",        value); // CryptoWorks
+    case 0x4A10:            return cString::sprintf("%s (%X)", "EasyCas",            value); // EasyCas
+    case 0x4A20:            return cString::sprintf("%s (%X)", "AlphaCrypt",         value); // AlphaCrypt
+    case 0x4A70:            return cString::sprintf("%s (%X)", "DreamCrypt",         value); // Dream Multimedia
+    case 0x4A60:            return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
+    case 0x4A61:            return cString::sprintf("%s (%X)", "Neotioncrypt",       value); // Neotion
+    case 0x4A62:            return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
+    case 0x4A63:            return cString::sprintf("%s (%X)", "Neotion SHL",        value); // Neotion
+    case 0x4A64 ... 0x4A6F: return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
+    case 0x4A80:            return cString::sprintf("%s (%X)", "ThalesCrypt",        value); // TPS
+    case 0x4AA1:            return cString::sprintf("%s (%X)", "KeyFly",             value); // SIDSA
+    case 0x4ABF:            return cString::sprintf("%s (%X)", "DG-Crypt",           value); // Beijing Compunicate Technology Inc.
+    case 0x4AD0 ... 0x4AD1: return cString::sprintf("%s (%X)", "X-Crypt",            value); // XCrypt Inc.
+    case 0x4AD4:            return cString::sprintf("%s (%X)", "OmniCrypt",          value); // Widevine Technologies, Inc.
+    case 0x4AE0:            return cString::sprintf("%s (%X)", "RossCrypt",          value); // Digi Raum Electronics Co. Ltd.
+    case 0x5500:            return cString::sprintf("%s (%X)", "Z-Crypt",            value); // Digi Raum Electronics Co. Ltd.
+    case 0x5501:            return cString::sprintf("%s (%X)", "Griffin",            value); // Griffin
+    default:                break;
+    }
+  return cString::sprintf("%X", value);
+}
+
 cString getFrontendInfo(int cardIndex)
 {
   cString info;
@@ -43,7 +89,7 @@ cString getFrontendInfo(int cardIndex)
      info = cString::sprintf("%s\nVIBR:%.0f\nAUBR:%.0f\nDDBR:%.0f", *info, cFemonOsd::Instance()->GetVideoBitrate(), cFemonOsd::Instance()->GetAudioBitrate(), cFemonOsd::Instance()->GetDolbyBitrate());
 
   if (channel)
-     info  = cString::sprintf("%s\nCHAN:%s", *info, *channel->ToText());
+     info = cString::sprintf("%s\nCHAN:%s", *info, *channel->ToText());
 
   return info;
 }
@@ -159,51 +205,91 @@ cString getSpids(const cChannel *channel)
   return spids;
 }
 
-cString getCAids(const cChannel *channel, bool identify)
+cString getCAids(const cChannel *channel)
 {
-  cString caids;
   int value = 0;
-
+  cString caids = cString::sprintf("%s", *getCA(channel->Ca(value)));
-  if (identify) {
+  while (channel->Ca(++value) && (value < MAXCAIDS))
-     caids = cString::sprintf("%s", *getCA(channel->Ca(value)));
+    caids = cString::sprintf("%s, %s", *caids, *getCA(channel->Ca(value)));
-     while (channel->Ca(++value) && (value < MAXCAIDS))
-       caids = cString::sprintf("%s, %s", *caids, *getCA(channel->Ca(value)));
-     }
-  else {
-     caids = cString::sprintf("%04x", channel->Ca(value));
-     while (channel->Ca(++value) && (value < MAXCAIDS))
-       caids = cString::sprintf("%s, %04x", *caids, channel->Ca(value));
-     }
   return caids;
 }
 
-cString getCA(int value)
+cString getVideoStream(int value)
+{
+  if (value != 0)
+     return cString::sprintf("#%d", value);
+  return cString::sprintf("---");
+}
+
+cString getAudioStream(int value, const cChannel *channel)
+{
+  int pid = 0;
+  if (IS_AUDIO_TRACK(value))
+     pid = int(value - ttAudioFirst);
+  if (channel && channel->Apid(pid)) {
+     if (channel->Alang(pid))
+        return cString::sprintf("#%d (%s)", channel->Apid(pid), channel->Alang(pid));
+     else
+        return cString::sprintf("#%d", channel->Apid(pid));
+     }
+  return cString::sprintf("---");
+}
+
+cString getAC3Stream(int value, const cChannel *channel)
+{
+  int pid = 0;
+  if (IS_DOLBY_TRACK(value))
+     pid = int(value - ttDolbyFirst);
+  if (channel && channel->Dpid(pid)) {
+     if (channel->Dlang(pid))
+        return cString::sprintf("#%d (%s)", channel->Dpid(pid), channel->Dlang(pid));
+     else
+        return cString::sprintf("#%d", channel->Dpid(pid));
+     }
+  return cString::sprintf("---");
+}
+
+cString getVideoCodec(int value)
 {
-  /* http://www.dvb.org/index.php?id=174 */
   switch (value) {
-    case 0x0000:            return cString::sprintf("%s", trVDR("Free To Air")); /* Reserved */
+    case VIDEO_CODEC_MPEG2: return cString::sprintf("%s", tr("MPEG-2"));
-    case 0x0001 ... 0x009F:
+    case VIDEO_CODEC_H264:  return cString::sprintf("%s", tr("H.264"));
-    case 0x00A2 ... 0x00FF: return cString::sprintf("%s", tr("Fixed")); /* Standardized systems */
+    default:                break;
-    case 0x00A0 ... 0x00A1: return cString::sprintf("%s", tr("Analog")); /* Analog signals */
-    case 0x0100 ... 0x01FF: return cString::sprintf("%s", tr("SECA/Mediaguard")); /* Canal Plus */
-    case 0x0500 ... 0x05FF: return cString::sprintf("%s", tr("Viaccess")); /* France Telecom */
-    case 0x0600 ... 0x06FF: return cString::sprintf("%s", tr("Irdeto")); /* Irdeto */
-    case 0x0900 ... 0x09FF: return cString::sprintf("%s", tr("NDS/Videoguard")); /* News Datacom */
-    case 0x0B00 ... 0x0BFF: return cString::sprintf("%s", tr("Conax")); /* Norwegian Telekom */
-    case 0x0D00 ... 0x0DFF: return cString::sprintf("%s", tr("CryptoWorks")); /* Philips */
-    case 0x0E00 ... 0x0EFF: return cString::sprintf("%s", tr("PowerVu")); /* Scientific Atlanta */
-    case 0x1200 ... 0x12FF: return cString::sprintf("%s", tr("NagraVision")); /* BellVu Express */
-    case 0x1700 ... 0x17FF: return cString::sprintf("%s", tr("BetaCrypt")); /* BetaTechnik */
-    case 0x1800 ... 0x18FF: return cString::sprintf("%s", tr("NagraVision")); /* Kudelski SA */
-    case 0x4A60 ... 0x4A6F: return cString::sprintf("%s", tr("SkyCrypt")); /* @Sky */
     }
-  return cString::sprintf("%X", value);
+  return cString::sprintf("---");
+}
+
+cString getAudioCodec(int value)
+{
+  switch (value) {
+    case AUDIO_CODEC_MPEG1_I:   return cString::sprintf("%s", tr("MPEG-1 Layer I"));
+    case AUDIO_CODEC_MPEG1_II:  return cString::sprintf("%s", tr("MPEG-1 Layer II"));
+    case AUDIO_CODEC_MPEG1_III: return cString::sprintf("%s", tr("MPEG-1 Layer III"));
+    case AUDIO_CODEC_MPEG2_I:   return cString::sprintf("%s", tr("MPEG-2 Layer I"));
+    case AUDIO_CODEC_MPEG2_II:  return cString::sprintf("%s", tr("MPEG-2 Layer II"));
+    case AUDIO_CODEC_MPEG2_III: return cString::sprintf("%s", tr("MPEG-2 Layer III"));
+    case AUDIO_CODEC_HEAAC:     return cString::sprintf("%s", tr("HE-AAC"));
+    default:                    break;
+    }
+  return cString::sprintf("---");
+}
+
+cString getAudioChannelMode(int value)
+{
+  switch (value) {
+    case AUDIO_CHANNEL_MODE_STEREO:       return cString::sprintf("%s", tr("stereo"));
+    case AUDIO_CHANNEL_MODE_JOINT_STEREO: return cString::sprintf("%s", tr("joint Stereo"));
+    case AUDIO_CHANNEL_MODE_DUAL:         return cString::sprintf("%s", tr("dual"));
+    case AUDIO_CHANNEL_MODE_SINGLE:       return cString::sprintf("%s", tr("mono"));
+    default:                              break;
+    }
+  return cString::sprintf("---");
 }
 
 cString getCoderate(int value)
 {
   switch (value) {
-    case FEC_NONE: return cString::sprintf("%s", tr("none"));
+    case FEC_NONE: return cString::sprintf("%s", trVDR("none"));
     case FEC_1_2:  return cString::sprintf("1/2");
     case FEC_2_3:  return cString::sprintf("2/3");
     case FEC_3_4:  return cString::sprintf("3/4");
@@ -212,7 +298,8 @@ cString getCoderate(int value)
     case FEC_6_7:  return cString::sprintf("6/7");
     case FEC_7_8:  return cString::sprintf("7/8");
     case FEC_8_9:  return cString::sprintf("8/9");
-    case FEC_AUTO: return cString::sprintf("%s", tr("auto"));
+    case FEC_AUTO: return cString::sprintf("%s", trVDR("auto"));
+    default:       break;
     }
   return cString::sprintf("---");
 }
@@ -222,7 +309,8 @@ cString getTransmission(int value)
   switch (value) {
     case TRANSMISSION_MODE_2K:   return cString::sprintf("2K");
     case TRANSMISSION_MODE_8K:   return cString::sprintf("8K");
-    case TRANSMISSION_MODE_AUTO: return cString::sprintf("%s", tr("auto"));
+    case TRANSMISSION_MODE_AUTO: return cString::sprintf("%s", trVDR("auto"));
+    default:                     break;
     }
   return cString::sprintf("---");
 }
@@ -233,7 +321,8 @@ cString getBandwidth(int value)
     case BANDWIDTH_8_MHZ: return cString::sprintf("8 %s", tr("MHz"));
     case BANDWIDTH_7_MHZ: return cString::sprintf("7 %s", tr("MHz"));
     case BANDWIDTH_6_MHZ: return cString::sprintf("6 %s", tr("MHz"));
-    case BANDWIDTH_AUTO:  return cString::sprintf("%s", tr("auto"));
+    case BANDWIDTH_AUTO:  return cString::sprintf("%s", trVDR("auto"));
+    default:              break;
     }
   return cString::sprintf("---");
 }
@@ -243,7 +332,8 @@ cString getInversion(int value)
   switch (value) {
     case INVERSION_OFF:  return cString::sprintf("%s", tr("off"));
     case INVERSION_ON:   return cString::sprintf("%s", tr("on"));
-    case INVERSION_AUTO: return cString::sprintf("%s", tr("auto"));
+    case INVERSION_AUTO: return cString::sprintf("%s", trVDR("auto"));
+    default:             break;
     }
   return cString::sprintf("---");
 }
@@ -251,11 +341,12 @@ cString getInversion(int value)
 cString getHierarchy(int value)
 {
   switch (value) {
-    case HIERARCHY_NONE: return cString::sprintf("%s", tr("none"));
+    case HIERARCHY_NONE: return cString::sprintf("%s", trVDR("none"));
     case HIERARCHY_1:    return cString::sprintf("1");
     case HIERARCHY_2:    return cString::sprintf("2");
     case HIERARCHY_4:    return cString::sprintf("4");
-    case HIERARCHY_AUTO: cString::sprintf("%s", tr("auto"));
+    case HIERARCHY_AUTO: return cString::sprintf("%s", trVDR("auto"));
+    default:             break;
     }
   return cString::sprintf("---");
 }
@@ -267,7 +358,8 @@ cString getGuard(int value)
     case GUARD_INTERVAL_1_16: return cString::sprintf("1/16");
     case GUARD_INTERVAL_1_8:  return cString::sprintf("1/8");
     case GUARD_INTERVAL_1_4:  return cString::sprintf("1/4");
-    case GUARD_INTERVAL_AUTO: cString::sprintf("%s", tr("auto"));
+    case GUARD_INTERVAL_AUTO: return cString::sprintf("%s", trVDR("auto"));
+    default:                  break;
     }
   return cString::sprintf("---");
 }
@@ -281,19 +373,48 @@ cString getModulation(int value)
     case QAM_64:   return cString::sprintf("QAM 64");
     case QAM_128:  return cString::sprintf("QAM 128");
     case QAM_256:  return cString::sprintf("QAM 256");
-    case QAM_AUTO: return cString::sprintf("QAM %s", tr("auto"));
+    case QAM_AUTO: return cString::sprintf("QAM %s", trVDR("auto"));
+    default:       break;
     }
   return cString::sprintf("---");
 }
 
+cString getResolution(int width, int height, int scan)
+{
+  if ((width > 0) && (height > 0)) {
+     switch (scan) {
+       case VIDEO_SCAN_INTERLACED:  return cString::sprintf("%dx%d %s", width, height, tr("interlaced"));
+       case VIDEO_SCAN_PROGRESSIVE: return cString::sprintf("%dx%d %s", width, height, tr("progressive"));
+       default:                     return cString::sprintf("%dx%d",    width, height);
+       }
+     }
+  return cString::sprintf("---");
+}
+
 cString getAspectRatio(int value)
 {
   switch (value) {
-    case AR_RESERVED: return cString::sprintf("%s", tr("reserved"));
+    case VIDEO_ASPECT_RATIO_RESERVED: return cString::sprintf("%s", tr("reserved"));
-    case AR_1_1:      return cString::sprintf("1:1");
+    case VIDEO_ASPECT_RATIO_EXTENDED: return cString::sprintf("%s", tr("extended"));
-    case AR_4_3:      return cString::sprintf("4:3");
+    case VIDEO_ASPECT_RATIO_1_1:      return cString::sprintf("1:1");
-    case AR_16_9:     return cString::sprintf("16:9");
+    case VIDEO_ASPECT_RATIO_4_3:      return cString::sprintf("4:3");
-    case AR_2_21_1:   return cString::sprintf("2.21:1");
+    case VIDEO_ASPECT_RATIO_16_9:     return cString::sprintf("16:9");
+    case VIDEO_ASPECT_RATIO_2_21_1:   return cString::sprintf("2.21:1");
+    case VIDEO_ASPECT_RATIO_12_11:    return cString::sprintf("12:11");
+    case VIDEO_ASPECT_RATIO_10_11:    return cString::sprintf("10:11");
+    case VIDEO_ASPECT_RATIO_16_11:    return cString::sprintf("16:11");
+    case VIDEO_ASPECT_RATIO_40_33:    return cString::sprintf("40:33");
+    case VIDEO_ASPECT_RATIO_24_11:    return cString::sprintf("24:11");
+    case VIDEO_ASPECT_RATIO_20_11:    return cString::sprintf("20:11");
+    case VIDEO_ASPECT_RATIO_32_11:    return cString::sprintf("32:11");
+    case VIDEO_ASPECT_RATIO_80_33:    return cString::sprintf("80:33");
+    case VIDEO_ASPECT_RATIO_18_11:    return cString::sprintf("18:11");
+    case VIDEO_ASPECT_RATIO_15_11:    return cString::sprintf("15:11");
+    case VIDEO_ASPECT_RATIO_64_33:    return cString::sprintf("64:33");
+    case VIDEO_ASPECT_RATIO_160_99:   return cString::sprintf("160:99");
+    case VIDEO_ASPECT_RATIO_3_2:      return cString::sprintf("3:2");
+    case VIDEO_ASPECT_RATIO_2_1:      return cString::sprintf("2:1");
+    default:                          break;
     }
   return cString::sprintf("---");
 }
@@ -301,24 +422,37 @@ cString getAspectRatio(int value)
 cString getVideoFormat(int value)
 {
   switch (value) {
-    case VF_UNKNOWN: return cString::sprintf("%s", tr("unknown"));
+    case VIDEO_FORMAT_UNKNOWN:   return cString::sprintf("%s", tr("unknown"));
-    case VF_PAL:     return cString::sprintf("%s", tr("PAL"));
+    case VIDEO_FORMAT_RESERVED:  return cString::sprintf("%s", tr("reserved"));
-    case VF_NTSC:    return cString::sprintf("%s", tr("NTSC"));
+    case VIDEO_FORMAT_COMPONENT: return cString::sprintf("%s", tr("component"));
+    case VIDEO_FORMAT_PAL:       return cString::sprintf("%s", tr("PAL"));
+    case VIDEO_FORMAT_NTSC:      return cString::sprintf("%s", tr("NTSC"));
+    case VIDEO_FORMAT_SECAM:     return cString::sprintf("%s", tr("SECAM"));
+    case VIDEO_FORMAT_MAC:       return cString::sprintf("%s", tr("MAC"));
+    default:                     break;
     }
   return cString::sprintf("---");
 }
 
+cString getFrameRate(double value)
+{
+  if (value > 0)
+     return cString::sprintf("%.2f %s", value, tr("Hz"));
+  return cString::sprintf("---");
+}
+
 cString getAC3BitStreamMode(int value, int coding)
 {
   switch (value) {
-    case 0: return cString::sprintf("%s", tr("Complete Main (CM)"));
+    case AUDIO_BITSTREAM_MODE_CM:     return cString::sprintf("%s", tr("Complete Main (CM)"));
-    case 1: return cString::sprintf("%s", tr("Music and Effects (ME)"));
+    case AUDIO_BITSTREAM_MODE_ME:     return cString::sprintf("%s", tr("Music and Effects (ME)"));
-    case 2: return cString::sprintf("%s", tr("Visually Impaired (VI)"));
+    case AUDIO_BITSTREAM_MODE_VI:     return cString::sprintf("%s", tr("Visually Impaired (VI)"));
-    case 3: return cString::sprintf("%s", tr("Hearing Impaired (HI)"));
+    case AUDIO_BITSTREAM_MODE_HI:     return cString::sprintf("%s", tr("Hearing Impaired (HI)"));
-    case 4: return cString::sprintf("%s", tr("Dialogue (D)"));
+    case AUDIO_BITSTREAM_MODE_D:      return cString::sprintf("%s", tr("Dialogue (D)"));
-    case 5: return cString::sprintf("%s", tr("Commentary (C)"));
+    case AUDIO_BITSTREAM_MODE_C:      return cString::sprintf("%s", tr("Commentary (C)"));
-    case 6: return cString::sprintf("%s", tr("Emergency (E)"));
+    case AUDIO_BITSTREAM_MODE_E:      return cString::sprintf("%s", tr("Emergency (E)"));
-    case 7: return cString::sprintf("%s", (coding == 1) ? tr("Voice Over (VO)") : tr("Karaoke"));
+    case AUDIO_BITSTREAM_MODE_VO_KAR: return cString::sprintf("%s", (coding == 1) ? tr("Voice Over (VO)") : tr("Karaoke"));
+    default:                          break;
     }
   return cString::sprintf("---");
 }
@@ -327,14 +461,15 @@ cString getAC3AudioCodingMode(int value, int stream)
 {
   if (stream != 7) {
      switch (value) {
-       case 0: return cString::sprintf("1+1 - %s, %s", tr("Ch1"), tr("Ch2"));
+       case AUDIO_CODING_MODE_1_1: return cString::sprintf("1+1 - %s, %s", tr("Ch1"), tr("Ch2"));
-       case 1: return cString::sprintf("1/0 - %s", tr("C"));
+       case AUDIO_CODING_MODE_1_0: return cString::sprintf("1/0 - %s", tr("C"));
-       case 2: return cString::sprintf("2/0 - %s, %s", tr("L"), tr("R"));
+       case AUDIO_CODING_MODE_2_0: return cString::sprintf("2/0 - %s, %s", tr("L"), tr("R"));
-       case 3: return cString::sprintf("3/0 - %s, %s, %s", tr("L"), tr("C"), tr("R"));
+       case AUDIO_CODING_MODE_3_0: return cString::sprintf("3/0 - %s, %s, %s", tr("L"), tr("C"), tr("R"));
-       case 4: return cString::sprintf("2/1 - %s, %s, %s", tr("L"), tr("R"), tr("S"));
+       case AUDIO_CODING_MODE_2_1: return cString::sprintf("2/1 - %s, %s, %s", tr("L"), tr("R"), tr("S"));
-       case 5: return cString::sprintf("3/1 - %s, %s, %s, %s", tr("L"), tr("C"), tr("R"), tr("S"));
+       case AUDIO_CODING_MODE_3_1: return cString::sprintf("3/1 - %s, %s, %s, %s", tr("L"), tr("C"), tr("R"), tr("S"));
-       case 6: return cString::sprintf("2/2 - %s, %s, %s, %s", tr("L"), tr("R"), tr("SL"), tr("SR"));
+       case AUDIO_CODING_MODE_2_2: return cString::sprintf("2/2 - %s, %s, %s, %s", tr("L"), tr("R"), tr("SL"), tr("SR"));
-       case 7: return cString::sprintf("3/2 - %s, %s, %s, %s, %s", tr("L"), tr("C"), tr("R"), tr("SL"), tr("SR"));
+       case AUDIO_CODING_MODE_3_2: return cString::sprintf("3/2 - %s, %s, %s, %s, %s", tr("L"), tr("C"), tr("R"), tr("SL"), tr("SR"));
+       default:                    break;
        }
      }
   return cString::sprintf("---");
@@ -343,10 +478,11 @@ cString getAC3AudioCodingMode(int value, int stream)
 cString getAC3CenterMixLevel(int value)
 {
   switch (value) {
-    case CML_MINUS_3dB:   return cString::sprintf("-3.0 %s", tr("dB"));
+    case AUDIO_CENTER_MIX_LEVEL_MINUS_3dB:   return cString::sprintf("-3.0 %s", tr("dB"));
-    case CML_MINUS_4_5dB: return cString::sprintf("-4.5 %s", tr("dB"));
+    case AUDIO_CENTER_MIX_LEVEL_MINUS_4_5dB: return cString::sprintf("-4.5 %s", tr("dB"));
-    case CML_MINUS_6dB:   return cString::sprintf("-6.0 %s", tr("dB"));
+    case AUDIO_CENTER_MIX_LEVEL_MINUS_6dB:   return cString::sprintf("-6.0 %s", tr("dB"));
-    case CML_RESERVED:    return cString::sprintf("%s", tr("reserved"));
+    case AUDIO_CENTER_MIX_LEVEL_RESERVED:    return cString::sprintf("%s", tr("reserved"));
+    default:                                 break;
     }
   return cString::sprintf("---");
 }
@@ -354,10 +490,11 @@ cString getAC3CenterMixLevel(int value)
 cString getAC3SurroundMixLevel(int value)
 {
   switch (value) {
-    case SML_MINUS_3dB: return cString::sprintf("-3 %s", tr("dB"));
+    case AUDIO_SURROUND_MIX_LEVEL_MINUS_3dB: return cString::sprintf("-3 %s", tr("dB"));
-    case SML_MINUS_6dB: return cString::sprintf("-6 %s", tr("dB"));
+    case AUDIO_SURROUND_MIX_LEVEL_MINUS_6dB: return cString::sprintf("-6 %s", tr("dB"));
-    case SML_0_dB:      return cString::sprintf("0 %s", tr("dB"));
+    case AUDIO_SURROUND_MIX_LEVEL_0_dB:      return cString::sprintf("0 %s", tr("dB"));
-    case SML_RESERVED:  return cString::sprintf("%s", tr("reserved"));
+    case AUDIO_SURROUND_MIX_LEVEL_RESERVED:  return cString::sprintf("%s", tr("reserved"));
+    default:                                 break;
     }
   return cString::sprintf("---");
 }
@@ -365,10 +502,11 @@ cString getAC3SurroundMixLevel(int value)
 cString getAC3DolbySurroundMode(int value)
 {
   switch (value) {
-    case DSM_NOT_INDICATED:     return cString::sprintf("%s", tr("not indicated"));
+    case AUDIO_DOLBY_SURROUND_MODE_NOT_INDICATED:     return cString::sprintf("%s", tr("not indicated"));
-    case DSM_NOT_DOLBYSURROUND: return cString::sprintf("%s", trVDR("no"));
+    case AUDIO_DOLBY_SURROUND_MODE_NOT_DOLBYSURROUND: return cString::sprintf("%s", trVDR("no"));
-    case DSM_DOLBYSURROUND:     return cString::sprintf("%s", trVDR("yes"));
+    case AUDIO_DOLBY_SURROUND_MODE_DOLBYSURROUND:     return cString::sprintf("%s", trVDR("yes"));
-    case DSM_RESERVED:          return cString::sprintf("%s", tr("reserved"));
+    case AUDIO_DOLBY_SURROUND_MODE_RESERVED:          return cString::sprintf("%s", tr("reserved"));
+    default:                                          break;
     }
   return cString::sprintf("---");
 }
@@ -389,32 +527,39 @@ cString getFrequencyMHz(int value)
 cString getAudioSamplingFreq(int value)
 {
   switch (value) {
-    case FR_NOTVALID: return cString::sprintf("---");
+    case AUDIO_SAMPLING_FREQUENCY_INVALID:  return cString::sprintf("---");
-    case FR_RESERVED: return cString::sprintf("%s", tr("reserved"));
+    case AUDIO_SAMPLING_FREQUENCY_RESERVED: return cString::sprintf("%s", tr("reserved"));
+    default:                                break;
     }
-  return cString::sprintf("%.1f %s", ((double)value / 1000.0), tr("kHz"));
+  return cString::sprintf("%d %s", value, tr("Hz"));
 }
 
 cString getAudioBitrate(double value, double stream)
 {
   switch ((int)stream) {
-    case FR_NOTVALID: return cString::sprintf("---");
+    case AUDIO_BITRATE_INVALID:  return cString::sprintf("---");
-    case FR_RESERVED: return cString::sprintf("%s (%s)", tr("reserved"), *getBitrateKbits(value));
+    case AUDIO_BITRATE_RESERVED: return cString::sprintf("%s (%s)", tr("reserved"), *getBitrateKbits(value));
-    case FR_FREE:     return cString::sprintf("%s (%s)", tr("free"), *getBitrateKbits(value));
+    case AUDIO_BITRATE_FREE:     return cString::sprintf("%s (%s)", tr("free"), *getBitrateKbits(value));
+    default:                     break;
     }
   return cString::sprintf("%s (%s)", *getBitrateKbits(stream), *getBitrateKbits(value));
 }
 
+cString getVideoBitrate(double value, double stream)
+{
+  return cString::sprintf("%s (%s)", *getBitrateMbits(stream), *getBitrateMbits(value));
+}
+
 cString getBitrateMbits(double value)
 {
-  if (value >= 0)
+  if (value > 0)
      return cString::sprintf("%.2f %s", value / 1000000.0, tr("Mbit/s"));
-  return cString::sprintf("--- %s", tr("Mbit/s"));
+  return cString::sprintf("---");
 }
 
 cString getBitrateKbits(double value)
 {
-  if (value >= 0) 
+  if (value > 0) 
      return cString::sprintf("%.0f %s", value / 1000.0, tr("kbit/s"));
-  return cString::sprintf("--- %s", tr("kbit/s"));
+  return cString::sprintf("---");
 }

femontools.h

@@ -3,7 +3,6 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id$
  */
 
 #ifndef __FEMONTOOLS_H
@@ -19,6 +18,8 @@
 #define Dprintf(x...) ;
 #endif
 
+#define ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
+
 #define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"
 
 cString getFrontendInfo(int cardIndex = 0);
@@ -34,8 +35,12 @@ uint32_t getUNC(int cardIndex = 0);
 cString getApids(const cChannel *channel);
 cString getDpids(const cChannel *channel);
 cString getSpids(const cChannel *channel);
-cString getCAids(const cChannel *channel, bool identify = false);
+cString getCAids(const cChannel *channel);
-cString getCA(int value);
+cString getVideoStream(int value);
+cString getVideoCodec(int value);
+cString getAudioStream(int value, const cChannel *channel);
+cString getAudioCodec(int value);
+cString getAudioChannelMode(int value);
 cString getCoderate(int value);
 cString getTransmission(int value);
 cString getBandwidth(int value);
@@ -43,8 +48,11 @@ cString getInversion(int value);
 cString getHierarchy(int value);
 cString getGuard(int value);
 cString getModulation(int value);
+cString getResolution(int width, int height, int scan);
 cString getAspectRatio(int value);
 cString getVideoFormat(int value);
+cString getFrameRate(double value);
+cString getAC3Stream(int value, const cChannel *channel);
 cString getAC3BitStreamMode(int value, int coding);
 cString getAC3AudioCodingMode(int value, int stream);
 cString getAC3CenterMixLevel(int value);
@@ -54,6 +62,7 @@ cString getAC3DialogLevel(int value);
 cString getFrequencyMHz(int value);
 cString getAudioSamplingFreq(int value);
 cString getAudioBitrate(double value, double stream);
+cString getVideoBitrate(double value, double stream);
 cString getBitrateMbits(double value);
 cString getBitrateKbits(double value);
 

femonvideo.h

@@ -0,0 +1,72 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONVIDEO_H
+#define __FEMONVIDEO_H
+
+enum eVideoCodec {
+  VIDEO_CODEC_INVALID = -1,
+  VIDEO_CODEC_UNKNOWN,
+  VIDEO_CODEC_MPEG2,
+  VIDEO_CODEC_H264
+  };
+
+enum eVideoFormat {
+  VIDEO_FORMAT_INVALID = -1,
+  VIDEO_FORMAT_UNKNOWN,
+  VIDEO_FORMAT_RESERVED,
+  VIDEO_FORMAT_COMPONENT,
+  VIDEO_FORMAT_PAL,
+  VIDEO_FORMAT_NTSC,
+  VIDEO_FORMAT_SECAM,
+  VIDEO_FORMAT_MAC
+  };
+
+enum eVideoScan {
+  VIDEO_SCAN_INVALID = -1,
+  VIDEO_SCAN_UNKNOWN,
+  VIDEO_SCAN_RESERVED,
+  VIDEO_SCAN_INTERLACED,
+  VIDEO_SCAN_PROGRESSIVE
+  };
+
+enum eVideoAspectRatio {
+  VIDEO_ASPECT_RATIO_INVALID = -1,
+  VIDEO_ASPECT_RATIO_RESERVED,
+  VIDEO_ASPECT_RATIO_EXTENDED,
+  VIDEO_ASPECT_RATIO_1_1,
+  VIDEO_ASPECT_RATIO_4_3,
+  VIDEO_ASPECT_RATIO_16_9,
+  VIDEO_ASPECT_RATIO_2_21_1,
+  VIDEO_ASPECT_RATIO_12_11,
+  VIDEO_ASPECT_RATIO_10_11,
+  VIDEO_ASPECT_RATIO_16_11,
+  VIDEO_ASPECT_RATIO_40_33,
+  VIDEO_ASPECT_RATIO_24_11,
+  VIDEO_ASPECT_RATIO_20_11,
+  VIDEO_ASPECT_RATIO_32_11,
+  VIDEO_ASPECT_RATIO_80_33,
+  VIDEO_ASPECT_RATIO_18_11,
+  VIDEO_ASPECT_RATIO_15_11,
+  VIDEO_ASPECT_RATIO_64_33,
+  VIDEO_ASPECT_RATIO_160_99,
+  VIDEO_ASPECT_RATIO_3_2,
+  VIDEO_ASPECT_RATIO_2_1
+  };
+
+typedef struct video_info {
+  eVideoCodec       codec;       // enum
+  eVideoFormat      format;      // enum
+  eVideoScan        scan;        // enum
+  eVideoAspectRatio aspectRatio; // enum
+  int               width;       // pixels
+  int               height;      // pixels
+  double            frameRate;   // Hz
+  double            bitrate;     // Mbit/s
+} video_info_t;
+
+#endif //__FEMONVIDEO_H

po/de_DE.po

@@ -7,9 +7,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.0\n"
+"Project-Id-Version: femon 1.6.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-03-23 14:53+0100\n"
+"POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Christian Wieninger\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -71,15 +71,6 @@ msgstr "Hauptmen
 msgid "Define whether the main menu entry is hidden."
 msgstr ""
 
-msgid "Use single area (8bpp)"
-msgstr "Ein Bildbereich benutzen (8bpp)"
-
-msgid ""
-"Define whether a single 8bpp OSD area is preferred.\n"
-"\n"
-"Required by Truetype fonts and anti-aliasing."
-msgstr ""
-
 msgid "Default display mode"
 msgstr "Standard Anzeigemodus"
 
@@ -107,12 +98,6 @@ msgstr "Horizontaler Offset"
 msgid "Define the horizontal offset of OSD."
 msgstr ""
 
-msgid "Show CA system"
-msgstr "CA System anzeigen"
-
-msgid "Define whether the CA system is shown as text."
-msgstr ""
-
 msgid "Red limit [%]"
 msgstr "Grenze Rot [%]"
 
@@ -191,15 +176,6 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"
 
-msgid "Satellite Card"
-msgstr "Satellitenkarte"
-
-msgid "Cable Card"
-msgstr "Kabelkarte"
-
-msgid "Terrestrial Card"
-msgstr "Terrestrische Karte"
-
 msgid "Coderate"
 msgstr "Coderate"
 
@@ -209,6 +185,9 @@ msgstr "Streaminformation"
 msgid "Video Stream"
 msgstr "Video Stream"
 
+msgid "Codec"
+msgstr ""
+
 msgid "Bitrate"
 msgstr "Bitrate"
 
@@ -218,9 +197,6 @@ msgstr "Seitenverh
 msgid "Frame Rate"
 msgstr "Bildrate"
 
-msgid "Hz"
-msgstr "Hz"
-
 msgid "Video Format"
 msgstr "Bildformat"
 
@@ -230,8 +206,8 @@ msgstr "Aufl
 msgid "Audio Stream"
 msgstr "Audio Stream"
 
-msgid "MPEG Layer"
+msgid "Channel Mode"
-msgstr "MPEG Layer"
+msgstr ""
 
 msgid "Sampling Frequency"
 msgstr "Abtastrate"
@@ -239,12 +215,6 @@ msgstr "Abtastrate"
 msgid "AC-3 Stream"
 msgstr "AC-3 Stream"
 
-msgid "kHz"
-msgstr "kHz"
-
-msgid "Frame Size"
-msgstr "Frame Gr<47><72>e"
-
 msgid "Bit Stream Mode"
 msgstr "Bitstream Modus"
 
@@ -278,57 +248,81 @@ msgstr "Fest"
 msgid "Analog"
 msgstr "Analog"
 
-msgid "SECA/Mediaguard"
+msgid "MPEG-2"
-msgstr "SECA/Mediaguard"
+msgstr ""
 
-msgid "Viaccess"
+msgid "H.264"
-msgstr "Viaccess"
+msgstr ""
 
-msgid "Irdeto"
+msgid "MPEG-1 Layer I"
-msgstr "Irdeto"
+msgstr ""
 
-msgid "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
-msgstr "NDS/Videoguard"
+msgstr ""
 
-msgid "Conax"
+msgid "MPEG-1 Layer III"
-msgstr "Conax"
+msgstr ""
 
-msgid "CryptoWorks"
+msgid "MPEG-2 Layer I"
-msgstr "CryptoWorks"
+msgstr ""
 
-msgid "PowerVu"
+msgid "MPEG-2 Layer II"
-msgstr "PowerVu"
+msgstr ""
 
-msgid "NagraVision"
+msgid "MPEG-2 Layer III"
-msgstr "NagraVision"
+msgstr ""
 
-msgid "BetaCrypt"
+msgid "HE-AAC"
-msgstr "BetaCrypt"
+msgstr ""
 
-msgid "SkyCrypt"
+msgid "stereo"
-msgstr "SkyCrypt"
+msgstr ""
 
-msgid "none"
+msgid "joint Stereo"
-msgstr "Nichts"
+msgstr ""
 
-msgid "auto"
+msgid "dual"
-msgstr "Auto"
+msgstr ""
+
+msgid "mono"
+msgstr ""
 
 msgid "MHz"
 msgstr "MHz"
 
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
 msgstr "belegt"
 
+msgid "extended"
+msgstr ""
+
 msgid "unknown"
 msgstr "unbekannt"
 
+msgid "component"
+msgstr ""
+
 msgid "PAL"
 msgstr "PAL"
 
 msgid "NTSC"
 msgstr "NTSC"
 
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
 msgstr "Complete Main (CM)"
 

po/es_ES.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.0\n"
+"Project-Id-Version: femon 1.6.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-03-23 14:42+0100\n"
+"POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Luis Palacios\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -69,15 +69,6 @@ msgstr "Ocultar en el men
 msgid "Define whether the main menu entry is hidden."
 msgstr ""
 
-msgid "Use single area (8bpp)"
-msgstr ""
-
-msgid ""
-"Define whether a single 8bpp OSD area is preferred.\n"
-"\n"
-"Required by Truetype fonts and anti-aliasing."
-msgstr ""
-
 msgid "Default display mode"
 msgstr "Modo de visualizaci<63>n estandar"
 
@@ -105,12 +96,6 @@ msgstr "Desplazamiento horizontal"
 msgid "Define the horizontal offset of OSD."
 msgstr ""
 
-msgid "Show CA system"
-msgstr "Mostrar sistema CA"
-
-msgid "Define whether the CA system is shown as text."
-msgstr ""
-
 msgid "Red limit [%]"
 msgstr "L<>mite de rojo [%s]"
 
@@ -189,15 +174,6 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"
 
-msgid "Satellite Card"
-msgstr "Tarjeta Sat<61>lite"
-
-msgid "Cable Card"
-msgstr "Tarjeta Cable"
-
-msgid "Terrestrial Card"
-msgstr "Tarjeta TDT"
-
 msgid "Coderate"
 msgstr "Coderate"
 
@@ -207,6 +183,9 @@ msgstr "Informaci
 msgid "Video Stream"
 msgstr "Flujo de video"
 
+msgid "Codec"
+msgstr ""
+
 msgid "Bitrate"
 msgstr "Tasa de bits"
 
@@ -216,9 +195,6 @@ msgstr "Proporciones de la imagen"
 msgid "Frame Rate"
 msgstr "Tasa de frames"
 
-msgid "Hz"
-msgstr "Hz"
-
 msgid "Video Format"
 msgstr "Formato de video"
 
@@ -228,8 +204,8 @@ msgstr "Resoluci
 msgid "Audio Stream"
 msgstr "Flujo de audio"
 
-msgid "MPEG Layer"
+msgid "Channel Mode"
-msgstr "Nivel MPEG"
+msgstr ""
 
 msgid "Sampling Frequency"
 msgstr "Frecuencia de muestreo"
@@ -237,12 +213,6 @@ msgstr "Frecuencia de muestreo"
 msgid "AC-3 Stream"
 msgstr "Flujo AC-3"
 
-msgid "kHz"
-msgstr "kHz"
-
-msgid "Frame Size"
-msgstr "Tama<6D>o de frame"
-
 msgid "Bit Stream Mode"
 msgstr "Modo bitstream"
 
@@ -276,57 +246,81 @@ msgstr "Fijo"
 msgid "Analog"
 msgstr "Anal<61>gico"
 
-msgid "SECA/Mediaguard"
+msgid "MPEG-2"
-msgstr "SECA/Mediguard"
+msgstr ""
 
-msgid "Viaccess"
+msgid "H.264"
-msgstr "Viaccess"
+msgstr ""
 
-msgid "Irdeto"
+msgid "MPEG-1 Layer I"
-msgstr "Irdeto"
+msgstr ""
 
-msgid "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
-msgstr "NDS/Videoguard"
+msgstr ""
 
-msgid "Conax"
+msgid "MPEG-1 Layer III"
-msgstr "Conax"
+msgstr ""
 
-msgid "CryptoWorks"
+msgid "MPEG-2 Layer I"
-msgstr "CryptoWorks"
+msgstr ""
 
-msgid "PowerVu"
+msgid "MPEG-2 Layer II"
-msgstr "PowerVu"
+msgstr ""
 
-msgid "NagraVision"
+msgid "MPEG-2 Layer III"
-msgstr "NagraVision"
+msgstr ""
 
-msgid "BetaCrypt"
+msgid "HE-AAC"
-msgstr "BetaCrypt"
+msgstr ""
 
-msgid "SkyCrypt"
+msgid "stereo"
-msgstr "SkyCrypt"
+msgstr ""
 
-msgid "none"
+msgid "joint Stereo"
-msgstr "ninguno"
+msgstr ""
 
-msgid "auto"
+msgid "dual"
-msgstr "auto"
+msgstr ""
+
+msgid "mono"
+msgstr "o"
 
 msgid "MHz"
 msgstr "MHz"
 
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
 msgstr "reservado"
 
+msgid "extended"
+msgstr ""
+
 msgid "unknown"
 msgstr "desconocido"
 
+msgid "component"
+msgstr ""
+
 msgid "PAL"
 msgstr "PAL"
 
 msgid "NTSC"
 msgstr "NTSC"
 
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
 msgstr "Principal (CM)"
 

po/et_EE.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.0\n"
+"Project-Id-Version: femon 1.6.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-03-23 14:42+0100\n"
+"POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Arthur Konovalov\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -69,15 +69,6 @@ msgstr "Peida valik peamen
 msgid "Define whether the main menu entry is hidden."
 msgstr ""
 
-msgid "Use single area (8bpp)"
-msgstr ""
-
-msgid ""
-"Define whether a single 8bpp OSD area is preferred.\n"
-"\n"
-"Required by Truetype fonts and anti-aliasing."
-msgstr ""
-
 msgid "Default display mode"
 msgstr "Vaikimisi displei moodus"
 
@@ -105,12 +96,6 @@ msgstr "Horisontaalne nihe"
 msgid "Define the horizontal offset of OSD."
 msgstr ""
 
-msgid "Show CA system"
-msgstr "N<>ita CA s<>steemi"
-
-msgid "Define whether the CA system is shown as text."
-msgstr ""
-
 msgid "Red limit [%]"
 msgstr "Punase limiit [%]"
 
@@ -189,15 +174,6 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"
 
-msgid "Satellite Card"
-msgstr "Satelliidikaart"
-
-msgid "Cable Card"
-msgstr "Kaablikaart"
-
-msgid "Terrestrial Card"
-msgstr "Terrestiaalkaart"
-
 msgid "Coderate"
 msgstr "Coderate"
 
@@ -207,6 +183,9 @@ msgstr "Voo info"
 msgid "Video Stream"
 msgstr "Videovoog"
 
+msgid "Codec"
+msgstr ""
+
 msgid "Bitrate"
 msgstr "Bitikiirus"
 
@@ -216,9 +195,6 @@ msgstr "K
 msgid "Frame Rate"
 msgstr "Kaadrisagedus"
 
-msgid "Hz"
-msgstr "Hz"
-
 msgid "Video Format"
 msgstr "Videoformaat"
 
@@ -228,8 +204,8 @@ msgstr "Resolutsioon"
 msgid "Audio Stream"
 msgstr "Audiovoog"
 
-msgid "MPEG Layer"
+msgid "Channel Mode"
-msgstr "MPEG tase"
+msgstr ""
 
 msgid "Sampling Frequency"
 msgstr "S<>mplimissagedus"
@@ -237,12 +213,6 @@ msgstr "S
 msgid "AC-3 Stream"
 msgstr "AC-3 voog"
 
-msgid "kHz"
-msgstr "kHz"
-
-msgid "Frame Size"
-msgstr "Kaadri suurus"
-
 msgid "Bit Stream Mode"
 msgstr "Bitivoo t<><74>p"
 
@@ -276,57 +246,81 @@ msgstr "Fikseeritud"
 msgid "Analog"
 msgstr ""
 
-msgid "SECA/Mediaguard"
+msgid "MPEG-2"
-msgstr "SECA/Mediaguard"
+msgstr ""
 
-msgid "Viaccess"
+msgid "H.264"
-msgstr "Viaccess"
+msgstr ""
 
-msgid "Irdeto"
+msgid "MPEG-1 Layer I"
-msgstr "Irdeto"
+msgstr ""
 
-msgid "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
-msgstr "NDS/Videoguard"
+msgstr ""
 
-msgid "Conax"
+msgid "MPEG-1 Layer III"
-msgstr "Conax"
+msgstr ""
 
-msgid "CryptoWorks"
+msgid "MPEG-2 Layer I"
-msgstr "CryptoWorks"
+msgstr ""
 
-msgid "PowerVu"
+msgid "MPEG-2 Layer II"
-msgstr "PowerVu"
+msgstr ""
 
-msgid "NagraVision"
+msgid "MPEG-2 Layer III"
-msgstr "NagraVision"
+msgstr ""
 
-msgid "BetaCrypt"
+msgid "HE-AAC"
-msgstr "BetaCrypt"
+msgstr ""
 
-msgid "SkyCrypt"
+msgid "stereo"
-msgstr "SkyCrypt"
+msgstr ""
 
-msgid "none"
+msgid "joint Stereo"
-msgstr "ei"
+msgstr ""
 
-msgid "auto"
+msgid "dual"
-msgstr "auto"
+msgstr ""
+
+msgid "mono"
+msgstr ""
 
 msgid "MHz"
 msgstr "MHz"
 
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
 msgstr "reserveeritud"
 
+msgid "extended"
+msgstr ""
+
 msgid "unknown"
 msgstr "tundmatu"
 
+msgid "component"
+msgstr ""
+
 msgid "PAL"
 msgstr "PAL"
 
 msgid "NTSC"
 msgstr "NTSC"
 
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
 msgstr "T<>iskomplekt (CM)"
 

po/fi_FI.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.0\n"
+"Project-Id-Version: femon 1.6.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-03-23 14:42+0100\n"
+"POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -69,18 +69,6 @@ msgstr "Piilota valinta päävalikosta"
 msgid "Define whether the main menu entry is hidden."
 msgstr "Määrittele, näytetäänkö laajennoksen valinta päävalikossa."
 
-msgid "Use single area (8bpp)"
-msgstr "Käytä yksittäistä kuva-aluetta (8bpp)"
-
-msgid ""
-"Define whether a single 8bpp OSD area is preferred.\n"
-"\n"
-"Required by Truetype fonts and anti-aliasing."
-msgstr ""
-"Määrittele, yritetäänkö käyttää yksittäistä 8bpp kuva-aluetta.\n"
-"\n"
-"Truetype-kirjasimet ja reunan pehmennys vaativat tämän asetuksen."
-
 msgid "Default display mode"
 msgstr "Oletusnäyttötila"
 
@@ -108,12 +96,6 @@ msgstr "Vaakakeskitys"
 msgid "Define the horizontal offset of OSD."
 msgstr "Määrittele näytön vaakakeskitys."
 
-msgid "Show CA system"
-msgstr "Näytä salausjärjestelmä"
-
-msgid "Define whether the CA system is shown as text."
-msgstr "Määrittele, näytetään salausjärjestelmä tekstinä."
-
 msgid "Red limit [%]"
 msgstr "Punaisen taso [%]"
 
@@ -192,15 +174,6 @@ msgstr "Lähete-ID"
 msgid "Rid"
 msgstr "Radio-ID"
 
-msgid "Satellite Card"
-msgstr "Satelliittikortti"
-
-msgid "Cable Card"
-msgstr "Kaapelikortti"
-
-msgid "Terrestrial Card"
-msgstr "Terrestriaalikortti"
-
 msgid "Coderate"
 msgstr "Suojaustaso"
 
@@ -210,6 +183,9 @@ msgstr "Lähetteen tiedot"
 msgid "Video Stream"
 msgstr "Kuvaraita"
 
+msgid "Codec"
+msgstr "Koodekki"
+
 msgid "Bitrate"
 msgstr "Bittinopeus"
 
@@ -219,9 +195,6 @@ msgstr "Kuvasuhde"
 msgid "Frame Rate"
 msgstr "Ruudunpäivitystaajuus"
 
-msgid "Hz"
-msgstr "Hz"
-
 msgid "Video Format"
 msgstr "Kuvaformaatti"
 
@@ -231,8 +204,8 @@ msgstr "Resoluutio"
 msgid "Audio Stream"
 msgstr "Ääniraita"
 
-msgid "MPEG Layer"
+msgid "Channel Mode"
-msgstr "MPEG-taso"
+msgstr "Kanavatila"
 
 msgid "Sampling Frequency"
 msgstr "Näytteenottotaajuus"
@@ -240,12 +213,6 @@ msgstr "Näytteenottotaajuus"
 msgid "AC-3 Stream"
 msgstr "AC-3-ääniraita"
 
-msgid "kHz"
-msgstr "kHz"
-
-msgid "Frame Size"
-msgstr "Kehyksen koko"
-
 msgid "Bit Stream Mode"
 msgstr "Lähetteen tyyppi"
 
@@ -279,57 +246,81 @@ msgstr "kiinteä"
 msgid "Analog"
 msgstr "analoginen"
 
-msgid "SECA/Mediaguard"
+msgid "MPEG-2"
-msgstr "SECA/Mediaguard"
+msgstr "MPEG-2"
 
-msgid "Viaccess"
+msgid "H.264"
-msgstr "Viaccess"
+msgstr "H.264"
 
-msgid "Irdeto"
+msgid "MPEG-1 Layer I"
-msgstr "Irdeto"
+msgstr "MPEG-1 kerros I"
 
-msgid "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
-msgstr "NDS/Videoguard"
+msgstr "MPEG-1 kerros II"
 
-msgid "Conax"
+msgid "MPEG-1 Layer III"
-msgstr "Conax"
+msgstr "MPEG-1 kerros III"
 
-msgid "CryptoWorks"
+msgid "MPEG-2 Layer I"
-msgstr "CryptoWorks"
+msgstr "MPEG-2 kerros I"
 
-msgid "PowerVu"
+msgid "MPEG-2 Layer II"
-msgstr "PowerVu"
+msgstr "MPEG-2 kerros II"
 
-msgid "NagraVision"
+msgid "MPEG-2 Layer III"
-msgstr "NagraVision"
+msgstr "MPEG-2 kerros III"
 
-msgid "BetaCrypt"
+msgid "HE-AAC"
-msgstr "BetaCrypt"
+msgstr "HE-AAC"
 
-msgid "SkyCrypt"
+msgid "stereo"
-msgstr "SkyCrypt"
+msgstr "stereo"
 
-msgid "none"
+msgid "joint Stereo"
-msgstr "ei"
+msgstr "joint-stereo"
 
-msgid "auto"
+msgid "dual"
-msgstr "auto"
+msgstr "kaksikanavainen"
+
+msgid "mono"
+msgstr "mono"
 
 msgid "MHz"
 msgstr "MHz"
 
+msgid "interlaced"
+msgstr "lomiteltu"
+
+msgid "progressive"
+msgstr "lomittelematon"
+
 msgid "reserved"
 msgstr "varattu"
 
+msgid "extended"
+msgstr "laajennettu"
+
 msgid "unknown"
 msgstr "tuntematon"
 
+msgid "component"
+msgstr "komponentti"
+
 msgid "PAL"
 msgstr "PAL"
 
 msgid "NTSC"
 msgstr "NTSC"
 
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
 msgstr "Pääasiallinen (CM)"
 

po/fr_FR.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.0\n"
+"Project-Id-Version: femon 1.6.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-03-23 14:42+0100\n"
+"POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2008-01-26 09:59+0100\n"
 "Last-Translator: NIVAL Micha<68>l <mnival@club-internet.fr>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -69,18 +69,6 @@ msgstr "Masquer dans le menu principal"
 msgid "Define whether the main menu entry is hidden."
 msgstr "D<>finit si l'entr<74>e doit <20>tre masqu<71>e dans le menu principal."
 
-msgid "Use single area (8bpp)"
-msgstr "Utiliser zone unique (8bpp)"
-
-msgid ""
-"Define whether a single 8bpp OSD area is preferred.\n"
-"\n"
-"Required by Truetype fonts and anti-aliasing."
-msgstr ""
-"D<>finit si une seule zone OSD de 8bpp est pr<70>f<EFBFBD>r<EFBFBD>e.\n"
-"\n"
-"Requis par les polices Truetype et l'anti-aliasing."
-
 msgid "Default display mode"
 msgstr "Affichage par d<>faut"
 
@@ -108,12 +96,6 @@ msgstr "D
 msgid "Define the horizontal offset of OSD."
 msgstr "D<>finit le d<>placement horizontal de l'OSD."
 
-msgid "Show CA system"
-msgstr "Afficher syst<73>me CA"
-
-msgid "Define whether the CA system is shown as text."
-msgstr "D<>finit si le syst<73>me CA doit <20>tre affich<63>."
-
 msgid "Red limit [%]"
 msgstr "Limite du rouge (%)"
 
@@ -192,15 +174,6 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"
 
-msgid "Satellite Card"
-msgstr "Carte Satellite"
-
-msgid "Cable Card"
-msgstr "Carte C<>ble"
-
-msgid "Terrestrial Card"
-msgstr "Carte TNT"
-
 msgid "Coderate"
 msgstr "Coderate"
 
@@ -210,6 +183,9 @@ msgstr "Information flux"
 msgid "Video Stream"
 msgstr "Flux vid<69>o"
 
+msgid "Codec"
+msgstr ""
+
 msgid "Bitrate"
 msgstr "Bitrate"
 
@@ -219,9 +195,6 @@ msgstr "Proportions d'image"
 msgid "Frame Rate"
 msgstr "Rafra<72>chissement"
 
-msgid "Hz"
-msgstr "Hz"
-
 msgid "Video Format"
 msgstr "Standard vid<69>o"
 
@@ -231,8 +204,8 @@ msgstr "R
 msgid "Audio Stream"
 msgstr "Flux audio"
 
-msgid "MPEG Layer"
+msgid "Channel Mode"
-msgstr "MPEG Layer"
+msgstr ""
 
 msgid "Sampling Frequency"
 msgstr "Fr<46>quence d'<27>chantillonage"
@@ -240,12 +213,6 @@ msgstr "Fr
 msgid "AC-3 Stream"
 msgstr "Flux AC-3"
 
-msgid "kHz"
-msgstr "kHz"
-
-msgid "Frame Size"
-msgstr "Taille de paquet"
-
 msgid "Bit Stream Mode"
 msgstr "Mode bitstream"
 
@@ -279,57 +246,81 @@ msgstr "Fixe"
 msgid "Analog"
 msgstr "Analogique"
 
-msgid "SECA/Mediaguard"
+msgid "MPEG-2"
-msgstr "SECA/Mediaguard"
+msgstr ""
 
-msgid "Viaccess"
+msgid "H.264"
-msgstr "Viaccess"
+msgstr ""
 
-msgid "Irdeto"
+msgid "MPEG-1 Layer I"
-msgstr "Irdeto"
+msgstr ""
 
-msgid "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
-msgstr "NDS/Videoguard"
+msgstr ""
 
-msgid "Conax"
+msgid "MPEG-1 Layer III"
-msgstr "Conax"
+msgstr ""
 
-msgid "CryptoWorks"
+msgid "MPEG-2 Layer I"
-msgstr "CryptoWorks"
+msgstr ""
 
-msgid "PowerVu"
+msgid "MPEG-2 Layer II"
-msgstr "PowerVu"
+msgstr ""
 
-msgid "NagraVision"
+msgid "MPEG-2 Layer III"
-msgstr "NagraVision"
+msgstr ""
 
-msgid "BetaCrypt"
+msgid "HE-AAC"
-msgstr "BetaCrypt"
+msgstr ""
 
-msgid "SkyCrypt"
+msgid "stereo"
-msgstr "SkyCrypt"
+msgstr ""
 
-msgid "none"
+msgid "joint Stereo"
-msgstr "Aucun"
+msgstr ""
 
-msgid "auto"
+msgid "dual"
-msgstr "Auto"
+msgstr ""
+
+msgid "mono"
+msgstr ""
 
 msgid "MHz"
 msgstr "MHz"
 
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
 msgstr "r<>serv<72>"
 
+msgid "extended"
+msgstr ""
+
 msgid "unknown"
 msgstr "inconnu"
 
+msgid "component"
+msgstr ""
+
 msgid "PAL"
 msgstr "PAL"
 
 msgid "NTSC"
 msgstr "NTSC"
 
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
 msgstr "Principal (CM)"
 

po/it_IT.po

@@ -1,15 +1,15 @@
 # VDR plugin language source file.
 # Copyright (C) 2007 Rolf Ahrenberg
-# This file is distributed under the same license as the VDR package.
+# This file is distributed under the same license as the femon package.
 # Sean Carlos
 # Diego Pierotto <vdr-italian@tiscali.it>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.0\n"
+"Project-Id-Version: femon 1.6.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-02-16 01:01+0200\n"
+"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2008-04-17 00:18+0100\n"
+"PO-Revision-Date: 2008-11-10 23:37+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
@@ -70,18 +70,6 @@ msgstr "Nascondi voce menu principale"
 msgid "Define whether the main menu entry is hidden."
 msgstr "Definisci se la voce del menu principale <20> nascosta."
 
-msgid "Use single area (8bpp)"
-msgstr "Utilizza area singola (8bpp)"
-
-msgid ""
-"Define whether a single 8bpp OSD area is preferred.\n"
-"\n"
-"Required by Truetype fonts and anti-aliasing."
-msgstr ""
-"Definisci se <20> preferita un'area OSD singola a 8bpp.\n"
-"\n"
-"Richiesto dai caratteri Truetype e anti-aliasing."
-
 msgid "Default display mode"
 msgstr "Modalit<69> visualizz. predefinita"
 
@@ -109,12 +97,6 @@ msgstr "Limite orizzontale"
 msgid "Define the horizontal offset of OSD."
 msgstr "Definisci il limite orizzontale dell'OSD."
 
-msgid "Show CA system"
-msgstr "Mostra sistema CA"
-
-msgid "Define whether the CA system is shown as text."
-msgstr "Definisci se il sistema CA viene mostrato come testo."
-
 msgid "Red limit [%]"
 msgstr "Limite rosso [%]"
 
@@ -193,15 +175,6 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"
 
-msgid "Satellite Card"
-msgstr "Scheda satellite"
-
-msgid "Cable Card"
-msgstr "Scheda via cavo"
-
-msgid "Terrestrial Card"
-msgstr "Scheda terrestre"
-
 msgid "Coderate"
 msgstr "Coderate"
 
@@ -211,6 +184,9 @@ msgstr "Informazioni flusso"
 msgid "Video Stream"
 msgstr "Flusso video"
 
+msgid "Codec"
+msgstr "Codifica"
+
 msgid "Bitrate"
 msgstr "Bitrate"
 
@@ -220,9 +196,6 @@ msgstr "Formato immagine"
 msgid "Frame Rate"
 msgstr "Frame rate"
 
-msgid "Hz"
-msgstr "Hz"
-
 msgid "Video Format"
 msgstr "Formato video"
 
@@ -232,8 +205,8 @@ msgstr "Risoluzione"
 msgid "Audio Stream"
 msgstr "Flusso audio"
 
-msgid "MPEG Layer"
+msgid "Channel Mode"
-msgstr "Formato MPEG"
+msgstr "Modalit<EFBFBD> canale"
 
 msgid "Sampling Frequency"
 msgstr "Frequenza campionamento"
@@ -241,12 +214,6 @@ msgstr "Frequenza campionamento"
 msgid "AC-3 Stream"
 msgstr "Flusso AC-3"
 
-msgid "kHz"
-msgstr "kHz"
-
-msgid "Frame Size"
-msgstr "Dimensione frame"
-
 msgid "Bit Stream Mode"
 msgstr "Modalit<69> bitstream"
 
@@ -280,57 +247,81 @@ msgstr "Fisso"
 msgid "Analog"
 msgstr "Analogico"
 
-msgid "SECA/Mediaguard"
+msgid "MPEG-2"
-msgstr "SECA/Mediaguard"
+msgstr "MPEG-2"
 
-msgid "Viaccess"
+msgid "H.264"
-msgstr "Viaccess"
+msgstr "H.264"
 
-msgid "Irdeto"
+msgid "MPEG-1 Layer I"
-msgstr "Irdeto"
+msgstr "MPEG-1 Layer I"
 
-msgid "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
-msgstr "NDS/Videoguard"
+msgstr "MPEG-1 Layer II"
 
-msgid "Conax"
+msgid "MPEG-1 Layer III"
-msgstr "Conax"
+msgstr "MPEG-1 Layer III"
 
-msgid "CryptoWorks"
+msgid "MPEG-2 Layer I"
-msgstr "CryptoWorks"
+msgstr "MPEG-2 Layer I"
 
-msgid "PowerVu"
+msgid "MPEG-2 Layer II"
-msgstr "PowerVu"
+msgstr "MPEG-2 Layer II"
 
-msgid "NagraVision"
+msgid "MPEG-2 Layer III"
-msgstr "NagraVision"
+msgstr "MPEG-2 Layer III"
 
-msgid "BetaCrypt"
+msgid "HE-AAC"
-msgstr "BetaCrypt"
+msgstr "HE-AAC"
 
-msgid "SkyCrypt"
+msgid "stereo"
-msgstr "SkyCrypt"
+msgstr "stereo"
 
-msgid "none"
+msgid "joint Stereo"
-msgstr "nessuna"
+msgstr "joint Stereo"
 
-msgid "auto"
+msgid "dual"
-msgstr "auto"
+msgstr "dual"
+
+msgid "mono"
+msgstr "mono"
 
 msgid "MHz"
 msgstr "MHz"
 
+msgid "interlaced"
+msgstr "interlacciato"
+
+msgid "progressive"
+msgstr "progressivo"
+
 msgid "reserved"
 msgstr "riservato"
 
+msgid "extended"
+msgstr "esteso"
+
 msgid "unknown"
 msgstr "sconosciuto"
 
+msgid "component"
+msgstr "componente"
+
 msgid "PAL"
 msgstr "PAL"
 
 msgid "NTSC"
 msgstr "NTSC"
 
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
 msgstr "Principale (P)"
 
@@ -396,4 +387,3 @@ msgstr "Mbit/s"
 
 msgid "kbit/s"
 msgstr "kbit/s"
-

po/ru_RU.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.6.0\n"
+"Project-Id-Version: femon 1.6.5\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-03-23 14:42+0100\n"
+"POT-Creation-Date: 2008-12-16 12:08+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Vyacheslav Dikonov\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -69,15 +69,6 @@ msgstr "
 msgid "Define whether the main menu entry is hidden."
 msgstr ""
 
-msgid "Use single area (8bpp)"
-msgstr ""
-
-msgid ""
-"Define whether a single 8bpp OSD area is preferred.\n"
-"\n"
-"Required by Truetype fonts and anti-aliasing."
-msgstr ""
-
 msgid "Default display mode"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
@@ -105,12 +96,6 @@ msgstr ""
 msgid "Define the horizontal offset of OSD."
 msgstr ""
 
-msgid "Show CA system"
-msgstr ""
-
-msgid "Define whether the CA system is shown as text."
-msgstr ""
-
 msgid "Red limit [%]"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)"
 
@@ -189,15 +174,6 @@ msgstr "Tid"
 msgid "Rid"
 msgstr "Rid"
 
-msgid "Satellite Card"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-msgid "Cable Card"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-msgid "Terrestrial Card"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
 msgid "Coderate"
 msgstr "Coderate"
 
@@ -207,6 +183,9 @@ msgstr ""
 msgid "Video Stream"
 msgstr ""
 
+msgid "Codec"
+msgstr ""
+
 msgid "Bitrate"
 msgstr ""
 
@@ -216,9 +195,6 @@ msgstr ""
 msgid "Frame Rate"
 msgstr ""
 
-msgid "Hz"
-msgstr "<22><>"
-
 msgid "Video Format"
 msgstr ""
 
@@ -228,7 +204,7 @@ msgstr ""
 msgid "Audio Stream"
 msgstr ""
 
-msgid "MPEG Layer"
+msgid "Channel Mode"
 msgstr ""
 
 msgid "Sampling Frequency"
@@ -237,12 +213,6 @@ msgstr ""
 msgid "AC-3 Stream"
 msgstr ""
 
-msgid "kHz"
-msgstr "ڳ<>"
-
-msgid "Frame Size"
-msgstr ""
-
 msgid "Bit Stream Mode"
 msgstr ""
 
@@ -276,57 +246,81 @@ msgstr ""
 msgid "Analog"
 msgstr ""
 
-msgid "SECA/Mediaguard"
+msgid "MPEG-2"
 msgstr ""
 
-msgid "Viaccess"
+msgid "H.264"
 msgstr ""
 
-msgid "Irdeto"
+msgid "MPEG-1 Layer I"
 msgstr ""
 
-msgid "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
 msgstr ""
 
-msgid "Conax"
+msgid "MPEG-1 Layer III"
 msgstr ""
 
-msgid "CryptoWorks"
+msgid "MPEG-2 Layer I"
 msgstr ""
 
-msgid "PowerVu"
+msgid "MPEG-2 Layer II"
 msgstr ""
 
-msgid "NagraVision"
+msgid "MPEG-2 Layer III"
 msgstr ""
 
-msgid "BetaCrypt"
+msgid "HE-AAC"
 msgstr ""
 
-msgid "SkyCrypt"
+msgid "stereo"
 msgstr ""
 
-msgid "none"
+msgid "joint Stereo"
-msgstr "<EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
 
-msgid "auto"
+msgid "dual"
-msgstr "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr ""
+
+msgid "mono"
+msgstr ""
 
 msgid "MHz"
 msgstr "<22><><EFBFBD>"
 
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
 msgstr ""
 
+msgid "extended"
+msgstr ""
+
 msgid "unknown"
 msgstr ""
 
+msgid "component"
+msgstr ""
+
 msgid "PAL"
 msgstr "PAL"
 
 msgid "NTSC"
 msgstr "NTSC"
 
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "<22><>"
+
 msgid "Complete Main (CM)"
 msgstr ""
 

symbols/encrypted.xpm

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

symbols/h264.xpm

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

symbols/mpeg2.xpm

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

symbols/seven.xpm

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

symbols/six.xpm

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