Added encryption icon.

Added initial support for H.264 and HE-AAC.
Fixed detection of false positives in audio/video streams. Refactored source code.
2023-10-10 11:36:53 +00:00 · 2008-11-09 14:35:12 +02:00 · 2008-11-09 13:43:27 +02:00 · 2008-10-12 22:43:38 +03:00 · 2008-09-17 18:51:38 +03:00 · 2008-09-10 17:37:28 +03:00
40 changed files with 3276 additions and 2614 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.dependencies
+*.o
+*.so
+*~
+po/*.pot
+po/*.mo
--- a/72
+++ b/72
@@ -1,3 +1,4 @@
+
 ===================================
 VDR Plugin 'femon' Revision History
 ===================================
@@ -45,7 +46,7 @@ VDR Plugin 'femon' Revision History
 2004-04-04: Version 0.0.3c

 - Fixed minor bitrate calculation errors.
- Added russian translation (Thanks to Vyacheslav Dikonov).
+- Added Russian translation (Thanks to Vyacheslav Dikonov).

 2004-05-31: Version 0.0.4

@@ -76,7 +77,7 @@ VDR Plugin 'femon' Revision History
 - Added "Stream Information" display mode.
  Toggle between different modes with 'OK' key:
  .-> basic -> transponder -> stream -.
-  `-----------------------------------<EFBFBD>
+  `-----------------------------------'
 - Added missing german translations (Thanks to Peter Marquardt).

 2004-06-06: Version 0.1.2
@@ -150,7 +151,7 @@ VDR Plugin 'femon' Revision History

 2005-04-02: Version 0.8.8

- Cleaned up finnish translations (Thanks to Ville Skytt<EFBFBD>).
+- Cleaned up Finnish translations (Thanks to Ville Skyttä).

 2005-04-04: Version 0.8.9

@@ -187,13 +188,13 @@ VDR Plugin 'femon' Revision History
 2005-11-13: Version 0.9.5

 - Updated for vdr-1.3.36.
- Added french translation (Thanks to Nicolas Huillard).
+- Added French translation (Thanks to Nicolas Huillard).
 - Enabled bitrate commands via SVDRP.
 - Added new SVDRP commands.
 - Modified femon service without incrementing version number.
 - Added "Duotone" theme for 2bpp on screen displays.
 - Fixed crash bug in femonreceiver.
- Fixed setup page bug (Thanks to Thomas G<EFBFBD>nther for reporting this one).
+- Fixed setup page bug (Thanks to Thomas Günther for reporting this one).

 2006-01-25: Version 0.9.6

@@ -220,14 +221,14 @@ VDR Plugin 'femon' Revision History

 2006-04-23: Version 0.9.10

- Added STRIP option for Makefile (Thanks to Ville Skytt<EFBFBD>).
+- Added STRIP option for Makefile (Thanks to Ville Skyttä).
 - Modified APIVERSION code in Makefile.

 2006-04-30: Version 1.0.0

 - Updated for vdr-1.4.0.
 - Modified APIVERSION code in Makefile.
- Updated german translation (Thanks to Andreas Brachold).
+- Updated German translation (Thanks to Andreas Brachold).

 2006-06-06: Version 1.0.1

@@ -237,7 +238,7 @@ VDR Plugin 'femon' Revision History
 2006-09-17: Version 1.1.0

 - Added support for svdrpservice plugin (Thanks to Frank Schmirler).
- Added INFO SVDRP command (partially based on patch by Herbert P<EFBFBD>tzl).
+- Added INFO SVDRP command (partially based on patch by Herbert Pötzl).
 - Removed system log option - use SVDRP instead.
 - Added --remove-destination to the 'cp' command in Makefile.

@@ -247,12 +248,65 @@ VDR Plugin 'femon' Revision History

 2007-05-01: Version 1.1.2

- Fixed opening while replaying (Thanks to Antti Sepp<EFBFBD>l<EFBFBD> for reporting this one).
+- Fixed opening while replaying (Thanks to Antti Seppälä for reporting this one).

 2007-05-15: Version 1.1.3

 - Fixed a race condition in cFemonReceiver (Thanks to Reinhard Nissl).

+2007-10-14: Version 1.1.4
+
+- Backported from 1.2.2.
+
+2008-01-20: Version 1.1.5
+
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Added '-Wno-parentheses' to the compiler options.
+
 2007-08-14: Version 1.2.0

 - Updated for vdr-1.5.7.
+
+2007-08-19: Version 1.2.1
+
+- Updated for vdr-1.5.8.
+
+2007-10-14: Version 1.2.2
+
+- Added Spids support.
+- Minor OSD layout changes.
+
+2008-01-20: Version 1.2.3
+
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Added '-Wno-parentheses' to the compiler options.
+- Mapped 'kInfo' as help key in setup menu.
+
+2008-02-18: Version 1.2.4
+
+- Replaced asprintf with cString.
+- Updated French translation (Thanks to Michaël Nival).
+- Fixed service call with null data.
+- Added setup option to use a single 8 bpp OSD area.
+
+2008-03-27: Version 1.6.0
+
+- Updated for vdr-1.6.0.
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Added ST:TNG theme (Thanks to Fabian Förg).
+
+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)
+
+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.
--- a/44
+++ b/44
@@ -1,7 +1,6 @@
 #
-# Makefile for a Video Disk Recorder plugin
+# Makefile for Frontend Status Monitor plugin
 #
-# $Id$

 # Debugging on/off 
 #FEMON_DEBUG = 1
@@ -15,6 +14,8 @@ STRIP = strip
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
+# IMPORTANT: the presence of this macro is important for the Make.config
+# file. So it must be defined, even if it is not used here!
 #
 PLUGIN = femon

@@ -25,7 +26,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
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses

 ### The directory environment:

@@ -65,16 +66,20 @@ 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:
+
+all: libvdr-$(PLUGIN).so i18n

 ### Implicit rules:

 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<

-# Dependencies:
+### Dependencies:

-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
@@ -86,30 +91,28 @@ $(DEPFILE): Makefile
 PODIR     = po
 LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
-I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot

 %.mo: %.po
 	msgfmt -c -o $@ $<

 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $^

-$(I18Npo): $(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+%.po: $(I18Npot)
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@

-i18n: $(I18Nmo)
-	@mkdir -p $(LOCALEDIR)
-	for i in $(I18Ndirs); do\
-	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\
-	    done
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs) $(I18Npot)

 ### Targets:

-all: libvdr-$(PLUGIN).so i18n
-
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 ifndef FEMON_DEBUG
@@ -126,5 +129,4 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz

 clean:
-	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
--- a/6
+++ b/6
@@ -1,6 +1,7 @@
 This is a DVB Frontend Status Monitor plugin for the Video Disk Recorder (VDR).

-Written by:                  R o l f . A h r e n b e r g @ s c i . f i
+Written by:                  Rolf Ahrenberg
+                             < R o l f . A h r e n b e r g @ s c i . f i >

 Project's homepage:          http://www.saunalahti.fi/~rahrenbe/vdr/femon/

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

--- a/femon.c
+++ b/femon.c
@@ -3,22 +3,22 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id$
 */

 #include <vdr/menu.h>
 #include <vdr/remote.h>
+#include <vdr/menu.h>
 #include "femoncfg.h"
 #include "femonreceiver.h"
 #include "femonosd.h"
 #include "femonservice.h"
 #include "femontools.h"

-#if defined(APIVERSNUM) && APIVERSNUM < 10507
-#error "VDR-1.5.7 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10600
+#error "VDR-1.6.0 API version or greater is required!"
 #endif

-static const char VERSION[]       = "1.2.0";
+static const char VERSION[]       = "1.6.3";
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");

@@ -97,8 +97,8 @@ cOsdObject *cPluginFemon::MainMenuAction(void)
 {
  // Perform the action when selected from the main VDR menu.
  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  if (cReplayControl::NowReplaying())
-     Skins.Message(mtInfo, tr("Femon not available while replaying"));
+  if (cReplayControl::NowReplaying() || (Channels.Count() <= 0))
+     Skins.Message(mtInfo, tr("Femon not available"));
  else
     return cFemonOsd::Instance(true);
  return NULL;
@@ -108,6 +108,7 @@ 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);
@@ -132,18 +133,20 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)

 bool cPluginFemon::Service(const char *Id, void *Data)
 {
-  if ((strcmp(Id,"FemonService-v1.0") == 0) && Data) {
-     FemonService_v1_0 *data = (FemonService_v1_0*)Data;
-     int ndx = cDevice::ActualDevice()->CardIndex();
-     data->fe_name = getFrontendName(ndx);
-     data->fe_status = getFrontendStatus(ndx);
-     data->fe_snr = getSNR(ndx);
-     data->fe_signal = getSignal(ndx);
-     data->fe_ber = getBER(ndx);
-     data->fe_unc = getUNC(ndx);
-     data->video_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetVideoBitrate() : 0.0;
-     data->audio_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetAudioBitrate() : 0.0;
-     data->dolby_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetDolbyBitrate() : 0.0;
+  if (strcmp(Id,"FemonService-v1.0") == 0) {
+     if (Data) {
+        FemonService_v1_0 *data = (FemonService_v1_0*)Data;
+        int ndx = cDevice::ActualDevice()->CardIndex();
+        data->fe_name = getFrontendName(ndx);
+        data->fe_status = getFrontendStatus(ndx);
+        data->fe_snr = getSNR(ndx);
+        data->fe_signal = getSignal(ndx);
+        data->fe_ber = getBER(ndx);
+        data->fe_unc = getUNC(ndx);
+        data->video_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetVideoBitrate() : 0.0;
+        data->audio_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetAudioBitrate() : 0.0;
+        data->dolby_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetDolbyBitrate() : 0.0;
+        }
     return true;
     }

@@ -264,7 +267,8 @@ private:
  const char *skins[eFemonSkinMaxNumber];
  const char *themes[eFemonThemeMaxNumber];
  cFemonConfig data;
-  virtual void Setup(void);
+  cVector<const char*> help;
+  void Setup(void);
 protected:
  virtual eOSState ProcessKey(eKeys Key);
  virtual void Store(void);
@@ -285,6 +289,7 @@ cMenuFemonSetup::cMenuFemonSetup(void)

  themes[eFemonThemeClassic]       = tr("Classic");
  themes[eFemonThemeElchi]         = tr("Elchi");
+  themes[eFemonThemeSTTNG]         = tr("ST:TNG");
  themes[eFemonThemeDeepBlue]      = tr("DeepBlue");
  themes[eFemonThemeMoronimo]      = tr("Moronimo");
  themes[eFemonThemeEnigma]        = tr("Enigma");
@@ -301,24 +306,61 @@ void cMenuFemonSetup::Setup(void)
  int current = Current();

  Clear();
-  Add(new cMenuEditBoolItem(  tr("Hide main menu entry"),        &data.hidemenu,       tr("no"),            tr("yes")));
-  Add(new cMenuEditStraItem(  tr("Default display mode"),        &data.displaymode,    eFemonModeMaxNumber, dispmodes));
-  Add(new cMenuEditStraItem(  tr("Skin"),                        &data.skin,           eFemonSkinMaxNumber, skins));
-  Add(new cMenuEditStraItem(  tr("Theme"),                       &data.theme,          eFemonThemeMaxNumber,themes));
-  Add(new cMenuEditBoolItem(  tr("Position"),                    &data.position,       tr("bottom"),        tr("top")));
-  Add(new cMenuEditIntItem(   tr("Height"),                      &data.osdheight,      400,                 500));
-  Add(new cMenuEditIntItem(   tr("Horizontal offset"),           &data.osdoffset,      -50,                 50));
-  Add(new cMenuEditBoolItem(  tr("Show CA system"),              &data.showcasystem,   tr("no"),            tr("yes")));
-  Add(new cMenuEditIntItem(   tr("Red limit [%]"),               &data.redlimit,       1,                   50));
-  Add(new cMenuEditIntItem(   tr("Green limit [%]"),             &data.greenlimit,     51,                  100));
-  Add(new cMenuEditIntItem(   tr("OSD update interval [0.1s]"),  &data.updateinterval, 1,                   100));
-  Add(new cMenuEditBoolItem(  tr("Analyze stream"),              &data.analyzestream,  tr("no"),            tr("yes")));
-  if (femonConfig.analyzestream)
-     Add(new cMenuEditIntItem(tr("Calculation interval [0.1s]"), &data.calcinterval,   1,                   100));
-  Add(new cMenuEditBoolItem(  tr("Use SVDRP service"),           &data.usesvdrp));
+  help.Clear();
+
+  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."));
+
+  Add(new cMenuEditStraItem(trVDR("Setup.OSD$Skin"), &data.skin, eFemonSkinMaxNumber, skins));
+  help.Append(tr("Define the used OSD skin."));
+
+  Add(new cMenuEditStraItem(trVDR("Setup.OSD$Theme"), &data.theme, eFemonThemeMaxNumber,themes));
+  help.Append(tr("Define the used OSD theme."));
+
+  Add(new cMenuEditBoolItem(tr("Position"), &data.position, trVDR("bottom"), trVDR("top")));
+  help.Append(tr("Define the position of OSD."));
+
+  Add(new cMenuEditIntItem(trVDR("Setup.OSD$Height"), &data.osdheight, 400, 500));
+  help.Append(tr("Define the height of OSD."));
+
+  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."));
+
+  Add(new cMenuEditIntItem(tr("Green limit [%]"), &data.greenlimit, 51, 100));
+  help.Append(tr("Define a limit for green bar, which is used to indicate a good signal."));
+
+  Add(new cMenuEditIntItem(tr("OSD update interval [0.1s]"), &data.updateinterval, 1, 100));
+  help.Append(tr("Define an interval for OSD updates. The smaller interval generates higher CPU load."));
+
+  Add(new cMenuEditBoolItem(tr("Analyze stream"), &data.analyzestream));
+  help.Append(tr("Define whether the DVB stream is analyzed and bitrates calculated."));
+
+  if (femonConfig.analyzestream) {
+     Add(new cMenuEditIntItem(tr("Calculation interval [0.1s]"), &data.calcinterval, 1, 100));
+     help.Append(tr("Define an interval for calculation. The bigger interval generates more stable values."));
+     }
+
+  Add(new cMenuEditBoolItem(tr("Use SVDRP service"), &data.usesvdrp));
+  help.Append(tr("Define whether the SVDRP service is used in client/server setups."));
+
  if (data.usesvdrp) {
-     Add(new cMenuEditIntItem(tr("SVDRP service port"),          &data.svdrpport,      1,                   65535));
-     Add(new cMenuEditStrItem(tr("SVDRP service IP"),             data.svdrpip,        MaxSvdrpIp,          ".1234567890"));
+     Add(new cMenuEditIntItem(tr("SVDRP service port"), &data.svdrpport, 1, 65535));
+     help.Append(tr("Define the port number of SVDRP service."));
+
+     Add(new cMenuEditStrItem(tr("SVDRP service IP"), data.svdrpip, MaxSvdrpIp, ".1234567890"));
+     help.Append(tr("Define the IP address of SVDRP service."));
     }

  SetCurrent(Get(current));
@@ -330,6 +372,7 @@ 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);
@@ -354,9 +397,11 @@ eOSState cMenuFemonSetup::ProcessKey(eKeys Key)

  eOSState state = cMenuSetupPage::ProcessKey(Key);

-  if (Key != kNone && (data.analyzestream != oldAnalyzestream || data.usesvdrp != oldUsesvdrp)) {
+  if (Key != kNone && (data.analyzestream != oldAnalyzestream || data.usesvdrp != oldUsesvdrp))
     Setup();
-     }
+
+  if ((Key == kInfo) && (state == osUnknown) && (Current() < help.Size()))
+     return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("Help"), trVDR("Plugin"), PLUGIN_NAME_I18N), help[Current()]));

  return state;
 }
--- a/femonaac.c
+++ b/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;
+}
--- a/femonaac.h
+++ b/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
--- a/femonac3.c
+++ b/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 = (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;
+}
--- a/femonac3.h
+++ b/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
--- a/femonaudio.h
+++ b/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
--- a/femoncfg.c
+++ b/femoncfg.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id$
 */

 #include <string.h>
@@ -14,6 +13,7 @@ cFemonConfig femonConfig;
 cFemonConfig::cFemonConfig(void)
 {
  hidemenu       = 0;
+  usesinglearea  = 0;
  displaymode    = 0;
  skin           = 0;
  theme          = 0;
@@ -61,6 +61,18 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
    0xFFFFEE00, // clrYellow
    0xFF33CC33, // clrGreen
  },
+  {
+    // eFemonThemeSTTNG
+    4,          // bpp
+    0x7F000000, // clrBackground
+    0xFFFCC024, // clrTitleBackground
+    0xFF000000, // clrTitleText
+    0xFF00FCFC, // clrActiveText
+    0xFFFCC024, // clrInactiveText
+    0xFFFC1414, // clrRed
+    0xFFFCC024, // clrYellow
+    0xFF24FC24, // clrGreen
+  },
  {
    // eFemonThemeDeepBlue
    4,          // bpp
--- a/femoncfg.h
+++ b/femoncfg.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id$
 */

 #ifndef __FEMONCFG_H
@@ -25,6 +24,7 @@ struct cFemonConfig
 public:
  cFemonConfig(void);
  int hidemenu;
+  int usesinglearea;
  int displaymode;
  int skin;
  int theme;
@@ -55,6 +55,7 @@ enum eFemonThemes
 {
  eFemonThemeClassic,
  eFemonThemeElchi,
+  eFemonThemeSTTNG,
  eFemonThemeDeepBlue,
  eFemonThemeMoronimo,
  eFemonThemeEnigma,
--- a/femonclient/vdr-femonclient-0.0.2.tgz
+++ b/femonclient/vdr-femonclient-0.0.2.tgz
--- a/femonclient/vdr-femonclient-0.0.3.tgz
+++ b/femonclient/vdr-femonclient-0.0.3.tgz
--- a/femonh264.c
+++ b/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 0x10 // 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: -> sar %dx%d", sar_width, sar_height);
+           }
+        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);
+           }
+        }
+     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);
+
+  if (BR_EOF(&br)) {
+     //Dprintf("H.264 SPS: not enough data ?");
+     return false;
+     }
+  
+  return true;
+}
+
+#if 0
+static bool h264_parse_sei(const uint8_t *buf, int len, h264_sei_data_t *sei)
+{
+  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);
+          payloadType += lastByte;
+        } while (lastByte != 0xFF);
+
+        // last_payload_size_byte
+        do {
+          lastByte = br_get_u8(&br);
+          payloadSize += lastByte;
+        } while (lastByte != 0xFF);
+
+        { // sei_payload
+          switch (payloadType) {
+            //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 %d, frame rate %d", sei->bitrate, sei->frame_rate);
+                      }
+                   }
+                 break;
+
+            default:
+                 br_skip_bits(&br, payloadSize);
+                 break;
+            }            
+          // force byte align
+          br_byte_align(&br);
+        } // sei_payload
+      }   // sei_message
+    };
+
+  return true;
+}
+#endif
+
+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 = (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)
+{
+  // 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 ((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 };
+            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;
+               return true;
+               }
+            }
+         }
+#if 0
+      // ... for supplemental enhancement information
+      else if ((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 };
+            if (h264_parse_sei(nal_data, nal_len, &sei)) {
+               info->frameRate = sei.frame_rate;
+               info->bitrate = sei.bitrate;
+               info->scan = sei.scan;
+               return true;
+               }
+            }
+         }
+#endif
+      }
+
+  return true;
+}
--- a/femonh264.h
+++ b/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
--- a/femonmpeg.c
+++ b/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 * (((data[4] << 10) & 0x0003FC00UL) | ((data[5] << 2) & 0x000003FCUL) | (((data[6] & 0xC0) >> 6) & 0x00000003UL));
+
+  return true;
+}
--- a/femonmpeg.h
+++ b/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
--- a/femonosd.c
+++ b/femonosd.c
@@ -3,47 +3,22 @@
 *
 * 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 * 11)     // in pixels (11 rows)
+#define OSDINFOHEIGHT             (OSDROWHEIGHT * 13)     // in pixels (13 rows)
 #define OSDSTATUSHEIGHT           (OSDROWHEIGHT * 6)      // in pixels (6 rows)
 #define OSDSPACING                5
 #define OSDCORNERING              10
@@ -56,31 +31,87 @@
 #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);
-cBitmap cFemonOsd::bmStereo(stereo_xpm);
-cBitmap cFemonOsd::bmMonoLeft(monoleft_xpm);
-cBitmap cFemonOsd::bmMonoRight(monoright_xpm);
-cBitmap cFemonOsd::bmNumbers[MAX_BMNUMBERS] = {
-   cBitmap(zero_xpm),  cBitmap(one_xpm),  cBitmap(two_xpm),
-   cBitmap(three_xpm), cBitmap(four_xpm), cBitmap(five_xpm)
-};
-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);
+#define OSDDRAWSTATUSFRONTEND(column, bitmap, status) \
+        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)
+
+#define OSDDRAWSTATUSVALUES(label1, label2, label3, label4, label5, label6, label7) \
+        m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), label1, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
+        m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), label2, femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font); \
+        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(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), femonTheme[femonConfig.theme].clrBackground); \
+        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_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); \
+           }
+
+#define OSDDRAWSTATUSBOTTOMBAR() \
+        if (IS_OSDCORNERING) { \
+           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); \
+           }
+
+#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(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground); \
+        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_OSDCORNERING) { \
+           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2); \
+           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1); \
+           }
+
+#define OSDDRAWINFOBOTTOMBAR() \
+        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); \
+           }
+
+#define OSDCLEARINFO() \
+        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent)

 cFemonOsd *cFemonOsd::pInstance = NULL;

@@ -128,6 +159,7 @@ cFemonOsd::cFemonOsd()
 cFemonOsd::~cFemonOsd(void)
 {
  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  m_Sleep.Signal();
  if (Running())
     Cancel(3);
  if (m_SvdrpConnection.handle >= 0) {
@@ -145,7 +177,6 @@ cFemonOsd::~cFemonOsd(void)
 void cFemonOsd::DrawStatusWindow(void)
 {
  cMutexLock lock(m_Mutex);
-  unsigned int number = 0;
  cBitmap *bm = NULL;
  int snr = m_SNR / 655;
  int signal = m_Signal / 655;
@@ -155,138 +186,96 @@ void cFemonOsd::DrawStatusWindow(void)
  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());

-  if (m_Osd) {
-     m_Osd->DrawRectangle(0, OSDSTATUSWIN_Y(0), OSDWIDTH, OSDSTATUSWIN_Y(OSDSTATUSHEIGHT), femonTheme[femonConfig.theme].clrBackground);
-     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_Osd && channel) {
+     OSDDRAWSTATUSTITLEBAR(*cString::sprintf("%d%s %s", m_Number ? m_Number : channel->Number(), m_Number ? "-" : "", channel->ShortName(true)));
     if (m_SvdrpFrontend >= 0) {
-        x -= bmSVDRP.Width() + OSDSPACING;
-        y = (OSDROWHEIGHT - bmSVDRP.Height()) / 2;
-        if (y < 0) y = 0;
-        m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmSVDRP, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
+        bm = &bmSymbol[SYMBOL_SVDRP];
+        OSDDRAWSTATUSBM(OSDSPACING);
        }
-    number = cDevice::ActualDevice()->CardIndex();
-    if (number < MAX_BMNUMBERS) {
-       x -= bmNumbers[number].Width() + OSDSPACING;
-       y = (OSDROWHEIGHT - bmNumbers[number].Height()) / 2;
-       if (y < 0) y = 0;
-       m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmNumbers[number], femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
-       x -= bmDevice.Width();
-       y = (OSDROWHEIGHT - bmDevice.Height()) / 2;
-       if (y < 0) y = 0;
-       m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmDevice, femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
+     switch (cDevice::ActualDevice()->CardIndex()) {
+       case 1:  bm = &bmSymbol[SYMBOL_ONE];   break;
+       case 2:  bm = &bmSymbol[SYMBOL_TWO];   break;
+       case 3:  bm = &bmSymbol[SYMBOL_THREE]; break;
+       case 4:  bm = &bmSymbol[SYMBOL_FOUR];  break;
+       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);
+     bm = &bmSymbol[SYMBOL_DEVICE];
+     OSDDRAWSTATUSBM(0);
     if (IS_AUDIO_TRACK(track)) {
-        number = int(track - ttAudioFirst);
-        if (number < MAX_BMNUMBERS) {
-           x -= bmNumbers[number].Width() + OSDSPACING;
-           y = (OSDROWHEIGHT - bmNumbers[number].Height()) / 2;
-           if (y < 0) y = 0;
-           m_Osd->DrawBitmap(x, OSDSTATUSWIN_Y(offset+y), bmNumbers[number], femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground);
+        switch (int(track - ttAudioFirst)) {
+           case 1:  bm = &bmSymbol[SYMBOL_ONE];   break;
+           case 2:  bm = &bmSymbol[SYMBOL_TWO];   break;
+           case 3:  bm = &bmSymbol[SYMBOL_THREE]; break;
+           case 4:  bm = &bmSymbol[SYMBOL_FOUR];  break;
+           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 2:  bm = &bmMonoRight; break;
-           default: bm = &bmStereo;    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);
+           case 1:  bm = &bmSymbol[SYMBOL_MONO_LEFT];  break;
+           case 2:  bm = &bmSymbol[SYMBOL_MONO_RIGHT]; break;
+           default: bm = &bmSymbol[SYMBOL_STEREO];     break;
           }
+        OSDDRAWSTATUSBM(0);
        }
     else if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
-        if (m_Receiver->AC3_5_1())      bm = &bmDD51;
-        else if (m_Receiver->AC3_2_0()) bm = &bmDD20;
-        else                            bm = &bmDD;
-        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);
-           }
+        if      (m_Receiver->AC3_5_1()) bm = &bmSymbol[SYMBOL_DD51];
+        else if (m_Receiver->AC3_2_0()) bm = &bmSymbol[SYMBOL_DD20];
+        else                            bm = &bmSymbol[SYMBOL_DD];
+        OSDDRAWSTATUSBM(OSDSPACING);
        }
     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 VF_NTSC: bm = &bmNTSC; 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);
+           case VIDEO_FORMAT_PAL:  bm = &bmSymbol[SYMBOL_PAL];  break;
+           case VIDEO_FORMAT_NTSC: bm = &bmSymbol[SYMBOL_NTSC]; break;
+           default:                bm = NULL;                   break;
           }
+        OSDDRAWSTATUSBM(OSDSPACING);
        switch (m_Receiver->VideoAspectRatio()) {
-           case AR_1_1:    bm = &bmAspectRatio_1_1;    break;
-           case AR_4_3:    bm = &bmAspectRatio_4_3;    break;
-           case AR_16_9:   bm = &bmAspectRatio_16_9;   break;
-           case AR_2_21_1: bm = &bmAspectRatio_2_21_1; 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);
+           case VIDEO_ASPECT_RATIO_1_1:    bm = &bmSymbol[SYMBOL_AR_1_1];    break;
+           case VIDEO_ASPECT_RATIO_4_3:    bm = &bmSymbol[SYMBOL_AR_4_3];    break;
+           case VIDEO_ASPECT_RATIO_16_9:   bm = &bmSymbol[SYMBOL_AR_16_9];   break;
+           case VIDEO_ASPECT_RATIO_2_21_1: bm = &bmSymbol[SYMBOL_AR_2_21_1]; break;
+           default:                        bm = NULL;                        break;
           }
+        OSDDRAWSTATUSBM(OSDSPACING);
+        }
+     if (channel->Ca() > 0xFF) {
+        bm = &bmSymbol[SYMBOL_ENCRYPTED];
+        OSDDRAWSTATUSBM(OSDSPACING);
        }
     offset += OSDROWHEIGHT;
-     if (signal > 0) {
-        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);
-           }
-        }
+     OSDDRAWSTATUSBAR(signal);
     offset += OSDROWHEIGHT;
-     if (snr > 0) {
-        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);
-           }
-        }
+     OSDDRAWSTATUSBAR(snr);
     offset += OSDROWHEIGHT;
-     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "STR:", femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), *cString::sprintf("%04x", m_Signal), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     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);
+     OSDDRAWSTATUSVALUES("STR:", *cString::sprintf("%04x", m_Signal), *cString::sprintf("(%2d%%)", m_Signal / 655), "BER:", *cString::sprintf("%08x", m_BER),
+                         *cString::sprintf("%s:", tr("Video")),  *getBitrateMbits(m_Receiver ? m_Receiver->VideoBitrate() : (m_SvdrpFrontend >= 0 ? m_SvdrpVideoBitrate : -1.0)));
     offset += OSDROWHEIGHT;
-     m_Osd->DrawText(OSDSTATUSWIN_X(1), OSDSTATUSWIN_Y(offset), "SNR:", femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     m_Osd->DrawText(OSDSTATUSWIN_X(2), OSDSTATUSWIN_Y(offset), *cString::sprintf("%04x", m_SNR), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-     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);
-     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);
+     OSDDRAWSTATUSVALUES("SNR:", *cString::sprintf("%04x", m_SNR), *cString::sprintf("(%2d%%)", m_SNR / 655), "UNC:", *cString::sprintf("%08x", m_UNC),
+                         *cString::sprintf("%s:", (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) ? tr("AC-3") : tr("Audio")),
+                         *getBitrateKbits(m_Receiver ? ((m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) ? m_Receiver->AC3Bitrate() : m_Receiver->AudioBitrate()) : (m_SvdrpFrontend >= 0 ? m_SvdrpAudioBitrate : -1.0)));
     offset += OSDROWHEIGHT;
-     x = bmLock.Width();
-     y = (OSDROWHEIGHT - bmLock.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);
-     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);
-     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);
-     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);
-     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);
-     if (IS_OSDCORNERING) {
-        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);
-        }
+     x = bmSymbol[SYMBOL_LOCK].Width();
+     y = (OSDROWHEIGHT - bmSymbol[SYMBOL_LOCK].Height()) / 2;
+     OSDDRAWSTATUSFRONTEND(1, bmSymbol[SYMBOL_LOCK],    FE_HAS_LOCK);
+     OSDDRAWSTATUSFRONTEND(2, bmSymbol[SYMBOL_SIGNAL],  FE_HAS_SIGNAL);
+     OSDDRAWSTATUSFRONTEND(3, bmSymbol[SYMBOL_CARRIER], FE_HAS_CARRIER);
+     OSDDRAWSTATUSFRONTEND(4, bmSymbol[SYMBOL_VITERBI], FE_HAS_VITERBI);
+     OSDDRAWSTATUSFRONTEND(5, bmSymbol[SYMBOL_SYNC],    FE_HAS_SYNC);
+     OSDDRAWSTATUSBOTTOMBAR();
     m_Osd->Flush();
     }
 }
@@ -298,203 +287,143 @@ void cFemonOsd::DrawInfoWindow(void)
  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();

-  if (m_Osd) {
-     if (m_DisplayMode == eFemonModeTransponder) {
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground);
-        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), tr("Transponder Information"), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
-        if (IS_OSDCORNERING) {
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
-           }
-        offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Vpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Vpid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Ppid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        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;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Apid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getApids(channel), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Dpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getDpids(channel), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("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);
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Tpid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Tpid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Sid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Sid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Nid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        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;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Tid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Tid()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Rid"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *cString::sprintf("%d", channel->Rid()), 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), tr("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), tr("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), tr("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), tr("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), tr("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), tr("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;
+  if (m_Osd && channel) {
+     switch (m_DisplayMode) {
+       case eFemonModeTransponder:
+            OSDDRAWINFOTITLEBAR(tr("Transponder Information"));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOLEFT( trVDR("Vpid"), *cString::sprintf("%d", channel->Vpid()));
+            OSDDRAWINFORIGHT(trVDR("Ppid"), *cString::sprintf("%d", channel->Ppid()));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOLEFT(    tr("Apid"), *getApids(channel));
+            OSDDRAWINFORIGHT(   tr("Dpid"), *getDpids(channel));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOLEFT(    tr("Spid"), *getSpids(channel));
+            OSDDRAWINFORIGHT(trVDR("Tpid"), *cString::sprintf("%d", channel->Tpid()));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOLEFT( trVDR("Sid"),  *cString::sprintf("%d", channel->Sid()));
+            OSDDRAWINFORIGHT(   tr("Nid"),  *cString::sprintf("%d", channel->Nid()));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOLEFT(    tr("Tid"),  *cString::sprintf("%d", channel->Tid()));
+            OSDDRAWINFORIGHT(   tr("Rid"),  *cString::sprintf("%d", channel->Rid()));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOLEFT( trVDR("CA"),   *getCAids(channel, femonConfig.showcasystem));
+            offset += OSDROWHEIGHT;
+            switch (m_FrontendInfo.type) {
+              case FE_QPSK:
+                   OSDDRAWINFOLINE(*cString::sprintf("%s #%d - %s", tr("Satellite Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
+                   offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
+                   OSDDRAWINFORIGHT(trVDR("Source"),       *cSource::ToString(channel->Source()));
+                   offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Srate"),        *cString::sprintf("%d", channel->Srate()));
+                   OSDDRAWINFORIGHT(trVDR("Polarization"), *cString::sprintf("%c", toupper(channel->Polarization())));
+                   offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Inversion"),    *getInversion(channel->Inversion()));
+                   OSDDRAWINFORIGHT(trVDR("CoderateH"),    *getCoderate(channel->CoderateH()));
+                   //offset += OSDROWHEIGHT;
+                   //OSDDRAWINFOLEFT( trVDR("System"),     *getSystem(channel->System()));
+                   //OSDDRAWINFORIGHT(trVDR("RollOff"),    *getRollOff(channel->RollOff()));
+                   break;

-          case FE_QAM:
-               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);
-               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("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), tr("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), tr("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), tr("Modulation"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getModulation(channel->Modulation()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("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), tr("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:
+                   OSDDRAWINFOLINE(*cString::sprintf("%s #%d - %s", tr("Cable Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
+                   offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
+                   OSDDRAWINFORIGHT(trVDR("Source"),       *cSource::ToString(channel->Source()));
+                   offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Srate"),        *cString::sprintf("%d", channel->Srate()));
+                   OSDDRAWINFORIGHT(trVDR("Modulation"),   *getModulation(channel->Modulation()));
+                   offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Inversion"),    *getInversion(channel->Inversion()));
+                   OSDDRAWINFORIGHT(trVDR("CoderateH"),    *getCoderate(channel->CoderateH()));
+                   break;

-          case FE_OFDM:
-               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);
-               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("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), tr("Transmission"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getTransmission(channel->Transmission()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               offset += OSDROWHEIGHT;
-               m_Osd->DrawText( OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Bandwidth"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(2), OSDINFOWIN_Y(offset), *getBandwidth(channel->Bandwidth()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(3), OSDINFOWIN_Y(offset), tr("Modulation"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               m_Osd->DrawText(OSDINFOWIN_X(4), OSDINFOWIN_Y(offset), *getModulation(channel->Modulation()), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-               offset += OSDROWHEIGHT;
-               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("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), 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), tr("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), tr("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;
+              case FE_OFDM:
+                   OSDDRAWINFOLINE(*cString::sprintf("%s #%d - %s", tr("Terrestrial Card"), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
+                   offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
+                   OSDDRAWINFORIGHT(trVDR("Transmission"), *getTransmission(channel->Transmission()));
+                   offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Bandwidth"),    *getBandwidth(channel->Bandwidth()));
+                   OSDDRAWINFORIGHT(trVDR("Modulation"),   *getModulation(channel->Modulation()));
+                   offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Inversion"),    *getInversion(channel->Inversion()));
+                   OSDDRAWINFORIGHT(tr   ("Coderate"),     *cString::sprintf("%s (H) %s (L)", *getCoderate(channel->CoderateH()), *getCoderate(channel->CoderateL())));
+                   offset += OSDROWHEIGHT;
+                   OSDDRAWINFOLEFT( trVDR("Hierarchy"),    *getHierarchy(channel->Hierarchy()));
+                   OSDDRAWINFORIGHT(trVDR("Guard"),        *getGuard(channel->Guard()));
+                   //offset += OSDROWHEIGHT;
+                   //OSDDRAWINFOLEFT( trVDR("Alpha"),      *getAlpha(channel->Alpha()));
+                   //OSDDRAWINFORIGHT(trVDR("Priority"),   *getPriority(channel->Priority()));
+                   break;

-          default:
-               break;
-          }
-        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 if (m_DisplayMode == eFemonModeStream) {
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground);
-        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), tr("Stream Information"), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
-        if (IS_OSDCORNERING) {
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
-           }
-        offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Stream"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        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;
-        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), 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);
-        offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Aspect Ratio"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        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;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frame Rate"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        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);
-        offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Video Format"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        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;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Resolution"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        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);
-        offset += OSDROWHEIGHT;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Audio Stream"), femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        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);
-        offset += OSDROWHEIGHT;
-        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), *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;
-        m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("MPEG Layer"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
-        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);
-        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), *getAudioSamplingFreq(m_Receiver ? m_Receiver->AudioSamplingFreq() : FR_NOTVALID), 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 if (m_DisplayMode == eFemonModeAC3) {
-        m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), femonTheme[femonConfig.theme].clrBackground);
-        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), *cString::sprintf("%s - %s #%d %s", tr("Stream Information"), tr("AC-3 Stream"), IS_DOLBY_TRACK(track) ? channel->Dpid(int(track - ttDolbyFirst)) : channel->Dpid(0), IS_DOLBY_TRACK(track) ? channel->Dlang(int(track - ttDolbyFirst)) : channel->Dlang(0)), femonTheme[femonConfig.theme].clrTitleText, femonTheme[femonConfig.theme].clrTitleBackground, m_Font);
-        if (IS_OSDCORNERING) {
-           m_Osd->DrawEllipse(0, OSDINFOWIN_Y(0), OSDCORNERING, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -2);
-           m_Osd->DrawEllipse((OSDWIDTH-OSDCORNERING), OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDCORNERING), clrTransparent, -1);
-           }
-        offset += OSDROWHEIGHT;
-        if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
-           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);
-        }
+              default:
+                   break;
+              }
+            OSDDRAWINFOBOTTOMBAR();
+            break;
+
+       case eFemonModeStream:
+            OSDDRAWINFOTITLEBAR(tr("Stream Information"));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOACTIVE(  tr("Video Stream"),       *cString::sprintf("#%d", channel->Vpid()));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Codec"),              *getVideoCodec(m_Receiver ? m_Receiver->VideoCodec() : VIDEO_CODEC_INVALID));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Bitrate"),            *getVideoBitrate(m_Receiver ? m_Receiver->VideoBitrate() : 0, m_Receiver ? m_Receiver->VideoStreamBitrate() : 0));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Aspect Ratio"),       *getAspectRatio(m_Receiver ? m_Receiver->VideoAspectRatio() : VIDEO_ASPECT_RATIO_INVALID));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Frame Rate"),         *getFrameRate(m_Receiver ? m_Receiver->VideoFrameRate() : 0));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Video Format"),       *getVideoFormat(m_Receiver ? m_Receiver->VideoFormat() : VIDEO_CODEC_INVALID));
+            offset += OSDROWHEIGHT;
+            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;
+            OSDDRAWINFOACTIVE(  tr("Audio Stream"),       *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)));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Codec"),              *getAudioCodec(m_Receiver ? m_Receiver->AudioCodec() : AUDIO_CODEC_INVALID));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Channel Mode"),       *getAudioChannelMode(m_Receiver ? m_Receiver->AudioChannelMode() : AUDIO_CHANNEL_MODE_INVALID));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Bitrate"),            *getAudioBitrate(m_Receiver ? m_Receiver->AudioBitrate() : 0, m_Receiver ? m_Receiver->AudioStreamBitrate() : 0));
+            offset += OSDROWHEIGHT;
+            OSDDRAWINFOINACTIVE(tr("Sampling Frequency"), *getAudioSamplingFreq(m_Receiver ? m_Receiver->AudioSamplingFreq() : AUDIO_SAMPLING_FREQUENCY_INVALID));
+            OSDDRAWINFOBOTTOMBAR();
+            break;
+
+       case eFemonModeAC3:
+            OSDDRAWINFOTITLEBAR(tr("Stream Information"));
+            if (m_Receiver && m_Receiver->AC3Valid() && IS_DOLBY_TRACK(track)) {
+               offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("AC-3 Stream"),            *cString::sprintf("#%d %s", channel->Dpid(int(track - ttDolbyFirst)), channel->Dlang(int(track - ttDolbyFirst))));
+               offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("Bitrate"),                *getAudioBitrate(m_Receiver->AC3Bitrate(), m_Receiver->AC3StreamBitrate()));
+               offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("Sampling Frequency"),     *getAudioSamplingFreq(m_Receiver->AC3SamplingFreq()));
+               offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("Bit Stream Mode"),        *getAC3BitStreamMode(m_Receiver->AC3BitStreamMode(), m_Receiver->AC3AudioCodingMode()));
+               offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("Audio Coding Mode"),      *getAC3AudioCodingMode(m_Receiver->AC3AudioCodingMode(), m_Receiver->AC3BitStreamMode()));
+               offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("Center Mix Level"),       *getAC3CenterMixLevel(m_Receiver->AC3CenterMixLevel()));
+               offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("Surround Mix Level"),     *getAC3SurroundMixLevel(m_Receiver->AC3SurroundMixLevel()));
+               offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("Dolby Surround Mode"),    *getAC3DolbySurroundMode(m_Receiver->AC3DolbySurroundMode()));
+               offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("Low Frequency Effects"),  *cString::sprintf("%s", m_Receiver->AC3Lfe() ? tr("on") : tr("off")));
+               offset += OSDROWHEIGHT;
+               OSDDRAWINFOINACTIVE(tr("Dialogue Normalization"), *getAC3DialogLevel(m_Receiver->AC3DialogLevel()));
+               }
+            OSDDRAWINFOBOTTOMBAR();
+            break;
+
+       default:
+            OSDCLEARINFO();
+            break;
+       }
     m_Osd->Flush();
     }
 }
@@ -550,7 +479,7 @@ void cFemonOsd::Action(void)
       DrawInfoWindow();
       DrawStatusWindow();
       }
-    cCondWait::SleepMs(100 * femonConfig.updateinterval - t.Elapsed());
+    m_Sleep.Wait(max((int)(100 * femonConfig.updateinterval - t.Elapsed()), 3));
    }
 }

@@ -559,11 +488,9 @@ void cFemonOsd::Show(void)
  Dprintf("%s()\n", __PRETTY_FUNCTION__);
  int apid[2] = {0, 0};
  int dpid[2] = {0, 0};
-  char *dev = NULL;
  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-  asprintf(&dev, FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
+  cString dev = cString::sprintf(FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
  m_Frontend = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
  if (m_Frontend >= 0) {
     if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
        esyslog("ERROR: cFemonOsd::Show() cannot read frontend info.");
@@ -583,14 +510,15 @@ 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) {
-     tArea Areas1[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, femonTheme[femonConfig.theme].bpp } };
-     if (m_Osd->CanHandleAreas(Areas1, sizeof(Areas1) / sizeof(tArea)) == oeOk) {
+     // try to use single 8bpp area
+     tArea Areas1[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, 8 } };
+     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 },
-                           { 0, OSDINFOWIN_Y(0),            (OSDWIDTH-1), OSDINFOWIN_Y(OSDROWHEIGHT-1),      femonTheme[femonConfig.theme].bpp },
-                           { 0, OSDINFOWIN_Y(OSDROWHEIGHT), (OSDWIDTH-1), OSDINFOWIN_Y(OSDINFOHEIGHT-1),     2 } };
+        tArea Areas2[] = { { 0, OSDSTATUSWIN_Y(0),          (OSDWIDTH - 1), OSDSTATUSWIN_Y(OSDSTATUSHEIGHT - 1), femonTheme[femonConfig.theme].bpp },
+                           { 0, OSDINFOWIN_Y(0),            (OSDWIDTH - 1), OSDINFOWIN_Y(OSDROWHEIGHT - 1),      femonTheme[femonConfig.theme].bpp },
+                           { 0, OSDINFOWIN_Y(OSDROWHEIGHT), (OSDWIDTH - 1), OSDINFOWIN_Y(OSDINFOHEIGHT - 1),     2 } };
        m_Osd->SetAreas(Areas2, sizeof(Areas2) / sizeof(tArea));
        }
     m_Osd->DrawRectangle(0, OSDINFOWIN_Y(0), OSDWIDTH, OSDINFOWIN_Y(OSDINFOHEIGHT), clrTransparent);
@@ -599,10 +527,12 @@ void cFemonOsd::Show(void)
        delete m_Receiver;
     if (femonConfig.analyzestream) {
        cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-        IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
-        IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
-        m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
-        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+        if (channel) {
+           IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
+           IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
+           m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
+           cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+           }
        }
     Start();
     }
@@ -613,14 +543,12 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
  Dprintf("%s(%d,%d)\n", __PRETTY_FUNCTION__, device->DeviceNumber(), channelNumber);
  int apid[2] = {0, 0};
  int dpid[2] = {0, 0};
-  char *dev = NULL;
  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
  if (!device->IsPrimaryDevice() || !channelNumber || cDevice::PrimaryDevice()->CurrentChannel() != channelNumber)
     return;
  close(m_Frontend);
-  asprintf(&dev, FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
+  cString dev = cString::sprintf(FRONTEND_DEVICE, cDevice::ActualDevice()->CardIndex(), 0);
  m_Frontend = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
  if (m_Frontend >= 0) {
     if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
        esyslog("ERROR: cFemonOsd::ChannelSwitch() cannot read frontend info.");
@@ -642,10 +570,12 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
     delete m_Receiver;
  if (femonConfig.analyzestream) {
     cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
-     IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
-     m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
-     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+     if (channel) {
+        IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
+        IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
+        m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
+        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+        }
     }
 }

@@ -659,10 +589,12 @@ void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks)
     delete m_Receiver;
  if (femonConfig.analyzestream) {
     cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
-     IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
-     m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
-     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+     if (channel) {
+        IS_AUDIO_TRACK(track) ? apid[0] = channel->Apid(int(track - ttAudioFirst)) : apid[0] = channel->Apid(0);
+        IS_DOLBY_TRACK(track) ? dpid[0] = channel->Dpid(int(track - ttDolbyFirst)) : dpid[0] = channel->Dpid(0);
+        m_Receiver = new cFemonReceiver(channel->GetChannelID(), channel->Ca(), channel->Vpid(), apid, dpid);
+        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
+        }
     }
 }

@@ -673,29 +605,27 @@ bool cFemonOsd::DeviceSwitch(int direction)
  direction = sgn(direction);
  if (device >= 0) {
     cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
-        if (direction) {
-           if (++device >= cDevice::NumDevices())
-              device = 0;
-           }
-        else {
-           if (--device < 0)
-              device = cDevice::NumDevices() - 1;
-           }
-        if (cDevice::GetDevice(device)->ProvidesChannel(channel, 0)) {
-           Dprintf("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, direction, device);
-           cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
-           cControl::Shutdown();
-           cDevice::GetDevice(device)->SwitchChannel(channel, true);
-           if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
-              cDevice::GetDevice(device)->ForceTransferMode();
-#if defined(APIVERSNUM) && APIVERSNUM < 10500
-           cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
-#else
-           cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
-#endif
-           cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
-           return (true);
+     if (channel) {
+        for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
+           if (direction) {
+              if (++device >= cDevice::NumDevices())
+                 device = 0;
+              }
+           else {
+              if (--device < 0)
+                 device = cDevice::NumDevices() - 1;
+              }
+           if (cDevice::GetDevice(device)->ProvidesChannel(channel, 0)) {
+              Dprintf("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, direction, device);
+              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
+              cControl::Shutdown();
+              cDevice::GetDevice(device)->SwitchChannel(channel, true);
+              if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
+                 cDevice::GetDevice(device)->ForceTransferMode();
+              cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->GetChannelID(), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
+              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
+              return (true);
+              }
           }
        }
     }
@@ -891,10 +821,13 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
               }
            break;
       case kOk:
+            {
            // toggle between display modes
-            if (++m_DisplayMode == eFemonModeAC3 && !Channels.GetByNumber(cDevice::CurrentChannel())->Dpid(0)) m_DisplayMode++;
+            cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+            if (++m_DisplayMode == eFemonModeAC3 && channel && !channel->Dpid(0)) m_DisplayMode++;
            if (m_DisplayMode >= eFemonModeMaxNumber) m_DisplayMode = 0;
            DrawInfoWindow();
+            }
            break;
       default:
            break;
--- a/femonosd.h
+++ b/femonosd.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id$
 */

 #ifndef __FEMONOSD_H
@@ -21,11 +20,10 @@
 #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;
@@ -46,12 +44,8 @@ private:
  int m_DisplayMode;
  const cFont *m_Font;
  cTimeMs m_InputTime;
+  cCondWait m_Sleep;
  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);
--- a/femonreceiver.c
+++ b/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,288 +21,142 @@
 #define PTS_DTS_FLAGS 0xC0

 cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[])
-#if defined(APIVERSNUM) && APIVERSNUM < 10500
-:cReceiver(Ca, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
-#else
-:cReceiver(ChannelID, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
-#endif
+: cReceiver(ChannelID, -1, Vpid, Apid, Dpid, NULL),
+  cThread("femon receiver"),
+  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_AC3Pid = Dpid[0];
-  m_VideoValid = false;
-  m_VideoPacketCount = 0;
-  m_VideoHorizontalSize = 0;
-  m_VideoVerticalSize = 0;
-  m_VideoAspectRatio = AR_RESERVED;
-  m_VideoFormat = VF_UNKNOWN;
-  m_VideoFrameRate = 0.0;
-  m_VideoStreamBitrate = 0.0;
-  m_VideoBitrate = 0.0;
-  m_AudioValid = false;
-  m_AudioPacketCount = 0;
-  m_AudioStreamBitrate = -2.0;
-  m_AudioBitrate = 0.0;
-  m_AudioSamplingFreq = -1;
-  m_AudioMPEGLayer = 0;
-  m_AudioBitrate = 0.0;
-  m_AC3Valid = false;
-  m_AC3PacketCount = 0; 
-  m_AC3StreamBitrate = 0;
-  m_AC3SamplingFreq = 0;
-  m_AC3Bitrate = 0;
-  m_AC3FrameSize = 0;
-  m_AC3BitStreamMode = FR_NOTVALID;
-  m_AC3AudioCodingMode = FR_NOTVALID;
-  m_AC3CenterMixLevel = FR_NOTVALID;
-  m_AC3SurroundMixLevel = FR_NOTVALID;
-  m_AC3DolbySurroundMode = FR_NOTVALID;
-  m_AC3LfeOn = false;
-  m_AC3DialogLevel = FR_NOTVALID;
+
+  m_VideoInfo.codec = VIDEO_CODEC_INVALID;
+  m_VideoInfo.format = VIDEO_FORMAT_INVALID;
+  m_VideoInfo.scan = VIDEO_SCAN_INVALID;
+  m_VideoInfo.aspectRatio = VIDEO_ASPECT_RATIO_INVALID;
+  m_VideoInfo.width = 0;
+  m_VideoInfo.height = 0;
+  m_VideoInfo.frameRate = 0;
+  m_VideoInfo.bitrate = AUDIO_BITRATE_INVALID;
+  for (unsigned int i = 0; i < ELEMENTS(m_VideoInfoBuffer); ++i)
+      memcpy(&m_VideoInfoBuffer[i], &m_VideoInfo, sizeof(video_info_t));
+
+  m_AudioInfo.codec = AUDIO_CODEC_UNKNOWN;
+  m_AudioInfo.bitrate = AUDIO_BITRATE_INVALID;
+  m_AudioInfo.samplingFrequency = AUDIO_SAMPLING_FREQUENCY_INVALID;
+  m_AudioInfo.channelMode = AUDIO_CHANNEL_MODE_INVALID;
+  for (unsigned int i = 0; i < ELEMENTS(m_AudioInfoBuffer); ++i)
+      memcpy(&m_AudioInfoBuffer[i], &m_AudioInfo, sizeof(audio_info_t));
+
+  m_AC3Info.bitrate = AUDIO_BITRATE_INVALID;
+  m_AC3Info.samplingFrequency = AUDIO_SAMPLING_FREQUENCY_INVALID;
+  m_AC3Info.bitstreamMode = AUDIO_BITSTREAM_MODE_INVALID;
+  m_AC3Info.audioCodingMode = AUDIO_CODING_MODE_INVALID;
+  m_AC3Info.dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
+  m_AC3Info.centerMixLevel = AUDIO_CENTER_MIX_LEVEL_INVALID;
+  m_AC3Info.surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
+  m_AC3Info.dialogLevel = 0;
+  m_AC3Info.lfe = false;
+  for (unsigned int i = 0; i < ELEMENTS(m_AC3InfoBuffer); ++i)
+      memcpy(&m_AC3InfoBuffer[i], &m_AC3Info, sizeof(ac3_info_t));
 }
- 
+
 cFemonReceiver::~cFemonReceiver(void)
 {
  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  m_Sleep.Signal();
  if (Running())
     Cancel(3);
  Detach();
 }

-/* The following function originates from libdvbmpeg: */
-void cFemonReceiver::GetVideoInfo(uint8_t *mbuf, int count)
+void cFemonReceiver::GetVideoInfo(uint8_t *buf, int len)
 {
-  uint8_t *headr;
-  int found = 0;
  int c = 0;
-  //m_VideoValid = false;
-  while ((found < 4) && ((c + 4) < count)) {
-    uint8_t *b;
-    b = mbuf + c;
-    if ((b[0] == 0x00) && (b[1] == 0x00) && (b[2] == 0x01) && (b[3] == 0xb3))
-       found = 4;
-    else
-       c++;
+
+  while (c < len) {
+    video_info_t tmp;
+    uint8_t *b = buf + c;
+    if (getMPEGVideoInfo(b, len - c, &tmp) || getH264VideoInfo(b, len - c, &tmp)) {
+       bool coherent = true;
+       memcpy(&m_VideoInfoBuffer[m_VideoInfoBufferIndex], &tmp, sizeof(video_info_t));
+       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++;
    }
-  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::GetAudioInfo(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 (!found && (c < count)) {
-    uint8_t *b = mbuf + c;
-    if ((b[0] == 0xff) && ((b[1] & 0xf8) == 0xf8))
-       found = 1;
-    else
-       c++;
+
+  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] =
-{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] =
+void cFemonReceiver::GetAC3Info(uint8_t *buf, int len)
 {
-  {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 (!found && (c < count)) {
-    uint8_t *b = mbuf + c;
-    if ((b[0] == 0x0b) && (b[1] == 0x77))
-       found = 1;
-    else
-       c++;
+
+  while (c < len) {
+    ac3_info_t tmp;
+    uint8_t *b = buf + c;
+    if (getAC3AudioInfo(b, len - c, &tmp)) {
+       bool coherent = true;
+       memcpy(&m_AC3InfoBuffer[m_AC3InfoBufferIndex], &tmp, sizeof(ac3_info_t));
+       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)
@@ -366,6 +223,6 @@ void cFemonReceiver::Action(void)
        m_AudioPacketCount = 0;
        m_AC3Bitrate   = (10.0 * 8.0 * 184.0 * m_AC3PacketCount)   / femonConfig.calcinterval;
        m_AC3PacketCount = 0;
-        cCondWait::SleepMs(100 * femonConfig.calcinterval - t.Elapsed());
+        m_Sleep.Wait(max((int)(100 * femonConfig.calcinterval - t.Elapsed()), 3));
    }
 }
--- a/femonreceiver.h
+++ b/femonreceiver.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id$
 */

 #ifndef __FEMONRECEIVER_H
@@ -12,83 +11,40 @@
 #include <vdr/thread.h>
 #include <vdr/receiver.h>

-enum eVideoFormat {
-  VF_UNKNOWN = 0,
-  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 eReveiverCodes {
-  FR_RESERVED = -1,
-  FR_FREE     = -2,
-  FR_NOTVALID = -3
-  };
+#include "femonaudio.h"
+#include "femonvideo.h"

 class cFemonReceiver : public cReceiver, public cThread {
 private:
-  int    m_VideoPid;
-  int    m_AudioPid;
-  int    m_AC3Pid;
-  bool   m_VideoValid;
-  int    m_VideoPacketCount;
-  int    m_VideoHorizontalSize;
-  int    m_VideoVerticalSize;
-  int    m_VideoAspectRatio;
-  int    m_VideoFormat;
-  double m_VideoFrameRate;
-  double m_VideoStreamBitrate;
-  double m_VideoBitrate;
-  bool   m_AudioValid;
-  int    m_AudioPacketCount;
-  double m_AudioStreamBitrate;
-  double m_AudioBitrate;
-  int    m_AudioSamplingFreq;
-  int    m_AudioMPEGLayer;
-  bool   m_AC3Valid;
-  int    m_AC3PacketCount;
-  double m_AC3Bitrate;
-  int    m_AC3FrameSize;
-  int    m_AC3SamplingFreq;
-  int    m_AC3StreamBitrate;
-  int    m_AC3BitStreamMode;
-  int    m_AC3AudioCodingMode;
-  int    m_AC3CenterMixLevel;
-  int    m_AC3SurroundMixLevel;
-  int    m_AC3DolbySurroundMode;
-  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);
+  cCondWait     m_Sleep;
+
+  int           m_VideoPid;
+  int           m_VideoPacketCount;
+  double        m_VideoBitrate;
+  bool          m_VideoValid;
+  video_info_t  m_VideoInfo;
+  video_info_t  m_VideoInfoBuffer[3];
+  unsigned int  m_VideoInfoBufferIndex;
+
+  int           m_AudioPid;
+  int           m_AudioPacketCount;
+  double        m_AudioBitrate;
+  bool          m_AudioValid;
+  audio_info_t  m_AudioInfo;
+  audio_info_t  m_AudioInfoBuffer[3];
+  unsigned int  m_AudioInfoBufferIndex;
+
+  int           m_AC3Pid;
+  int           m_AC3PacketCount;
+  double        m_AC3Bitrate;
+  bool          m_AC3Valid;
+  ac3_info_t    m_AC3Info;
+  ac3_info_t    m_AC3InfoBuffer[3];
+  unsigned int  m_AC3InfoBufferIndex;
+
+  void          GetVideoInfo(uint8_t *buf, int len);
+  void          GetAudioInfo(uint8_t *buf, int len);
+  void          GetAC3Info(uint8_t *buf, int len);

 protected:
  virtual void Activate(bool On);
@@ -99,35 +55,37 @@ public:
  cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[]);
  virtual ~cFemonReceiver();

-  bool VideoValid(void)           { return m_VideoValid; };          // boolean
-  int VideoHorizontalSize(void)   { return m_VideoHorizontalSize; }; // pixels
-  int VideoVerticalSize(void)     { return m_VideoVerticalSize; };   // pixels
-  int VideoAspectRatio(void)      { return m_VideoAspectRatio; };    // eAspectRatio
-  int VideoFormat(void)           { return m_VideoFormat; };         // eVideoFormat
-  double VideoFrameRate(void)     { return m_VideoFrameRate; };      // Hz
-  double VideoStreamBitrate(void) { return m_VideoStreamBitrate; };  // bit/s
-  double VideoBitrate(void)       { return m_VideoBitrate; };        // bit/s
+  bool   VideoValid(void)           { return m_VideoValid; };                  // boolean
+  double VideoBitrate(void)         { return m_VideoBitrate; };                // bit/s
+  int    VideoCodec(void)           { return m_VideoInfo.codec; };             // eVideoCodec
+  int    VideoFormat(void)          { return m_VideoInfo.format; };            // eVideoFormat
+  int    VideoScan(void)            { return m_VideoInfo.scan; };              // eVideoScan
+  int    VideoAspectRatio(void)     { return m_VideoInfo.aspectRatio; };       // eVideoAspectRatio
+  int    VideoHorizontalSize(void)  { return m_VideoInfo.width; };             // pixels
+  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
-  int AudioMPEGLayer(void)        { return m_AudioMPEGLayer; };      // layer number
-  int AudioSamplingFreq(void)     { return m_AudioSamplingFreq; };   // Hz
-  double AudioStreamBitrate(void) { return m_AudioStreamBitrate; };  // bit/s
-  double AudioBitrate(void)       { return m_AudioBitrate; };        // bit/s
+  bool   AudioValid(void)           { return m_AudioValid; };                  // boolean
+  double AudioBitrate(void)         { return m_AudioBitrate; };                // bit/s
+  int    AudioCodec(void)           { return m_AudioInfo.codec; };             // eAudioCodec
+  int    AudioChannelMode(void)     { return m_AudioInfo.channelMode; };       // eAudioChannelMode
+  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
-  int AC3SamplingFreq(void)       { return m_AC3SamplingFreq; };         // Hz
-  double AC3StreamBitrate(void)   { return m_AC3StreamBitrate; };        // bit/s
-  double AC3Bitrate(void)         { return m_AC3Bitrate; };              // bit/s
-  int AC3FrameSize(void)          { return m_AC3FrameSize; };            // Bytes
-  int AC3BitStreamMode(void)      { return m_AC3BitStreamMode; };        // 0..7
-  int AC3AudioCodingMode(void)    { return m_AC3AudioCodingMode; };      // 0..7
-  bool AC3_2_0(void)		  { return m_AC3AudioCodingMode == 2; }; // DD 2.0
-  bool AC3_5_1(void)	          { return m_AC3AudioCodingMode == 7; }; // DD 5.1
-  int AC3CenterMixLevel(void)     { return m_AC3CenterMixLevel; };       // eCenterMixLevel
-  int AC3SurroundMixLevel(void)   { return m_AC3SurroundMixLevel; };     // eSurroundMixLevel
-  int AC3DolbySurroundMode(void)  { return m_AC3DolbySurroundMode; };    // eDolbySurroundMode
-  bool AC3LfeOn(void)             { return m_AC3LfeOn; };                // boolean
-  int AC3DialogLevel(void)        { return m_AC3DialogLevel; };          // -dB
+  bool   AC3Valid(void)             { return m_AC3Valid; };                    // boolean
+  double AC3Bitrate(void)           { return m_AC3Bitrate; };                  // bit/s
+  double AC3StreamBitrate(void)     { return m_AC3Info.bitrate; };             // bit/s or eAudioBitrate
+  int    AC3SamplingFreq(void)      { return m_AC3Info.samplingFrequency; };   // Hz or eAudioSamplingFrequency
+  int    AC3BitStreamMode(void)     { return m_AC3Info.bitstreamMode; };       // 0..7 or eAudioBitstreamMode
+  int    AC3AudioCodingMode(void)   { return m_AC3Info.audioCodingMode; };     // 0..7 or eAudioCodingMode
+  bool   AC3_2_0(void)              { return m_AC3Info.audioCodingMode == AUDIO_CODING_MODE_2_0; }; // boolean
+  bool   AC3_5_1(void)	            { return m_AC3Info.audioCodingMode == AUDIO_CODING_MODE_3_2; }; // boolean
+  int    AC3DolbySurroundMode(void) { return m_AC3Info.dolbySurroundMode; };   // eAudioDolbySurroundMode
+  int    AC3CenterMixLevel(void)    { return m_AC3Info.centerMixLevel; };      // eAudioCenterMixLevel
+  int    AC3SurroundMixLevel(void)  { return m_AC3Info.surroundMixLevel; };    // eAudioSurroundMixLevel
+  int    AC3DialogLevel(void)       { return m_AC3Info.dialogLevel; };         // -dB
+  bool   AC3Lfe(void)               { return m_AC3Info.lfe; };                 // boolean
  };

 #endif //__FEMONRECEIVER_H
--- a/femonservice.h
+++ b/femonservice.h
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id$
 */

 #ifndef __FEMONSERVICE_H
--- a/femonsymbol.c
+++ b/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
+};
--- a/femonsymbol.h
+++ b/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
--- a/femontools.c
+++ b/femontools.c
@@ -3,7 +3,6 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id$
 */

 #include <stdlib.h>
@@ -23,12 +22,10 @@ cString getFrontendInfo(int cardIndex)
  uint16_t snr = 0;
  uint32_t ber = 0;
  uint32_t unc = 0;
-  char *dev = NULL;
  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);

-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev); 
  if (fe < 0)
     return NULL;
  CHECK(ioctl(fe, FE_GET_INFO, &value));
@@ -53,11 +50,9 @@ cString getFrontendInfo(int cardIndex)
 cString getFrontendName(int cardIndex)
 {
  struct dvb_frontend_info value;
-  char *dev = NULL;
+  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);

-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
  if (fe < 0)
     return NULL;
  CHECK(ioctl(fe, FE_GET_INFO, &value));
@@ -69,11 +64,9 @@ cString getFrontendName(int cardIndex)
 cString getFrontendStatus(int cardIndex)
 {
  fe_status_t value;
-  char *dev = NULL;
+  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);

-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
  if (fe < 0)
     return NULL;
  CHECK(ioctl(fe, FE_READ_STATUS, &value));
@@ -85,11 +78,9 @@ cString getFrontendStatus(int cardIndex)
 uint16_t getSignal(int cardIndex)
 {
  uint16_t value = 0;
-  char *dev = NULL;
+  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);

-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
  if (fe < 0)
     return (value);
  CHECK(ioctl(fe, FE_READ_SIGNAL_STRENGTH, &value));
@@ -101,11 +92,9 @@ uint16_t getSignal(int cardIndex)
 uint16_t getSNR(int cardIndex)
 {
  uint16_t value = 0;
-  char *dev = NULL;
+  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);

-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
  if (fe < 0)
     return (value);
  CHECK(ioctl(fe, FE_READ_SNR, &value));
@@ -117,11 +106,9 @@ uint16_t getSNR(int cardIndex)
 uint32_t getBER(int cardIndex)
 {
  uint32_t value = 0;
-  char *dev = NULL;
+  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);

-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
  if (fe < 0)
     return (value);
  CHECK(ioctl(fe, FE_READ_BER, &value));
@@ -133,11 +120,9 @@ uint32_t getBER(int cardIndex)
 uint32_t getUNC(int cardIndex)
 {
  uint32_t value = 0;
-  char *dev = NULL;
+  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);

-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
  if (fe < 0)
     return (value);
  CHECK(ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &value));
@@ -164,6 +149,15 @@ cString getDpids(const cChannel *channel)
  return dpids;
 }

+cString getSpids(const cChannel *channel)
+{
+  int value = 0;
+  cString spids = cString::sprintf("%d", channel->Spid(value));
+  while (channel->Spid(++value) && (value < MAXSPIDS))
+    spids = cString::sprintf("%s, %d", *spids, channel->Spid(value));
+  return spids;
+}
+
 cString getCAids(const cChannel *channel, bool identify)
 {
  cString caids;
@@ -186,29 +180,63 @@ cString getCA(int value)
 {
  /* http://www.dvb.org/index.php?id=174 */
  switch (value) {
-    case 0x0000:            return cString::sprintf("%s", tr("Free to Air")); /* Reserved */
+    case 0x0000:            return cString::sprintf("%s", trVDR("Free To Air"));  // Reserved
    case 0x0001 ... 0x009F:
-    case 0x00A2 ... 0x00FF: return cString::sprintf("%s", tr("Fixed")); /* Standardized systems */
-    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 */
+    case 0x00A2 ... 0x00FF: return cString::sprintf("%s", tr("Fixed"));           // Standardized systems
+    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);
 }

+cString getVideoCodec(int value)
+{
+  switch (value) {
+    case VIDEO_CODEC_MPEG2: return cString::sprintf("%s", tr("MPEG-2"));
+    case VIDEO_CODEC_H264:  return cString::sprintf("%s", tr("H.264"));
+    }
+  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"));
+    }
+  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"));
+    }
+  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", tr("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");
@@ -217,7 +245,7 @@ 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", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -227,7 +255,7 @@ 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", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -238,7 +266,7 @@ 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", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -246,9 +274,9 @@ cString getBandwidth(int value)
 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_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"));
    }
  return cString::sprintf("---");
 }
@@ -256,11 +284,11 @@ 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", tr("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: cString::sprintf("%s", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -272,7 +300,7 @@ 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: cString::sprintf("%s", tr("auto"));
    }
  return cString::sprintf("---");
 }
@@ -286,19 +314,66 @@ 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", tr("auto"));
    }
  return cString::sprintf("---");
 }

+cString getAlpha(int value)
+{
+  return cString::sprintf("---");
+}
+
+cString getPriority(int value)
+{
+  return cString::sprintf("---");
+}
+
+cString getSystem(int value)
+{
+  return cString::sprintf("---");
+}
+
+cString getRollOff(int value)
+{
+  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 AR_1_1:      return cString::sprintf("1:1");
-    case AR_4_3:      return cString::sprintf("4:3");
-    case AR_16_9:     return cString::sprintf("16:9");
-    case AR_2_21_1:   return cString::sprintf("2.21:1");
+    case VIDEO_ASPECT_RATIO_RESERVED: return cString::sprintf("%s", tr("reserved"));
+    case VIDEO_ASPECT_RATIO_EXTENDED: return cString::sprintf("%s", tr("extended"));
+    case VIDEO_ASPECT_RATIO_1_1:      return cString::sprintf("1:1");
+    case VIDEO_ASPECT_RATIO_4_3:      return cString::sprintf("4:3");
+    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");
    }
  return cString::sprintf("---");
 }
@@ -306,24 +381,35 @@ cString getAspectRatio(int value)
 cString getVideoFormat(int value)
 {
  switch (value) {
-    case VF_UNKNOWN: return cString::sprintf("%s", tr("unknown"));
-    case VF_PAL:     return cString::sprintf("%s", tr("PAL"));
-    case VF_NTSC:    return cString::sprintf("%s", tr("NTSC"));
+    case VIDEO_FORMAT_UNKNOWN:   return cString::sprintf("%s", tr("unknown"));
+    case VIDEO_FORMAT_RESERVED:  return cString::sprintf("%s", tr("reserved"));
+    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"));
    }
  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 1: return cString::sprintf("%s", tr("Music and Effects (ME)"));
-    case 2: return cString::sprintf("%s", tr("Visually Impaired (VI)"));
-    case 3: return cString::sprintf("%s", tr("Hearing Impaired (HI)"));
-    case 4: return cString::sprintf("%s", tr("Dialogue (D)"));
-    case 5: return cString::sprintf("%s", tr("Commentary (C)"));
-    case 6: 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_CM:     return cString::sprintf("%s", tr("Complete Main (CM)"));
+    case AUDIO_BITSTREAM_MODE_ME:     return cString::sprintf("%s", tr("Music and Effects (ME)"));
+    case AUDIO_BITSTREAM_MODE_VI:     return cString::sprintf("%s", tr("Visually Impaired (VI)"));
+    case AUDIO_BITSTREAM_MODE_HI:     return cString::sprintf("%s", tr("Hearing Impaired (HI)"));
+    case AUDIO_BITSTREAM_MODE_D:      return cString::sprintf("%s", tr("Dialogue (D)"));
+    case AUDIO_BITSTREAM_MODE_C:      return cString::sprintf("%s", tr("Commentary (C)"));
+    case AUDIO_BITSTREAM_MODE_E:      return cString::sprintf("%s", tr("Emergency (E)"));
+    case AUDIO_BITSTREAM_MODE_VO_KAR: return cString::sprintf("%s", (coding == 1) ? tr("Voice Over (VO)") : tr("Karaoke"));
    }
  return cString::sprintf("---");
 }
@@ -332,14 +418,14 @@ 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 1: return cString::sprintf("1/0 - %s", tr("C"));
-       case 2: 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 4: 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 6: 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_1_1: return cString::sprintf("1+1 - %s, %s", tr("Ch1"), tr("Ch2"));
+       case AUDIO_CODING_MODE_1_0: return cString::sprintf("1/0 - %s", tr("C"));
+       case AUDIO_CODING_MODE_2_0: return cString::sprintf("2/0 - %s, %s", tr("L"), tr("R"));
+       case AUDIO_CODING_MODE_3_0: return cString::sprintf("3/0 - %s, %s, %s", tr("L"), tr("C"), tr("R"));
+       case AUDIO_CODING_MODE_2_1: return cString::sprintf("2/1 - %s, %s, %s", tr("L"), 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 AUDIO_CODING_MODE_2_2: return cString::sprintf("2/2 - %s, %s, %s, %s", tr("L"), 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"));
       }
     }
  return cString::sprintf("---");
@@ -348,10 +434,10 @@ 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 CML_MINUS_4_5dB: return cString::sprintf("-4.5 %s", tr("dB"));
-    case CML_MINUS_6dB:   return cString::sprintf("-6.0 %s", tr("dB"));
-    case CML_RESERVED:    return cString::sprintf("%s", tr("reserved"));
+    case AUDIO_CENTER_MIX_LEVEL_MINUS_3dB:   return cString::sprintf("-3.0 %s", tr("dB"));
+    case AUDIO_CENTER_MIX_LEVEL_MINUS_4_5dB: return cString::sprintf("-4.5 %s", tr("dB"));
+    case AUDIO_CENTER_MIX_LEVEL_MINUS_6dB:   return cString::sprintf("-6.0 %s", tr("dB"));
+    case AUDIO_CENTER_MIX_LEVEL_RESERVED:    return cString::sprintf("%s", tr("reserved"));
    }
  return cString::sprintf("---");
 }
@@ -359,10 +445,10 @@ cString getAC3CenterMixLevel(int value)
 cString getAC3SurroundMixLevel(int value)
 {
  switch (value) {
-    case SML_MINUS_3dB: return cString::sprintf("-3 %s", tr("dB"));
-    case SML_MINUS_6dB: return cString::sprintf("-6 %s", tr("dB"));
-    case SML_0_dB:      return cString::sprintf("0 %s", tr("dB"));
-    case SML_RESERVED:  return cString::sprintf("%s", tr("reserved"));
+    case AUDIO_SURROUND_MIX_LEVEL_MINUS_3dB: return cString::sprintf("-3 %s", tr("dB"));
+    case AUDIO_SURROUND_MIX_LEVEL_MINUS_6dB: return cString::sprintf("-6 %s", tr("dB"));
+    case AUDIO_SURROUND_MIX_LEVEL_0_dB:      return cString::sprintf("0 %s", tr("dB"));
+    case AUDIO_SURROUND_MIX_LEVEL_RESERVED:  return cString::sprintf("%s", tr("reserved"));
    }
  return cString::sprintf("---");
 }
@@ -370,10 +456,10 @@ cString getAC3SurroundMixLevel(int value)
 cString getAC3DolbySurroundMode(int value)
 {
  switch (value) {
-    case DSM_NOT_INDICATED:     return cString::sprintf("%s", tr("not indicated"));
-    case DSM_NOT_DOLBYSURROUND: return cString::sprintf("%s", tr("no"));
-    case DSM_DOLBYSURROUND:     return cString::sprintf("%s", tr("yes"));
-    case DSM_RESERVED:          return cString::sprintf("%s", tr("reserved"));
+    case AUDIO_DOLBY_SURROUND_MODE_NOT_INDICATED:     return cString::sprintf("%s", tr("not indicated"));
+    case AUDIO_DOLBY_SURROUND_MODE_NOT_DOLBYSURROUND: return cString::sprintf("%s", trVDR("no"));
+    case AUDIO_DOLBY_SURROUND_MODE_DOLBYSURROUND:     return cString::sprintf("%s", trVDR("yes"));
+    case AUDIO_DOLBY_SURROUND_MODE_RESERVED:          return cString::sprintf("%s", tr("reserved"));
    }
  return cString::sprintf("---");
 }
@@ -394,32 +480,37 @@ cString getFrequencyMHz(int value)
 cString getAudioSamplingFreq(int value)
 {
  switch (value) {
-    case FR_NOTVALID: return cString::sprintf("---");
-    case FR_RESERVED: return cString::sprintf("%s", tr("reserved"));
+    case AUDIO_SAMPLING_FREQUENCY_INVALID:  return cString::sprintf("---");
+    case AUDIO_SAMPLING_FREQUENCY_RESERVED: return cString::sprintf("%s", tr("reserved"));
    }
-  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 FR_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_INVALID:  return cString::sprintf("---");
+    case AUDIO_BITRATE_RESERVED: return cString::sprintf("%s (%s)", tr("reserved"), *getBitrateKbits(value));
+    case AUDIO_BITRATE_FREE:     return cString::sprintf("%s (%s)", tr("free"), *getBitrateKbits(value));
    }
  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("---");
 }
--- a/femontools.h
+++ b/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);
@@ -33,8 +34,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 getCA(int value);
+cString getVideoCodec(int value);
+cString getAudioCodec(int value);
+cString getAudioChannelMode(int value);
 cString getCoderate(int value);
 cString getTransmission(int value);
 cString getBandwidth(int value);
@@ -42,8 +47,14 @@ cString getInversion(int value);
 cString getHierarchy(int value);
 cString getGuard(int value);
 cString getModulation(int value);
+cString getAlpha(int value);
+cString getPriority(int value);
+cString getSystem(int value);
+cString getRollOff(int value);
+cString getResolution(int width, int height, int scan);
 cString getAspectRatio(int value);
 cString getVideoFormat(int value);
+cString getFrameRate(double value);
 cString getAC3BitStreamMode(int value, int coding);
 cString getAC3AudioCodingMode(int value, int stream);
 cString getAC3CenterMixLevel(int value);
@@ -53,6 +64,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);

--- a/femonvideo.h
+++ b/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
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,15 +1,15 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
-# This file is distributed under the same license as the VDR package.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
 # Peter Marquardt
 # Andreas Brachold
 # Christian Wieninger 
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: femon 1.6.3\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2008-11-09 13:31+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Christian Wieninger\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,519 +17,434 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "DVB Signal Informationsanzeige (OSD)"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Signalinformationen"

-#: femon.c:101
-msgid "Femon not available while replaying"
-msgstr "Femon w<>hrend Wiedergabe nicht verf<72>gbar"
+msgid "Femon not available"
+msgstr "Femon nicht verf<72>gbar"

-#: femon.c:278
 msgid "basic"
 msgstr "Standard"

-#: femon.c:279
 msgid "transponder"
 msgstr "Transponder"

-#: femon.c:280
 msgid "stream"
 msgstr "Stream"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr "Klassischer"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "Hauptmen<65>eintrag verstecken"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "nein"
+msgid "Define whether the main menu entry is hidden."
+msgstr ""

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "ja"
+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 ""

-#: femon.c:305
 msgid "Default display mode"
 msgstr "Standard Anzeigemodus"

-#: femon.c:306
-msgid "Skin"
-msgstr "Oberfl<66>che"
+msgid "Define the default display mode at startup."
+msgstr ""

-#: femon.c:307
-msgid "Theme"
-msgstr "Thema"
+msgid "Define the used OSD skin."
+msgstr ""
+
+msgid "Define the used OSD theme."
+msgstr ""

-#: femon.c:308
 msgid "Position"
 msgstr "Position"

-#: femon.c:308
-msgid "bottom"
-msgstr "unten"
+msgid "Define the position of OSD."
+msgstr ""

-#: femon.c:308
-msgid "top"
-msgstr "oben"
+msgid "Define the height of OSD."
+msgstr ""

-#: femon.c:309
-msgid "Height"
-msgstr "H<>he"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr "Horizontaler Offset"

-#: femon.c:311
+msgid "Define the horizontal offset of OSD."
+msgstr ""
+
 msgid "Show CA system"
 msgstr "CA System anzeigen"

-#: femon.c:312
+msgid "Define whether the CA system is shown as text."
+msgstr ""
+
 msgid "Red limit [%]"
 msgstr "Grenze Rot [%]"

-#: femon.c:313
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
 msgid "Green limit [%]"
 msgstr "Grenze Gr<47>n [%]"

-#: femon.c:314
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr ""
+
 msgid "OSD update interval [0.1s]"
 msgstr "OSD Updateintervall [0.1s]"

-#: femon.c:315
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
 msgid "Analyze stream"
 msgstr "Stream analysieren"

-#: femon.c:317
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
 msgid "Calculation interval [0.1s]"
 msgstr "Berechnungsintervall [0.1s]"

-#: femon.c:318
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
 msgid "Use SVDRP service"
 msgstr "SVDRP Service verwenden"

-#: femon.c:320
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
 msgid "SVDRP service port"
 msgstr "SVDRP Service Port"

-#: femon.c:321
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
 msgid "SVDRP service IP"
 msgstr "SVDRP Service IP"

-#: femonosd.c:268
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr "Hilfe"
+
 msgid "Video"
 msgstr "Video"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "Audio"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Transponderinformation"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "Vpid"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "Ppid"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "CA"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "Tpid"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Satellitenkarte"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Frequenz"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "Quelle"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "Srate"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarisation"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversion"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Kabelkarte"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulation"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Terrestrische Karte"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmission"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Bandbreite"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Hierarchie"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Guard"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr "Streaminformation"

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr "Video Stream"

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
+msgid "Codec"
+msgstr ""
+
 msgid "Bitrate"
 msgstr "Bitrate"

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr "Seitenverh<72>ltnis"

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr "Bildrate"

-#: femonosd.c:426
-msgid "Hz"
-msgstr "Hz"
-
-#: femonosd.c:428
 msgid "Video Format"
 msgstr "Bildformat"

-#: femonosd.c:431
 msgid "Resolution"
 msgstr "Aufl<66>sung"

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr "Audio Stream"

-#: femonosd.c:440
-msgid "MPEG Layer"
-msgstr "MPEG Layer"
+msgid "Channel Mode"
+msgstr ""

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr "Abtastrate"

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr "AC-3 Stream"

-#: femonosd.c:464 femontools.c:400
-msgid "kHz"
-msgstr "kHz"
-
-#: femonosd.c:466
-msgid "Frame Size"
-msgstr "Frame Gr<47><72>e"
-
-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr "Bitstream Modus"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr "Audiokodierung"

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr "Center Mix Pegel"

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr "Surround Mix Pegel"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr "Dolby Surround Modus"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr "Tieft<66>ner Effekte"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "Aus"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
+msgid "on"
 msgstr "Ein"

-#: femonosd.c:487
+msgid "off"
+msgstr "Aus"
+
 msgid "Dialogue Normalization"
 msgstr "Dialog Normalisierung"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr "Frei empfangbar"
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr "Fest"

-#: femontools.c:192
 msgid "Analog"
 msgstr "Analog"

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr "SECA/Mediaguard"

-#: femontools.c:194
 msgid "Viaccess"
 msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
 msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
 msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
 msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr "SkyCrypt"

-#: femontools.c:211 femontools.c:259
-msgid "None"
+msgid "MPEG-2"
+msgstr ""
+
+msgid "H.264"
+msgstr ""
+
+msgid "MPEG-1 Layer I"
+msgstr ""
+
+msgid "MPEG-1 Layer II"
+msgstr ""
+
+msgid "MPEG-1 Layer III"
+msgstr ""
+
+msgid "MPEG-2 Layer I"
+msgstr ""
+
+msgid "MPEG-2 Layer II"
+msgstr ""
+
+msgid "MPEG-2 Layer III"
+msgstr ""
+
+msgid "HE-AAC"
+msgstr ""
+
+msgid "stereo"
+msgstr ""
+
+msgid "joint Stereo"
+msgstr ""
+
+msgid "dual"
+msgstr ""
+
+msgid "mono"
+msgstr ""
+
+msgid "none"
 msgstr "Nichts"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+msgid "auto"
 msgstr "Auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
 msgstr "belegt"

-#: femontools.c:309
+msgid "extended"
+msgstr ""
+
 msgid "unknown"
 msgstr "unbekannt"

-#: femontools.c:310
+msgid "component"
+msgstr ""
+
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
 msgstr "Complete Main (CM)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr "Musik und Effekte (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr "Sehbehindert (VI)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr "H<>rbehindert (HI)"

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr "Dialog (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr "Kommentar (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr "Notfall (E)"

-#: femontools.c:326
-msgid "Karaoke"
-msgstr "Karaoke"
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr "<22>berlagerte Stimme (VO)"

-#: femontools.c:335
+msgid "Karaoke"
+msgstr "Karaoke"
+
 msgid "Ch1"
 msgstr "Kan1"

-#: femontools.c:335
 msgid "Ch2"
 msgstr "Kan2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr "C"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr "L"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr "R"

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr "S"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr "SL"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr "SR"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr "nicht angegeben"

-#: femontools.c:408
 msgid "free"
 msgstr "frei"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,13 +1,13 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
-# This file is distributed under the same license as the VDR package.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
 # Luis Palacios
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: femon 1.6.3\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2008-11-09 13:31+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Luis Palacios\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,519 +15,434 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Monitorizaci<63>n de la se<73>al DVB"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Monitorizaci<63>n de la se<73>al DVB"

-#: femon.c:101
-msgid "Femon not available while replaying"
+msgid "Femon not available"
 msgstr ""

-#: femon.c:278
 msgid "basic"
 msgstr "B<>sico"

-#: femon.c:279
 msgid "transponder"
 msgstr "Transpondedor"

-#: femon.c:280
 msgid "stream"
 msgstr "Flujo"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr "Cl<43>sico"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "Ocultar en el men<65> principal"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "no"
+msgid "Define whether the main menu entry is hidden."
+msgstr ""

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "s<>"
+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 ""

-#: femon.c:305
 msgid "Default display mode"
 msgstr "Modo de visualizaci<63>n estandar"

-#: femon.c:306
-msgid "Skin"
-msgstr "Piel"
+msgid "Define the default display mode at startup."
+msgstr ""

-#: femon.c:307
-msgid "Theme"
-msgstr "Tema"
+msgid "Define the used OSD skin."
+msgstr ""
+
+msgid "Define the used OSD theme."
+msgstr ""

-#: femon.c:308
 msgid "Position"
 msgstr "Posici<63>n"

-#: femon.c:308
-msgid "bottom"
-msgstr "abajo"
+msgid "Define the position of OSD."
+msgstr ""

-#: femon.c:308
-msgid "top"
-msgstr "arriba"
+msgid "Define the height of OSD."
+msgstr ""

-#: femon.c:309
-msgid "Height"
-msgstr "Altura"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr "Desplazamiento horizontal"

-#: femon.c:311
+msgid "Define the horizontal offset of OSD."
+msgstr ""
+
 msgid "Show CA system"
 msgstr "Mostrar sistema CA"

-#: femon.c:312
+msgid "Define whether the CA system is shown as text."
+msgstr ""
+
 msgid "Red limit [%]"
 msgstr "L<>mite de rojo [%s]"

-#: femon.c:313
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
 msgid "Green limit [%]"
 msgstr "L<>mite verde [%]"

-#: femon.c:314
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr ""
+
 msgid "OSD update interval [0.1s]"
 msgstr "Intervalo de actualizaci<63>n (0,1)"

-#: femon.c:315
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
 msgid "Analyze stream"
 msgstr "Analizar el flujo"

-#: femon.c:317
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
 msgid "Calculation interval [0.1s]"
 msgstr "Intervalo de c<>lculo (0,1s)"

-#: femon.c:318
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
 msgid "Use SVDRP service"
 msgstr ""

-#: femon.c:320
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
 msgid "SVDRP service port"
 msgstr ""

-#: femon.c:321
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
 msgid "SVDRP service IP"
 msgstr ""

-#: femonosd.c:268
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr "Ayuda"
+
 msgid "Video"
 msgstr "Video"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "Audio"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Informaci<63>n del transpondedor"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "Vpid"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "Ppid"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "Acceso condicional (CA)"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "Tpid"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Tarjeta Sat<61>lite"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Frecuencia"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "Fuente"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "T.s<>mbolos"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarizaci<63>n"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversion"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Tarjeta Cable"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulaci<63>n"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Tarjeta TDT"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmisi<73>n"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Ancho de banda"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Jerarqu<71>a"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Int.Guarda"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr "Informaci<63>n del flujo"

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr "Flujo de video"

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
+msgid "Codec"
+msgstr ""
+
 msgid "Bitrate"
 msgstr "Tasa de bits"

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr "Proporciones de la imagen"

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr "Tasa de frames"

-#: femonosd.c:426
-msgid "Hz"
-msgstr "Hz"
-
-#: femonosd.c:428
 msgid "Video Format"
 msgstr "Formato de video"

-#: femonosd.c:431
 msgid "Resolution"
 msgstr "Resoluci<63>n"

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr "Flujo de audio"

-#: femonosd.c:440
-msgid "MPEG Layer"
-msgstr "Nivel MPEG"
+msgid "Channel Mode"
+msgstr ""

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr "Frecuencia de muestreo"

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr "Flujo AC-3"

-#: femonosd.c:464 femontools.c:400
-msgid "kHz"
-msgstr "kHz"
-
-#: femonosd.c:466
-msgid "Frame Size"
-msgstr "Tama<6D>o de frame"
-
-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr "Modo bitstream"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr "Modo de codificaci<63>n de audio"

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr "Nivel sonoro central"

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr "Nivel sonoro surround"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr "Nivel sonoro Dolby Surround"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr "Efectos de baja frecuencia"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "Off"
+msgid "on"
+msgstr "on"

-#: femonosd.c:485 femontools.c:250
-msgid "On"
-msgstr "On"
+msgid "off"
+msgstr "off"

-#: femonosd.c:487
 msgid "Dialogue Normalization"
 msgstr "Normalizaci<63>n del di<64>logo"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr "Free to air"
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr "Fijo"

-#: femontools.c:192
 msgid "Analog"
 msgstr "Anal<61>gico"

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr "SECA/Mediguard"

-#: femontools.c:194
 msgid "Viaccess"
 msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
 msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
 msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
 msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr "SkyCrypt"

-#: femontools.c:211 femontools.c:259
-msgid "None"
-msgstr "Ninguno"
+msgid "MPEG-2"
+msgstr ""

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
-msgstr "Auto"
+msgid "H.264"
+msgstr ""
+
+msgid "MPEG-1 Layer I"
+msgstr ""
+
+msgid "MPEG-1 Layer II"
+msgstr ""
+
+msgid "MPEG-1 Layer III"
+msgstr ""
+
+msgid "MPEG-2 Layer I"
+msgstr ""
+
+msgid "MPEG-2 Layer II"
+msgstr ""
+
+msgid "MPEG-2 Layer III"
+msgstr ""
+
+msgid "HE-AAC"
+msgstr ""
+
+msgid "stereo"
+msgstr ""
+
+msgid "joint Stereo"
+msgstr ""
+
+msgid "dual"
+msgstr ""
+
+msgid "mono"
+msgstr "o"
+
+msgid "none"
+msgstr "ninguno"
+
+msgid "auto"
+msgstr "auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
 msgstr "reservado"

-#: femontools.c:309
+msgid "extended"
+msgstr ""
+
 msgid "unknown"
 msgstr "desconocido"

-#: femontools.c:310
+msgid "component"
+msgstr ""
+
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
 msgstr "Principal (CM)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr "M<>sica y efectos (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr "Imagen deteriorada (VI)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr "Hearing deteriorado"

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr "Di<44>logo (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr "Comentario (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr "Emergencia (E)"

-#: femontools.c:326
-msgid "Karaoke"
-msgstr "Karaoke"
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr "Voz off (VO)"

-#: femontools.c:335
+msgid "Karaoke"
+msgstr "Karaoke"
+
 msgid "Ch1"
 msgstr "Can. 1"

-#: femontools.c:335
 msgid "Ch2"
 msgstr "Can. 2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr "C"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr "I"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr "D"

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr "S"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr "SI"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr "SD"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr "no indicado"

-#: femontools.c:408
 msgid "free"
 msgstr "libre"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,13 +1,13 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
-# This file is distributed under the same license as the VDR package.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
 # Arthur Konovalov
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: femon 1.6.3\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2008-11-09 13:31+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Arthur Konovalov\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,519 +15,434 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "DVB Signaalmonitor (OSD)"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Signaaliinfo"

-#: femon.c:101
-msgid "Femon not available while replaying"
+msgid "Femon not available"
 msgstr ""

-#: femon.c:278
 msgid "basic"
 msgstr "standard"

-#: femon.c:279
 msgid "transponder"
 msgstr "transponder"

-#: femon.c:280
 msgid "stream"
 msgstr "voog"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr "Klassikaline"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "Peida valik peamen<65><6E>s"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "ei"
+msgid "Define whether the main menu entry is hidden."
+msgstr ""

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "jah"
+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 ""

-#: femon.c:305
 msgid "Default display mode"
 msgstr "Vaikimisi displei moodus"

-#: femon.c:306
-msgid "Skin"
-msgstr "Kest"
+msgid "Define the default display mode at startup."
+msgstr ""

-#: femon.c:307
-msgid "Theme"
-msgstr "Teema"
+msgid "Define the used OSD skin."
+msgstr ""
+
+msgid "Define the used OSD theme."
+msgstr ""

-#: femon.c:308
 msgid "Position"
 msgstr "Positsioon"

-#: femon.c:308
-msgid "bottom"
-msgstr "all"
+msgid "Define the position of OSD."
+msgstr ""

-#: femon.c:308
-msgid "top"
-msgstr "<22>leval"
+msgid "Define the height of OSD."
+msgstr ""

-#: femon.c:309
-msgid "Height"
-msgstr "K<>rgus"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr "Horisontaalne nihe"

-#: femon.c:311
+msgid "Define the horizontal offset of OSD."
+msgstr ""
+
 msgid "Show CA system"
 msgstr "N<>ita CA s<>steemi"

-#: femon.c:312
+msgid "Define whether the CA system is shown as text."
+msgstr ""
+
 msgid "Red limit [%]"
 msgstr "Punase limiit [%]"

-#: femon.c:313
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
 msgid "Green limit [%]"
 msgstr "Rohelise limiit [%]"

-#: femon.c:314
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr ""
+
 msgid "OSD update interval [0.1s]"
 msgstr "Uuendusintervall [0,1s]"

-#: femon.c:315
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
 msgid "Analyze stream"
 msgstr "Voo anal<61><6C>s"

-#: femon.c:317
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
 msgid "Calculation interval [0.1s]"
 msgstr "Kalkulatsiooni intervall [0,1s]"

-#: femon.c:318
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
 msgid "Use SVDRP service"
 msgstr ""

-#: femon.c:320
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
 msgid "SVDRP service port"
 msgstr ""

-#: femon.c:321
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
 msgid "SVDRP service IP"
 msgstr ""

-#: femonosd.c:268
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
 msgid "Video"
 msgstr "Video"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "Audio"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Transponderi info"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "Vpid"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "Ppid"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "CA"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "Tpid"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Satelliidikaart"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Sagedus"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "Allikas"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "Srate"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarisatsioon"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversioon"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Kaablikaart"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulatsioon"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Terrestiaalkaart"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmissioon"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Ribalaius"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Hierarhia"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Guard"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr "Voo info"

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr "Videovoog"

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
+msgid "Codec"
+msgstr ""
+
 msgid "Bitrate"
 msgstr "Bitikiirus"

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr "K<>lgsuhe"

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr "Kaadrisagedus"

-#: femonosd.c:426
-msgid "Hz"
-msgstr "Hz"
-
-#: femonosd.c:428
 msgid "Video Format"
 msgstr "Videoformaat"

-#: femonosd.c:431
 msgid "Resolution"
 msgstr "Resolutsioon"

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr "Audiovoog"

-#: femonosd.c:440
-msgid "MPEG Layer"
-msgstr "MPEG tase"
+msgid "Channel Mode"
+msgstr ""

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr "S<>mplimissagedus"

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr "AC-3 voog"

-#: femonosd.c:464 femontools.c:400
-msgid "kHz"
-msgstr "kHz"
-
-#: femonosd.c:466
-msgid "Frame Size"
-msgstr "Kaadri suurus"
-
-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr "Bitivoo t<><74>p"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr "Audiokodeering"

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr "Keskmise kanali tase"

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr "Surround kanali tase"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr "Dolby Surround'i t<><74>p"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr "LFE kanal"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "V<>ljas"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
+msgid "on"
 msgstr "Sees"

-#: femonosd.c:487
+msgid "off"
+msgstr "V<>ljas"
+
 msgid "Dialogue Normalization"
 msgstr "Dialoogi normalisatsioon"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr "FTA"
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr "Fikseeritud"

-#: femontools.c:192
 msgid "Analog"
 msgstr ""

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr "SECA/Mediaguard"

-#: femontools.c:194
 msgid "Viaccess"
 msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
 msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
 msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
 msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr "SkyCrypt"

-#: femontools.c:211 femontools.c:259
-msgid "None"
-msgstr "Ei"
+msgid "MPEG-2"
+msgstr ""

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
-msgstr "Auto"
+msgid "H.264"
+msgstr ""
+
+msgid "MPEG-1 Layer I"
+msgstr ""
+
+msgid "MPEG-1 Layer II"
+msgstr ""
+
+msgid "MPEG-1 Layer III"
+msgstr ""
+
+msgid "MPEG-2 Layer I"
+msgstr ""
+
+msgid "MPEG-2 Layer II"
+msgstr ""
+
+msgid "MPEG-2 Layer III"
+msgstr ""
+
+msgid "HE-AAC"
+msgstr ""
+
+msgid "stereo"
+msgstr ""
+
+msgid "joint Stereo"
+msgstr ""
+
+msgid "dual"
+msgstr ""
+
+msgid "mono"
+msgstr ""
+
+msgid "none"
+msgstr "ei"
+
+msgid "auto"
+msgstr "auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
 msgstr "reserveeritud"

-#: femontools.c:309
+msgid "extended"
+msgstr ""
+
 msgid "unknown"
 msgstr "tundmatu"

-#: femontools.c:310
+msgid "component"
+msgstr ""
+
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
 msgstr "T<>iskomplekt (CM)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr "Muusika ja efektid (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr "Vaegn<67>gemine (VE)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr "Vaegkuulmine (HI)"

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr "Dialoog (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr "Kommentaar (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr "H<>dateade (E)"

-#: femontools.c:326
-msgid "Karaoke"
-msgstr "Karaoke"
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr "Pealer<65><72>kimine (VO)"

-#: femontools.c:335
+msgid "Karaoke"
+msgstr "Karaoke"
+
 msgid "Ch1"
 msgstr "Kan. 1"

-#: femontools.c:335
 msgid "Ch2"
 msgstr "Kan. 2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr "C"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr "L"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr "R"

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr "S"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr "SL"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr "SR"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr "m<>rkimata"

-#: femontools.c:408
 msgid "free"
 msgstr "vaba"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,533 +1,451 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
-# This file is distributed under the same license as the VDR package.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
 # Rolf Ahrenberg
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: femon 1.6.3\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2008-11-09 13:31+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Signaalimittari (OSD)"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Signaalimittari"

-#: femon.c:101
-msgid "Femon not available while replaying"
-msgstr "Signaalimittari ei ole k<>ytett<74>viss<73> toiston aikana"
+msgid "Femon not available"
+msgstr "Signaalimittari ei ole käytettävissä"

-#: femon.c:278
 msgid "basic"
 msgstr "perus"

-#: femon.c:279
 msgid "transponder"
 msgstr "transponderi"

-#: femon.c:280
 msgid "stream"
-msgstr "l<EFBFBD>hete"
+msgstr "lähete"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr "Klassinen"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
-msgstr "Piilota valinta p<EFBFBD><EFBFBD>valikosta"
+msgstr "Piilota valinta päävalikosta"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "ei"
+msgid "Define whether the main menu entry is hidden."
+msgstr "Määrittele, näytetäänkö laajennoksen valinta päävalikossa."

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "kyll<6C>"
+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."

-#: femon.c:305
 msgid "Default display mode"
-msgstr "Oletusn<EFBFBD>ytt<EFBFBD>tila"
+msgstr "Oletusnäyttötila"

-#: femon.c:306
-msgid "Skin"
-msgstr "Ulkoasu"
+msgid "Define the default display mode at startup."
+msgstr "Määrittele käytettävä näyttötila käynnistettäessä."

-#: femon.c:307
-msgid "Theme"
-msgstr "Teema"
+msgid "Define the used OSD skin."
+msgstr "Määrittele käytettävä ulkoasu näytölle."
+
+msgid "Define the used OSD theme."
+msgstr "Määrittele käytettävä väriteema näytölle."

-#: femon.c:308
 msgid "Position"
 msgstr "Sijainti"

-#: femon.c:308
-msgid "bottom"
-msgstr "alareuna"
+msgid "Define the position of OSD."
+msgstr "Määrittele näytön sijainti."

-#: femon.c:308
-msgid "top"
-msgstr "yl<79>reuna"
+msgid "Define the height of OSD."
+msgstr "Määrittele näytön korkeus."

-#: femon.c:309
-msgid "Height"
-msgstr "Korkeus"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr "Vaakakeskitys"

-#: femon.c:311
-msgid "Show CA system"
-msgstr "N<>yt<79> salausj<73>rjestelm<6C>"
+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ä."

-#: femon.c:312
 msgid "Red limit [%]"
 msgstr "Punaisen taso [%]"

-#: femon.c:313
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "Määrittele taso punaiselle palkille, jota käytetään huonon signaalin ilmaisimena."
+
 msgid "Green limit [%]"
-msgstr "Vihre<EFBFBD>n taso [%]"
+msgstr "Vihreän taso [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "Määrittele taso vihreälle palkille, jota käytetään hyvän signaalin ilmaisimena."

-#: femon.c:314
 msgid "OSD update interval [0.1s]"
-msgstr "N<EFBFBD>yt<EFBFBD>n p<EFBFBD>ivitysv<EFBFBD>li [0.1s]"
+msgstr "Näytön päivitysväli [0.1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "Määrittele näytönvirkistystaajuus. Mitä pienempi arvo, sitä suurempi CPU-kuorma."

-#: femon.c:315
 msgid "Analyze stream"
-msgstr "L<EFBFBD>hetteen analysointi"
+msgstr "Lähetteen analysointi"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "Määrittele, analysoidaanko DVB-lähetettä ja lasketaanko bittinopeuksia."

-#: femon.c:317
 msgid "Calculation interval [0.1s]"
-msgstr "Laskennan p<EFBFBD>ivitysv<EFBFBD>li [0.1s]"
+msgstr "Laskennan päivitysväli [0.1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "Määrittele laskentaikkunan koko. Mitä suurempi laskentaikkuna, sitä todenmukaisemmat lopputulokset."

-#: femon.c:318
 msgid "Use SVDRP service"
-msgstr "K<EFBFBD>yt<EFBFBD> SVDRP-palvelua"
+msgstr "Käytä SVDRP-palvelua"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "Määrittele käytetäänkö SVDRP-palvelua asiakas/palvelin-kokoonpanoissa."

-#: femon.c:320
 msgid "SVDRP service port"
 msgstr "SVDRP-palvelun portti"

-#: femon.c:321
+msgid "Define the port number of SVDRP service."
+msgstr "Määrittele SVDRP-palvelun käyttämä portti."
+
 msgid "SVDRP service IP"
 msgstr "SVDRP-palvelun IP-osoite"

-#: femonosd.c:268
+msgid "Define the IP address of SVDRP service."
+msgstr "Määrittele SVDRP-palvelun käyttämä IP-osoite."
+
+msgid "Help"
+msgstr "Opaste"
+
 msgid "Video"
 msgstr "Kuva"

-#: femonosd.c:276
 msgid "Audio"
-msgstr "<EFBFBD><EFBFBD>ni"
+msgstr "Ääni"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Transponderin tiedot"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "Kuva-PID"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "PCR-PID"
-
-#: femonosd.c:316
 msgid "Apid"
-msgstr "<EFBFBD><EFBFBD>ni-PID"
+msgstr "Ääni-PID"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dolby-PID"

-#: femonosd.c:321
-msgid "CA"
-msgstr "Salaus (CA)"
+msgid "Spid"
+msgstr "Tekstitys-PID"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "Teksti-TV-PID"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Palvelu-ID"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Verkko-ID"

-#: femonosd.c:331
 msgid "Tid"
-msgstr "L<EFBFBD>hete-ID"
+msgstr "Lähete-ID"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Radio-ID"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Satelliittikortti"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Taajuus"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "L<>hde"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "Symbolinopeus"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarisaatio"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversio"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "Suojaustaso (HP)"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Kaapelikortti"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulaatio"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Terrestriaalikortti"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmissio"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Kaistanleveys"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Suojaustaso"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Hierarkia"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Suojav<61>li"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
-msgstr "L<EFBFBD>hetteen tiedot"
+msgstr "Lähetteen tiedot"

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr "Kuvaraita"

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
+msgid "Codec"
+msgstr "Koodekki"
+
 msgid "Bitrate"
 msgstr "Bittinopeus"

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr "Kuvasuhde"

-#: femonosd.c:425
 msgid "Frame Rate"
-msgstr "Ruudunp<EFBFBD>ivitystaajuus"
+msgstr "Ruudunpäivitystaajuus"

-#: femonosd.c:426
-msgid "Hz"
-msgstr "Hz"
-
-#: femonosd.c:428
 msgid "Video Format"
 msgstr "Kuvaformaatti"

-#: femonosd.c:431
 msgid "Resolution"
 msgstr "Resoluutio"

-#: femonosd.c:434
 msgid "Audio Stream"
-msgstr "<EFBFBD><EFBFBD>niraita"
+msgstr "Ääniraita"

-#: femonosd.c:440
-msgid "MPEG Layer"
-msgstr "MPEG-taso"
+msgid "Channel Mode"
+msgstr "Kanavatila"

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
-msgstr "N<EFBFBD>ytteenottotaajuus"
+msgstr "Näytteenottotaajuus"

-#: femonosd.c:453
 msgid "AC-3 Stream"
-msgstr "AC-3-<EFBFBD><EFBFBD>niraita"
+msgstr "AC-3-ääniraita"

-#: femonosd.c:464 femontools.c:400
-msgid "kHz"
-msgstr "kHz"
-
-#: femonosd.c:466
-msgid "Frame Size"
-msgstr "Kehyksen koko"
-
-#: femonosd.c:469
 msgid "Bit Stream Mode"
-msgstr "L<EFBFBD>hetteen tyyppi"
+msgstr "Lähetteen tyyppi"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
-msgstr "<EFBFBD><EFBFBD>nikoodaus"
+msgstr "Äänikoodaus"

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr "Keskikanavan taso"

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr "Tehostekanavien taso"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr "Dolby Surround -tehoste"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr "LFE-kanava"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
+msgid "on"
+msgstr "päällä"
+
+msgid "off"
 msgstr "poissa"

-#: femonosd.c:485 femontools.c:250
-msgid "On"
-msgstr "p<><70>ll<6C>"
-
-#: femonosd.c:487
 msgid "Dialogue Normalization"
 msgstr "Dialogin normalisointi"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr "salaamaton"
-
-#: femontools.c:191
 msgid "Fixed"
-msgstr "kiinte<EFBFBD>"
+msgstr "kiinteä"

-#: femontools.c:192
 msgid "Analog"
 msgstr "analoginen"

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr "SECA/Mediaguard"

-#: femontools.c:194
 msgid "Viaccess"
 msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
 msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
 msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
 msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr "SkyCrypt"

-#: femontools.c:211 femontools.c:259
-msgid "None"
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 kerros I"
+
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 kerros II"
+
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 kerros III"
+
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 kerros I"
+
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 kerros II"
+
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 kerros III"
+
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+msgid "stereo"
+msgstr "stereo"
+
+msgid "joint Stereo"
+msgstr "joint-stereo"
+
+msgid "dual"
+msgstr "kaksikanavainen"
+
+msgid "mono"
+msgstr "mono"
+
+msgid "none"
 msgstr "ei"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+msgid "auto"
 msgstr "auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
+msgid "interlaced"
+msgstr "lomiteltu"
+
+msgid "progressive"
+msgstr "lomittelematon"
+
 msgid "reserved"
 msgstr "varattu"

-#: femontools.c:309
+msgid "extended"
+msgstr "laajennettu"
+
 msgid "unknown"
 msgstr "tuntematon"

-#: femontools.c:310
+msgid "component"
+msgstr "komponentti"
+
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
-msgid "Complete Main (CM)"
-msgstr "P<><50>asiallinen (CM)"
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Complete Main (CM)"
+msgstr "Pääasiallinen (CM)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr "Musiikki ja tehosteet (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
-msgstr "N<EFBFBD>k<EFBFBD>rajoitteinen (VI)"
+msgstr "Näkörajoitteinen (VI)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr "Kuulorajoitteinen (HI)"

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr "Vuoropuhelu (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr "Kommentointi (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
-msgstr "H<EFBFBD>t<EFBFBD>tiedote (E)"
+msgstr "Hätätiedote (E)"
+
+msgid "Voice Over (VO)"
+msgstr "Päälle puhuttu (VO)"

-#: femontools.c:326
 msgid "Karaoke"
 msgstr "Karaoke"

-#: femontools.c:326
-msgid "Voice Over (VO)"
-msgstr "P<><50>lle puhuttu (VO)"
-
-#: femontools.c:335
 msgid "Ch1"
 msgstr "kan. 1"

-#: femontools.c:335
 msgid "Ch2"
 msgstr "kan. 2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr "K"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr "V"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr "O"

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr "T"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr "TV"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr "TO"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr "ei ilmaistu"

-#: femontools.c:408
 msgid "free"
 msgstr "vapaa"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,533 +1,451 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
-# This file is distributed under the same license as the VDR package.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
 # Nicolas Huillard
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: femon 1.6.3\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
-"Last-Translator: Nicolas Huillard\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"POT-Creation-Date: 2008-11-09 13:31+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Affiche les informations du signal DVB"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "Signal DVB"

-#: femon.c:101
-msgid "Femon not available while replaying"
-msgstr ""
+msgid "Femon not available"
+msgstr "Femon n'est pas disponible"

-#: femon.c:278
 msgid "basic"
 msgstr "basique"

-#: femon.c:279
 msgid "transponder"
 msgstr "transpondeur"

-#: femon.c:280
 msgid "stream"
 msgstr "flux"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr "Classique"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "Masquer dans le menu principal"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "non"
+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."

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "oui"
+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."

-#: femon.c:305
 msgid "Default display mode"
 msgstr "Affichage par d<>faut"

-#: femon.c:306
-msgid "Skin"
-msgstr "Skin"
+msgid "Define the default display mode at startup."
+msgstr "D<>finit l'affichage par d<>faut au d<>marrage."

-#: femon.c:307
-msgid "Theme"
-msgstr "Th<54>me"
+msgid "Define the used OSD skin."
+msgstr "D<>finit le skin OSD <20> utiliser."
+
+msgid "Define the used OSD theme."
+msgstr "D<>finit le th<74>me OSD <20> utiliser."

-#: femon.c:308
 msgid "Position"
 msgstr "Position"

-#: femon.c:308
-msgid "bottom"
-msgstr "bas"
+msgid "Define the position of OSD."
+msgstr "D<>finit la position de l'OSD."

-#: femon.c:308
-msgid "top"
-msgstr "haut"
+msgid "Define the height of OSD."
+msgstr "D<>finit l'hauteur de l'OSD."

-#: femon.c:309
-msgid "Height"
-msgstr "Hauteur"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr "D<>placement horizontal"

-#: femon.c:311
-msgid "Show CA system"
-msgstr "Syst<73>me CA"
+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>."

-#: femon.c:312
 msgid "Red limit [%]"
 msgstr "Limite du rouge (%)"

-#: femon.c:313
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "D<>finit la limite de la barre rouge, qui est utilis<69> pour indiquer un mauvais signal."
+
 msgid "Green limit [%]"
 msgstr "Limite du vert (%)"

-#: femon.c:314
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "D<>finit la limite de la barre rouge, qui est utilis<69> pour indiquer un bon signal."
+
 msgid "OSD update interval [0.1s]"
 msgstr "Intervalle de mise <20> jour (0,1s)"

-#: femon.c:315
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "D<>finit l'intervalle de mise <20> jour de l'OSD. Un petit intervalle g<>n<EFBFBD>re une charge CPU plus importante."
+
 msgid "Analyze stream"
 msgstr "Analyser le flux"

-#: femon.c:317
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "D<>finit si le flux DVB est analys<79> et le bitrates calcul<75>."
+
 msgid "Calculation interval [0.1s]"
 msgstr "Intervalle de calcul (0,1s)"

-#: femon.c:318
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "D<>finit l'intervalle de cacul. Un plus grand intervalle g<>n<EFBFBD>re une valeur plus stable."
+
 msgid "Use SVDRP service"
-msgstr ""
+msgstr "Utiliser le service SVDRP"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "D<>finit si le service SVDRP est utilis<69> en configuration client/serveur."

-#: femon.c:320
 msgid "SVDRP service port"
-msgstr ""
+msgstr "Port du service SVDRP"
+
+msgid "Define the port number of SVDRP service."
+msgstr "D<>finit le port d'<27>coute du service SVDRP."

-#: femon.c:321
 msgid "SVDRP service IP"
-msgstr ""
+msgstr "IP du service SVDRP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "D<>finit l'adresse IP du service SVDRP."
+
+msgid "Help"
+msgstr "Aide"

-#: femonosd.c:268
 msgid "Video"
 msgstr "Vid<69>o"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "Audio"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Information transpondeur"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "PID Vid<69>o"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "Ppid"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "Cryptage"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "PID T<>l<EFBFBD>texte"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "Carte Satellite"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Fr<46>quence"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "Source"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "Fr<46>q. Symbole"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarisation"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversion"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Carte C<>ble"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulation"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Carte TNT"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmission"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Bande passante"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Hi<48>rarchie"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Guard"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr "Information flux"

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr "Flux vid<69>o"

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
+msgid "Codec"
+msgstr ""
+
 msgid "Bitrate"
 msgstr "Bitrate"

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr "Proportions d'image"

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr "Rafra<72>chissement"

-#: femonosd.c:426
-msgid "Hz"
-msgstr "Hz"
-
-#: femonosd.c:428
 msgid "Video Format"
 msgstr "Standard vid<69>o"

-#: femonosd.c:431
 msgid "Resolution"
 msgstr "R<>solution"

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr "Flux audio"

-#: femonosd.c:440
-msgid "MPEG Layer"
-msgstr "MPEG Layer"
+msgid "Channel Mode"
+msgstr ""

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr "Fr<46>quence d'<27>chantillonage"

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr "Flux AC-3"

-#: femonosd.c:464 femontools.c:400
-msgid "kHz"
-msgstr "kHz"
-
-#: femonosd.c:466
-msgid "Frame Size"
-msgstr "Taille de paquet"
-
-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr "Mode bitstream"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr "Mode de codage audio"

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr "Niveau sonore milieu"

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr "Niveau sonore surround"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr "Mode Dolby Surround"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr "Effets de basses"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "Non"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
+msgid "on"
 msgstr "Oui"

-#: femonosd.c:487
+msgid "off"
+msgstr "Non"
+
 msgid "Dialogue Normalization"
 msgstr "Normalisation des dialogues"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr "Free To Air"
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr "Fixe"

-#: femontools.c:192
 msgid "Analog"
 msgstr "Analogique"

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr "SECA/Mediaguard"

-#: femontools.c:194
 msgid "Viaccess"
 msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
 msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
 msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
 msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr "SkyCrypt"

-#: femontools.c:211 femontools.c:259
-msgid "None"
+msgid "MPEG-2"
+msgstr ""
+
+msgid "H.264"
+msgstr ""
+
+msgid "MPEG-1 Layer I"
+msgstr ""
+
+msgid "MPEG-1 Layer II"
+msgstr ""
+
+msgid "MPEG-1 Layer III"
+msgstr ""
+
+msgid "MPEG-2 Layer I"
+msgstr ""
+
+msgid "MPEG-2 Layer II"
+msgstr ""
+
+msgid "MPEG-2 Layer III"
+msgstr ""
+
+msgid "HE-AAC"
+msgstr ""
+
+msgid "stereo"
+msgstr ""
+
+msgid "joint Stereo"
+msgstr ""
+
+msgid "dual"
+msgstr ""
+
+msgid "mono"
+msgstr ""
+
+msgid "none"
 msgstr "Aucun"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+msgid "auto"
 msgstr "Auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
 msgstr "r<>serv<72>"

-#: femontools.c:309
+msgid "extended"
+msgstr ""
+
 msgid "unknown"
 msgstr "inconnu"

-#: femontools.c:310
+msgid "component"
+msgstr ""
+
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
 msgstr "Principal (CM)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr "Musique et effets (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr "Malvoyants (VI)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr "Malentendants (HI)"

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr "Dialogue (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr "Commentaires (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr "Urgence (E)"

-#: femontools.c:326
-msgid "Karaoke"
-msgstr "Karaoke"
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr "Voix off (VO)"

-#: femontools.c:335
+msgid "Karaoke"
+msgstr "Karaoke"
+
 msgid "Ch1"
 msgstr "Can. 1"

-#: femontools.c:335
 msgid "Ch2"
 msgstr "Can. 2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr "Centre"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr "Gauche"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr "Droite"

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr "Surround"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr "Surround gauche"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr "Surround droit"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr "non indiqu<71>"

-#: femontools.c:408
 msgid "free"
 msgstr "libre"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,533 +1,452 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
-# This file is distributed under the same license as the VDR package.
+# Copyright (C) 2007 Rolf Ahrenberg
+# 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: VDR 1.5.7\n"
+"Project-Id-Version: femon 1.6.3\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
-"Last-Translator: Sean Carlos\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"POT-Creation-Date: 2008-11-09 13:31+0200\n"
+"PO-Revision-Date: 2008-04-17 00:18+0100\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team:  <vdr@linuxtv.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
-msgstr "Visualizza le informazioni sul segnale DVB"
+msgstr "Mostra info segnale DVB (OSD)"

-#: femon.c:23
 msgid "Signal Information"
-msgstr "Informazioni sul segnale"
+msgstr "Info segnale"

-#: femon.c:101
-msgid "Femon not available while replaying"
-msgstr ""
+msgid "Femon not available"
+msgstr "Femon non disponibile"

-#: femon.c:278
 msgid "basic"
-msgstr ""
+msgstr "base"

-#: femon.c:279
 msgid "transponder"
-msgstr ""
+msgstr "transponder"

-#: femon.c:280
 msgid "stream"
-msgstr ""
+msgstr "flusso"

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
-msgstr ""
+msgstr "Classico"

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
-msgstr "Nascondi voce men<EFBFBD>"
+msgstr "Nascondi voce menu principale"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "no"
+msgid "Define whether the main menu entry is hidden."
+msgstr "Definisci se la voce del menu principale <20> nascosta."

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "si"
+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."

-#: femon.c:305
 msgid "Default display mode"
-msgstr "Modo di visualizzazione standard"
+msgstr "Modalit<EFBFBD> visualizz. predefinita"

-#: femon.c:306
-msgid "Skin"
-msgstr "Stile interfaccia"
+msgid "Define the default display mode at startup."
+msgstr "Definisci la modalit<69> di visualizz. predefinita all'avvio."

-#: femon.c:307
-msgid "Theme"
-msgstr "Tema colori"
+msgid "Define the used OSD skin."
+msgstr "Definisci lo stile interfaccia OSD utilizzato."
+
+msgid "Define the used OSD theme."
+msgstr "Definisci il tema OSD utilizzato."

-#: femon.c:308
 msgid "Position"
 msgstr "Posizione"

-#: femon.c:308
-msgid "bottom"
-msgstr "in basso"
+msgid "Define the position of OSD."
+msgstr "Definisci la posizione dell'OSD."

-#: femon.c:308
-msgid "top"
-msgstr "in alto"
+msgid "Define the height of OSD."
+msgstr "Definisci l'altezza dell'OSD."

-#: femon.c:309
-msgid "Height"
-msgstr "Altezza"
-
-#: femon.c:310
 msgid "Horizontal offset"
-msgstr ""
+msgstr "Limite orizzontale"
+
+msgid "Define the horizontal offset of OSD."
+msgstr "Definisci il limite orizzontale dell'OSD."

-#: femon.c:311
 msgid "Show CA system"
-msgstr ""
+msgstr "Mostra sistema CA"
+
+msgid "Define whether the CA system is shown as text."
+msgstr "Definisci se il sistema CA viene mostrato come testo."

-#: femon.c:312
 msgid "Red limit [%]"
 msgstr "Limite rosso [%]"

-#: femon.c:313
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "Definisci un limite per la barra rossa, usata per indicare un cattivo segnale."
+
 msgid "Green limit [%]"
-msgstr "Limite de verde [%]"
+msgstr "Limite verde [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "Definisci un limite per la barra verde, usata per indicare un buon segnale."

-#: femon.c:314
 msgid "OSD update interval [0.1s]"
-msgstr "Intervallo di aggiornamento [0.1s]"
+msgstr "Intervallo agg. OSD [0.1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "Definisci un intervallo per gli agg. OSD. Pi<50> piccolo <20> l'intervallo maggiore sar<61> l'uso di CPU."

-#: femon.c:315
 msgid "Analyze stream"
-msgstr ""
+msgstr "Analizza flusso"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "Definisci se il flusso DVB <20> analizzato e i bitrate calcolati."

-#: femon.c:317
 msgid "Calculation interval [0.1s]"
 msgstr "Intervallo di calcolo [0.1s]"

-#: femon.c:318
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "Definisci un intervallo di calcolo. L'intervallo pi<70> grande genera valori pi<70> stabili."
+
 msgid "Use SVDRP service"
-msgstr ""
+msgstr "Utilizza servizio SVDRP"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "Definisci se il servizio SVDRP viene usato nelle opzioni client/server."

-#: femon.c:320
 msgid "SVDRP service port"
-msgstr ""
+msgstr "Porta servizio SVDRP"
+
+msgid "Define the port number of SVDRP service."
+msgstr "Definisci il numero di porta del servizio SVDRP."

-#: femon.c:321
 msgid "SVDRP service IP"
-msgstr ""
+msgstr "IP servizio SVDRP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "Definisci l'indirizzo IP del servizio SVDRP."
+
+msgid "Help"
+msgstr "Aiuto"

-#: femonosd.c:268
 msgid "Video"
 msgstr "Video"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "Audio"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "Informazioni transponder"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "PID Video"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "PID Pcr"
-
-#: femonosd.c:316
 msgid "Apid"
-msgstr "Apid"
+msgstr "PID Audio"

-#: femonosd.c:318
 msgid "Dpid"
-msgstr "Dpid"
+msgstr "PID AC3"

-#: femonosd.c:321
-msgid "CA"
-msgstr "CA"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "PID Teletext"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
-msgstr "Scheda satellitare"
+msgstr "Scheda satellite"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "Frequenza"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr "Sorgente"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "SymbolRate"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "Polarizzazione"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr "Inversion"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "Scheda via cavo"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr "Modulation"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "Scheda terrestre"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "Transmission"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr "Banda passante"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr "Hierarchy"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "Guard"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
-msgstr ""
+msgstr "Informazioni flusso"

-#: femonosd.c:416
 msgid "Video Stream"
+msgstr "Flusso video"
+
+msgid "Codec"
 msgstr ""

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
 msgid "Bitrate"
-msgstr ""
+msgstr "Bitrate"

-#: femonosd.c:422
 msgid "Aspect Ratio"
-msgstr ""
+msgstr "Formato immagine"

-#: femonosd.c:425
 msgid "Frame Rate"
-msgstr ""
+msgstr "Frame rate"

-#: femonosd.c:426
-msgid "Hz"
-msgstr "Hz"
-
-#: femonosd.c:428
 msgid "Video Format"
-msgstr ""
+msgstr "Formato video"

-#: femonosd.c:431
 msgid "Resolution"
-msgstr ""
+msgstr "Risoluzione"

-#: femonosd.c:434
 msgid "Audio Stream"
+msgstr "Flusso audio"
+
+msgid "Channel Mode"
 msgstr ""

-#: femonosd.c:440
-msgid "MPEG Layer"
-msgstr ""
-
-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
-msgstr ""
+msgstr "Frequenza campionamento"

-#: femonosd.c:453
 msgid "AC-3 Stream"
-msgstr ""
+msgstr "Flusso AC-3"

-#: femonosd.c:464 femontools.c:400
-msgid "kHz"
-msgstr "kHz"
-
-#: femonosd.c:466
-msgid "Frame Size"
-msgstr ""
-
-#: femonosd.c:469
 msgid "Bit Stream Mode"
-msgstr ""
+msgstr "Modalit<EFBFBD> bitstream"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
-msgstr ""
+msgstr "Modalit<EFBFBD> codifica audio"

-#: femonosd.c:475
 msgid "Center Mix Level"
-msgstr ""
+msgstr "Livello sonoro centrale"

-#: femonosd.c:478
 msgid "Surround Mix Level"
-msgstr ""
+msgstr "Livello sonoro surround"

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
-msgstr ""
+msgstr "Modalit<EFBFBD> Dolby Surround"

-#: femonosd.c:484
 msgid "Low Frequency Effects"
-msgstr ""
+msgstr "Effetti bassa frequenza"

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "Off"
+msgid "on"
+msgstr "Attivo"

-#: femonosd.c:485 femontools.c:250
-msgid "On"
-msgstr "On"
+msgid "off"
+msgstr "Disattivo"

-#: femonosd.c:487
 msgid "Dialogue Normalization"
-msgstr ""
+msgstr "Normalizzazione dialoghi"

-#: femontools.c:189
-msgid "Free to Air"
-msgstr ""
-
-#: femontools.c:191
 msgid "Fixed"
-msgstr ""
+msgstr "Fisso"

-#: femontools.c:192
 msgid "Analog"
-msgstr ""
+msgstr "Analogico"

-#: femontools.c:193
 msgid "SECA/Mediaguard"
-msgstr ""
+msgstr "SECA/Mediaguard"

-#: femontools.c:194
 msgid "Viaccess"
-msgstr ""
+msgstr "Viaccess"

-#: femontools.c:195
 msgid "Irdeto"
-msgstr ""
+msgstr "Irdeto"

-#: femontools.c:196
 msgid "NDS/Videoguard"
-msgstr ""
+msgstr "NDS/Videoguard"

-#: femontools.c:197
 msgid "Conax"
-msgstr ""
+msgstr "Conax"

-#: femontools.c:198
 msgid "CryptoWorks"
-msgstr ""
+msgstr "CryptoWorks"

-#: femontools.c:199
 msgid "PowerVu"
-msgstr ""
+msgstr "PowerVu"

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
-msgstr ""
+msgstr "NagraVision"

-#: femontools.c:201
 msgid "BetaCrypt"
-msgstr ""
+msgstr "BetaCrypt"

-#: femontools.c:203
 msgid "SkyCrypt"
+msgstr "SkyCrypt"
+
+msgid "MPEG-2"
 msgstr ""

-#: femontools.c:211 femontools.c:259
-msgid "None"
-msgstr "None"
+msgid "H.264"
+msgstr ""

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
-msgstr "Auto"
+msgid "MPEG-1 Layer I"
+msgstr ""
+
+msgid "MPEG-1 Layer II"
+msgstr ""
+
+msgid "MPEG-1 Layer III"
+msgstr ""
+
+msgid "MPEG-2 Layer I"
+msgstr ""
+
+msgid "MPEG-2 Layer II"
+msgstr ""
+
+msgid "MPEG-2 Layer III"
+msgstr ""
+
+msgid "HE-AAC"
+msgstr ""
+
+msgid "stereo"
+msgstr ""
+
+msgid "joint Stereo"
+msgstr ""
+
+msgid "dual"
+msgstr ""
+
+msgid "mono"
+msgstr ""
+
+msgid "none"
+msgstr "nessuna"
+
+msgid "auto"
+msgstr "auto"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "MHz"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
+msgstr "riservato"
+
+msgid "extended"
 msgstr ""

-#: femontools.c:309
 msgid "unknown"
+msgstr "sconosciuto"
+
+msgid "component"
 msgstr ""

-#: femontools.c:310
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "Hz"
+
 msgid "Complete Main (CM)"
-msgstr ""
+msgstr "Principale (P)"

-#: femontools.c:320
 msgid "Music and Effects (ME)"
-msgstr ""
+msgstr "Musica ed effetti (ME)"

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
-msgstr ""
+msgstr "Non vedenti (NV)"

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
-msgstr ""
+msgstr "Non udenti (NU)"

-#: femontools.c:323
 msgid "Dialogue (D)"
-msgstr ""
+msgstr "Dialogui (D)"

-#: femontools.c:324
 msgid "Commentary (C)"
-msgstr ""
+msgstr "Commenti (C)"

-#: femontools.c:325
 msgid "Emergency (E)"
-msgstr ""
+msgstr "Emergenza (E)"

-#: femontools.c:326
-msgid "Karaoke"
-msgstr ""
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
-msgstr ""
+msgstr "Voce su (VS)"
+
+msgid "Karaoke"
+msgstr "Karaoke"

-#: femontools.c:335
 msgid "Ch1"
-msgstr ""
+msgstr "Can. 1"

-#: femontools.c:335
 msgid "Ch2"
-msgstr ""
+msgstr "Can. 2"

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
-msgstr ""
+msgstr "C"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
-msgstr ""
+msgstr "S"

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
-msgstr ""
+msgstr "D"

-#: femontools.c:339 femontools.c:340
 msgid "S"
-msgstr ""
+msgstr "S"

-#: femontools.c:341 femontools.c:342
 msgid "SL"
-msgstr ""
+msgstr "SS"

-#: femontools.c:341 femontools.c:342
 msgid "SR"
-msgstr ""
+msgstr "SD"

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
-msgstr ""
+msgstr "non indicato"

-#: femontools.c:408
 msgid "free"
-msgstr ""
+msgstr "libero"

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "Mbit/s"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "kbit/s"
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,13 +1,13 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
-# This file is distributed under the same license as the VDR package.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
 # Vyacheslav Dikonov
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
+"Project-Id-Version: femon 1.6.3\n"
 "Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2007-08-12 23:22+0300\n"
+"POT-Creation-Date: 2008-11-09 13:31+0200\n"
 "PO-Revision-Date: 2007-08-12 23:22+0300\n"
 "Last-Translator: Vyacheslav Dikonov\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,519 +15,434 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: femon.c:22
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femon.c:23
 msgid "Signal Information"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femon.c:101
-msgid "Femon not available while replaying"
+msgid "Femon not available"
 msgstr ""

-#: femon.c:278
 msgid "basic"
 msgstr ""

-#: femon.c:279
 msgid "transponder"
 msgstr ""

-#: femon.c:280
 msgid "stream"
 msgstr ""

-#: femon.c:281 femonosd.c:276
 msgid "AC-3"
 msgstr "AC-3"

-#: femon.c:283 femon.c:286
 msgid "Classic"
 msgstr ""

-#: femon.c:284 femon.c:287
 msgid "Elchi"
 msgstr "Elchi"

-#: femon.c:288
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
 msgid "DeepBlue"
 msgstr "DeepBlue"

-#: femon.c:289
 msgid "Moronimo"
 msgstr "Moronimo"

-#: femon.c:290
 msgid "Enigma"
 msgstr "Enigma"

-#: femon.c:291
 msgid "EgalsTry"
 msgstr "EgalsTry"

-#: femon.c:292
 msgid "Duotone"
 msgstr "Duotone"

-#: femon.c:293
 msgid "SilverGreen"
 msgstr "SilverGreen"

-#: femon.c:304
 msgid "Hide main menu entry"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:374
-msgid "no"
-msgstr "<22><><EFBFBD>"
+msgid "Define whether the main menu entry is hidden."
+msgstr ""

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "<22><>"
+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 ""

-#: femon.c:305
 msgid "Default display mode"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femon.c:306
-msgid "Skin"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"
+msgid "Define the default display mode at startup."
+msgstr ""

-#: femon.c:307
-msgid "Theme"
-msgstr "<22><><EFBFBD><EFBFBD>"
+msgid "Define the used OSD skin."
+msgstr ""
+
+msgid "Define the used OSD theme."
+msgstr ""

-#: femon.c:308
 msgid "Position"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"

-#: femon.c:308
-msgid "bottom"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"
+msgid "Define the position of OSD."
+msgstr ""

-#: femon.c:308
-msgid "top"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "Define the height of OSD."
+msgstr ""

-#: femon.c:309
-msgid "Height"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femon.c:310
 msgid "Horizontal offset"
 msgstr ""

-#: femon.c:311
+msgid "Define the horizontal offset of OSD."
+msgstr ""
+
 msgid "Show CA system"
 msgstr ""

-#: femon.c:312
+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><> (%)"

-#: femon.c:313
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
 msgid "Green limit [%]"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)"

-#: femon.c:314
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr ""
+
 msgid "OSD update interval [0.1s]"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)"

-#: femon.c:315
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
 msgid "Analyze stream"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femon.c:317
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
 msgid "Calculation interval [0.1s]"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)"

-#: femon.c:318
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
 msgid "Use SVDRP service"
 msgstr ""

-#: femon.c:320
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
 msgid "SVDRP service port"
 msgstr ""

-#: femon.c:321
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
 msgid "SVDRP service IP"
 msgstr ""

-#: femonosd.c:268
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
 msgid "Video"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:276
 msgid "Audio"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:305
 msgid "Transponder Information"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:311
-msgid "Vpid"
-msgstr "Vpid (<28><><EFBFBD><EFBFBD><EFBFBD>)"
-
-#: femonosd.c:313
-msgid "Ppid"
-msgstr "Ppid"
-
-#: femonosd.c:316
 msgid "Apid"
 msgstr "Apid"

-#: femonosd.c:318
 msgid "Dpid"
 msgstr "Dpid"

-#: femonosd.c:321
-msgid "CA"
-msgstr "CA (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
+msgid "Spid"
+msgstr "Spid"

-#: femonosd.c:323
-msgid "Tpid"
-msgstr "Tpid (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-
-#: femonosd.c:326
-msgid "Sid"
-msgstr "Sid"
-
-#: femonosd.c:328
 msgid "Nid"
 msgstr "Nid"

-#: femonosd.c:331
 msgid "Tid"
 msgstr "Tid"

-#: femonosd.c:333
 msgid "Rid"
 msgstr "Rid"

-#: femonosd.c:338
 msgid "Satellite Card"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:340 femonosd.c:359 femonosd.c:378
-msgid "Frequency"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:342 femonosd.c:361
-msgid "Source"
-msgstr ".<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:345 femonosd.c:364
-msgid "Srate"
-msgstr "<22><><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:347
-msgid "Polarization"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:350 femonosd.c:369 femonosd.c:388
-msgid "Inversion"
-msgstr ".<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:352 femonosd.c:371
-msgid "CoderateH"
-msgstr "CoderateH"
-
-#: femonosd.c:357
 msgid "Cable Card"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:366 femonosd.c:385
-msgid "Modulation"
-msgstr ".<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:376
 msgid "Terrestrial Card"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: femonosd.c:380
-msgid "Transmission"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:383
-msgid "Bandwidth"
-msgstr ".<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:390
 msgid "Coderate"
 msgstr "Coderate"

-#: femonosd.c:393
-msgid "Hierarchy"
-msgstr ".<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:395
-msgid "Guard"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femonosd.c:410 femonosd.c:453
 msgid "Stream Information"
 msgstr ""

-#: femonosd.c:416
 msgid "Video Stream"
 msgstr ""

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
+msgid "Codec"
+msgstr ""
+
 msgid "Bitrate"
 msgstr ""

-#: femonosd.c:422
 msgid "Aspect Ratio"
 msgstr ""

-#: femonosd.c:425
 msgid "Frame Rate"
 msgstr ""

-#: femonosd.c:426
-msgid "Hz"
-msgstr "<22><>"
-
-#: femonosd.c:428
 msgid "Video Format"
 msgstr ""

-#: femonosd.c:431
 msgid "Resolution"
 msgstr ""

-#: femonosd.c:434
 msgid "Audio Stream"
 msgstr ""

-#: femonosd.c:440
-msgid "MPEG Layer"
+msgid "Channel Mode"
 msgstr ""

-#: femonosd.c:443 femonosd.c:463
 msgid "Sampling Frequency"
 msgstr ""

-#: femonosd.c:453
 msgid "AC-3 Stream"
 msgstr ""

-#: femonosd.c:464 femontools.c:400
-msgid "kHz"
-msgstr "ڳ<>"
-
-#: femonosd.c:466
-msgid "Frame Size"
-msgstr ""
-
-#: femonosd.c:469
 msgid "Bit Stream Mode"
 msgstr ""

-#: femonosd.c:472
 msgid "Audio Coding Mode"
 msgstr ""

-#: femonosd.c:475
 msgid "Center Mix Level"
 msgstr ""

-#: femonosd.c:478
 msgid "Surround Mix Level"
 msgstr ""

-#: femonosd.c:481
 msgid "Dolby Surround Mode"
 msgstr ""

-#: femonosd.c:484
 msgid "Low Frequency Effects"
 msgstr ""

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "<22><><EFBFBD><EFBFBD>"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
+msgid "on"
 msgstr "<22><><EFBFBD>"

-#: femonosd.c:487
+msgid "off"
+msgstr "<22><><EFBFBD><EFBFBD>"
+
 msgid "Dialogue Normalization"
 msgstr ""

-#: femontools.c:189
-msgid "Free to Air"
-msgstr ""
-
-#: femontools.c:191
 msgid "Fixed"
 msgstr ""

-#: femontools.c:192
 msgid "Analog"
 msgstr ""

-#: femontools.c:193
 msgid "SECA/Mediaguard"
 msgstr ""

-#: femontools.c:194
 msgid "Viaccess"
 msgstr ""

-#: femontools.c:195
 msgid "Irdeto"
 msgstr ""

-#: femontools.c:196
 msgid "NDS/Videoguard"
 msgstr ""

-#: femontools.c:197
 msgid "Conax"
 msgstr ""

-#: femontools.c:198
 msgid "CryptoWorks"
 msgstr ""

-#: femontools.c:199
 msgid "PowerVu"
 msgstr ""

-#: femontools.c:200 femontools.c:202
 msgid "NagraVision"
 msgstr ""

-#: femontools.c:201
 msgid "BetaCrypt"
 msgstr ""

-#: femontools.c:203
 msgid "SkyCrypt"
 msgstr ""

-#: femontools.c:211 femontools.c:259
-msgid "None"
+msgid "MPEG-2"
+msgstr ""
+
+msgid "H.264"
+msgstr ""
+
+msgid "MPEG-1 Layer I"
+msgstr ""
+
+msgid "MPEG-1 Layer II"
+msgstr ""
+
+msgid "MPEG-1 Layer III"
+msgstr ""
+
+msgid "MPEG-2 Layer I"
+msgstr ""
+
+msgid "MPEG-2 Layer II"
+msgstr ""
+
+msgid "MPEG-2 Layer III"
+msgstr ""
+
+msgid "HE-AAC"
+msgstr ""
+
+msgid "stereo"
+msgstr ""
+
+msgid "joint Stereo"
+msgstr ""
+
+msgid "dual"
+msgstr ""
+
+msgid "mono"
+msgstr ""
+
+msgid "none"
 msgstr "<22><><EFBFBD>"

-#: femontools.c:220 femontools.c:230 femontools.c:241 femontools.c:251
-#: femontools.c:263 femontools.c:275 femontools.c:289
-msgid "Auto"
+msgid "auto"
 msgstr "<22><><EFBFBD><EFBFBD>"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
 msgid "MHz"
 msgstr "<22><><EFBFBD>"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""
+
 msgid "reserved"
 msgstr ""

-#: femontools.c:309
+msgid "extended"
+msgstr ""
+
 msgid "unknown"
 msgstr ""

-#: femontools.c:310
+msgid "component"
+msgstr ""
+
 msgid "PAL"
 msgstr "PAL"

-#: femontools.c:311
 msgid "NTSC"
 msgstr "NTSC"

-#: femontools.c:319
+msgid "SECAM"
+msgstr ""
+
+msgid "MAC"
+msgstr ""
+
+msgid "Hz"
+msgstr "<22><>"
+
 msgid "Complete Main (CM)"
 msgstr ""

-#: femontools.c:320
 msgid "Music and Effects (ME)"
 msgstr ""

-#: femontools.c:321
 msgid "Visually Impaired (VI)"
 msgstr ""

-#: femontools.c:322
 msgid "Hearing Impaired (HI)"
 msgstr ""

-#: femontools.c:323
 msgid "Dialogue (D)"
 msgstr ""

-#: femontools.c:324
 msgid "Commentary (C)"
 msgstr ""

-#: femontools.c:325
 msgid "Emergency (E)"
 msgstr ""

-#: femontools.c:326
-msgid "Karaoke"
-msgstr ""
-
-#: femontools.c:326
 msgid "Voice Over (VO)"
 msgstr ""

-#: femontools.c:335
+msgid "Karaoke"
+msgstr ""
+
 msgid "Ch1"
 msgstr ""

-#: femontools.c:335
 msgid "Ch2"
 msgstr ""

-#: femontools.c:336 femontools.c:338 femontools.c:340 femontools.c:342
 msgid "C"
 msgstr ""

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "L"
 msgstr ""

-#: femontools.c:337 femontools.c:338 femontools.c:339 femontools.c:340
-#: femontools.c:341 femontools.c:342
 msgid "R"
 msgstr ""

-#: femontools.c:339 femontools.c:340
 msgid "S"
 msgstr ""

-#: femontools.c:341 femontools.c:342
 msgid "SL"
 msgstr ""

-#: femontools.c:341 femontools.c:342
 msgid "SR"
 msgstr ""

-#: femontools.c:351 femontools.c:352 femontools.c:353 femontools.c:362
-#: femontools.c:363 femontools.c:364 femontools.c:384
 msgid "dB"
 msgstr "dB"

-#: femontools.c:373
 msgid "not indicated"
 msgstr ""

-#: femontools.c:408
 msgid "free"
 msgstr ""

-#: femontools.c:416 femontools.c:417
 msgid "Mbit/s"
 msgstr "<22><><EFBFBD><EFBFBD>/<2F>"

-#: femontools.c:423 femontools.c:424
 msgid "kbit/s"
 msgstr "<22><><EFBFBD><EFBFBD>/<2F>"
--- a/symbols/encrypted.xpm
+++ b/symbols/encrypted.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const encrypted_xpm[] = {
+"23 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++",
+"+.....................+",
+"+.....................+",
+"+.....................+",
+"+..............+++....+",
+"+.............+++++...+",
+"+............+++.+++..+",
+"+............++...++..+",
+"+..++++++++++++...++..+",
+"+..++++++++++++...++..+",
+"+...++.++....++...++..+",
+"+...++.++....+++.+++..+",
+"+...++.++.....+++++...+",
+"+..............+++....+",
+"+.....................+",
+"+.....................+",
+"+.....................+",
+"+++++++++++++++++++++++"};
--- a/symbols/h264.xpm
+++ b/symbols/h264.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const h264_xpm[] = {
+"40 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++++++++++",
+"+......................................+",
+"+..++...++.....+++++...+++++.......++..+",
+"+..++...++....+++++++.+++++++.....+++..+",
+"+..++...++....++...++.++...++....++++..+",
+"+..++...++.........++.++........+++....+",
+"+..++...++.........++.++.......+++.....+",
+"+..++...++........+++.++......+++......+",
+"+..+++++++.......+++..++++++..++...++..+",
+"+..+++++++......+++...+++++++.+++++++..+",
+"+..++...++.....+++....++...++.+++++++..+",
+"+..++...++....+++.....++...++......++..+",
+"+..++...++....++......++...++......++..+",
+"+..++...++....++...++.++...++......++..+",
+"+..++...++.++.+++++++.+++++++......++..+",
+"+..++...++.++.+++++++..+++++.......++..+",
+"+......................................+",
+"++++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/mpeg2.xpm
+++ b/symbols/mpeg2.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const mpeg2_xpm[] = {
+"44 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++++++++++++++",
+"+..........................................+",
+"+..++....++.+++++...+++++..+++++...+++++...+",
+"+..++....++.++++++..+++++.+++++++.+++++++..+",
+"+..+++..+++.++..+++.++....+++..++.++...++..+",
+"+..+++..+++.++...++.++....++...........++..+",
+"+..++++++++.++...++.++....++...........++..+",
+"+..++++++++.++..+++.++....++..........+++..+",
+"+..++.++.++.++++++..++++..++.++++....+++...+",
+"+..++.++.++.+++++...++++..++.++++...+++....+",
+"+..++....++.++......++....++...++..+++.....+",
+"+..++....++.++......++....++...++.+++......+",
+"+..++....++.++......++....++...++.++.......+",
+"+..++....++.++......++....+++..++.++...++..+",
+"+..++....++.++......+++++.+++++++.+++++++..+",
+"+..++....++.++......+++++..+++++..+++++++..+",
+"+..........................................+",
+"++++++++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/seven.xpm
+++ b/symbols/seven.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const seven_xpm[] = {
+"15 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++",
+"..............+",
+"...++++++++...+",
+"...++++++++...+",
+"...++....++...+",
+".........++...+",
+"........+++...+",
+"........++....+",
+"........++....+",
+".......+++....+",
+".......++.....+",
+".......++.....+",
+"......+++.....+",
+"......++......+",
+"......++......+",
+"......++......+",
+"..............+",
+"+++++++++++++++"};
--- a/symbols/six.xpm
+++ b/symbols/six.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const six_xpm[] = {
+"15 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++",
+"..............+",
+"....++++++....+",
+"...++++++++...+",
+"...+++...++...+",
+"...++.........+",
+"...++.........+",
+"...++.+++.....+",
+"...+++++++....+",
+"...+++..+++...+",
+"...++....++...+",
+"...++....++...+",
+"...++....++...+",
+"...+++..+++...+",
+"...+++++++....+",
+"....+++++.....+",
+"..............+",
+"+++++++++++++++"};
Author	SHA1	Message	Date
Rolf Ahrenberg	99244a136e	Added encryption icon.	2008-11-09 14:35:12 +02:00
Rolf Ahrenberg	8bf429b381	Added initial support for H.264 and HE-AAC. Fixed detection of false positives in audio/video streams. Refactored source code.	2008-11-09 13:43:27 +02:00
Rolf Ahrenberg	5fc74330d3	Updated HISTORY for the release.	2008-10-12 22:43:38 +03:00
Rolf Ahrenberg	f40d9b699b	Optimized OSD thread termination.	2008-09-17 18:51:38 +03:00
Rolf Ahrenberg	1570cf80f8	Optimized receiver thread termination.	2008-09-10 17:37:28 +03:00
Rolf Ahrenberg	0b19b7b31d	Added .gitignore.	2008-08-29 17:40:51 +03:00
Rolf Ahrenberg	f092a4127c	Converted HISTORY and fi_FI.po to UTF-8.	2008-08-24 23:22:27 +03:00
Rolf Ahrenberg	93ccc78469	Updated Italian translation (Thanks to Diego Pierotto). Fixed a crash if no channel available (Thanks to Winfried Köhler)	2008-06-20 04:20:00 +03:00
Rolf Ahrenberg	2e6cd471ba	Updated for vdr-1.6.0. Updated Italian translation (Thanks to Diego Pierotto). Added ST:TNG theme (Thanks to Fabian Förg).	2008-03-27 04:20:00 +02:00
Rolf Ahrenberg	09acce8a0b	Replaced asprintf with cString. Updated French translation (Thanks to Michaël Nival). Fixed service call with null data. Added setup option to use a single 8 bpp OSD area.	2008-02-18 04:20:00 +02:00
Rolf Ahrenberg	71b2993345	Updated Italian translation (Thanks to Diego Pierotto). Added '-Wno-parentheses' to the compiler options. Mapped 'kInfo' as help key in setup menu.	2008-01-20 04:20:00 +02:00
Rolf Ahrenberg	d6e5a01ada	Added Spids support. Minor OSD layout changes.	2007-10-14 04:20:00 +03:00
Rolf Ahrenberg	c8c639be62	Updated for vdr-1.5.8.	2007-08-19 04:20:00 +03:00