Updated HISTORY.

Added support for LDFLAGS.
Tweaked translation files.
2023-10-10 11:36:53 +00:00 · 2010-12-27 10:30:43 +02:00 · 2010-12-14 19:25:09 +02:00 · 2010-12-08 10:47:24 +02:00 · 2010-12-04 19:06:15 +02:00 · 2010-10-29 21:16:01 +03:00
50 changed files with 5873 additions and 3233 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.dependencies
+*.o
+*.so
+*~
+po/*.pot
+po/*.mo
--- a/185
+++ b/185
@@ -1,3 +1,4 @@
+
 ===================================
 VDR Plugin 'femon' Revision History
 ===================================
@@ -28,7 +29,8 @@ VDR Plugin 'femon' Revision History

 - Redesigned the user interface.
 - Transponder information is now available in advanced display mode:
-  Press 'OK' key to switch between the simple and the advanced display mode.
+  Press 'OK' key to switch between the simple and the advanced display
+  mode.
 - Moved bitrate calculation to it's own thread for improved accurancy.

 2004-03-07: Version 0.0.3a
@@ -40,12 +42,13 @@ VDR Plugin 'femon' Revision History
 2004-03-16: Version 0.0.3b

 - Fixed channel toggling with '0' key.
- Bitrate calculation thread is now canceled immediately to speed up channel switching.
+- Bitrate calculation thread is now canceled immediately to speed up
+  channel switching.

 2004-04-04: Version 0.0.3c

 - 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 +79,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
@@ -87,7 +90,8 @@ VDR Plugin 'femon' Revision History

 2004-06-11: Version 0.1.3

- Added "AC-3 Stream Information" display mode (Thanks to Lothar Englisch).
+- Added "AC-3 Stream Information" display mode (Thanks to Lothar
+  Englisch).

 2004-06-24: Version 0.1.4

@@ -99,7 +103,8 @@ VDR Plugin 'femon' Revision History

 - Fixed OSDSTATUSWIN_XC define.
 - Added preliminary NTSC support (make NTSC_SYSTEM=1 plugins).
- Fixed "Setup/OSD/Use Small Fonts" bug (Thanks to Winni for reporting this one).
+- Fixed "Setup/OSD/Use Small Fonts" bug (Thanks to Winni for reporting
+  this one).
 - Added patches directory: CA system names by Lauri Tischler.

 2004-09-11: Version 0.1.6
@@ -145,12 +150,13 @@ VDR Plugin 'femon' Revision History
 2005-04-01: Version 0.8.7

 - Default make target is now all.
- Fixed the access rights of symbols subdirectory (Thanks to Harri Kukkonen).
+- Fixed the access rights of symbols subdirectory (Thanks to Harri
+  Kukkonen).
 - Added a new theme: Moronimo (Thanks to Morone).

 2005-04-02: Version 0.8.8

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

 2005-04-04: Version 0.8.9

@@ -159,7 +165,8 @@ VDR Plugin 'femon' Revision History

 2005-05-20: Version 0.9.0

- Renamed compiling switches ('DEBUG' to 'FEMON_DEBUG' and 'NTSC_SYSTEM' to 'FEMON_NTSC').
+- Renamed compiling switches ('DEBUG' to 'FEMON_DEBUG' and 'NTSC_SYSTEM'
+  to 'FEMON_NTSC').
 - Enabled preliminary support for the device switching.

 2005-07-23: Version 0.9.1
@@ -187,19 +194,20 @@ 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

 - Updated for vdr-1.3.40.
 - Fixed a translation bug (Thanks to Antti Hartikainen).
- Fixed AC3 header parsing bug (Thanks to Axel Katzur for reporting this one).
+- Fixed AC3 header parsing bug (Thanks to Axel Katzur for reporting this
+  one).
 - Fixed EgalsTry theme (Thanks to Uwe Hanke).

 2006-02-06: Version 0.9.7
@@ -220,14 +228,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 +245,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 +255,157 @@ 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.
+
+2008-11-30: Version 1.6.4
+
+- Added new helper functions.
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Fixed a memory leak.
+- Added a check for the minimum OSD height.
+- Replaced "Use single area (8bpp)" option with VDR's
+  "Setup/OSD/Anti-alias".
+- Removed the FEMON_NTSC option.
+- Fixed a deadlock in cFemonReceiver (Thanks to Antti Seppälä for
+  reporting this one).
+
+2008-12-16: Version 1.6.5
+
+- Backported from 1.7.0.
+
+2009-01-06: Version 1.6.6
+
+- Backported from 1.7.1.
+
+2009-06-18: Version 1.6.7
+
+- Backported from 1.7.2.
+
+===================================
+VDR Plugin 'femon' Revision History
+===================================
+
+2008-12-16: Version 1.7.0
+
+- Updated for vdr-1.7.2.
+- Added whitespace cleanups.
+- Changed info window to use the channel source instead of the frontend
+  type.
+- Removed the "Show CA system" setup option.
+
+2009-01-06: Version 1.7.1
+
+- Fixed closing of frontend file handles (Thanks to Brendon Higgins for
+  reporting this one).
+
+2009-06-18: Version 1.7.2
+
+- Cleaned up compilation warnings.
+- Fixed font handling to be thread-safe.
+
+2009-08-29: Version 1.7.3
+
+- Removed OSD offset and height options.
+- Added PES assembler.
+- Added bitstream parsers for all codecs.
+
+2009-09-04: Version 1.7.4
+
+- Fixed H.264 bitstream parser.
+- Added a mutex to receiver class.
+- Added 1080/720/576/480 format symbols into status window.
+
+2009-10-01: Version 1.7.5
+
+- Changed H.264 parser to show display aspect ratio.
+- Removed error logging from unimplemented ioctl functions.
+- Removed bitstream parsing from Receive() method.
+- Added Chinese translation (Thanks to NanFeng).
+
+2010-02-01: Version 1.7.6
+
+- Updated for vdr-1.7.12.
+- Updated Estonian translation (Thanks to Arthur Konovalov).
+- Added Lithuanian translation (Thanks to Valdemaras Pipiras).
+
+2010-03-05: Version 1.7.7
+
+- Updated for vdr-1.7.13.
+- Added a setup option to downscale the OSD size.
+- Updated Estonian translation (Thanks to Arthur Konovalov).
+
+2010-06-23: Version 1.7.8
+
+- Fixed device switching.
+- Added preliminary support for LATM.
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Fixed a crash in femon service (Thanks to Wolfgang Astleitner).
+
+2010-12-27: Version 1.7.9
+
+- Updated for vdr-1.7.16.
+- Added Makefile depencency for objects.
+- Fixed detection of replaying.
+- Added support for LDFLAGS.
--- a/60
+++ b/60
@@ -1,20 +1,18 @@
 #
-# Makefile for a Video Disk Recorder plugin
+# Makefile for Frontend Status Monitor plugin
 #
-# $Id$

 # Debugging on/off 
 #FEMON_DEBUG = 1

-# NTSC on/off 
-#FEMON_NTSC = 1
-
 # Strip debug symbols?  Set eg. to /bin/true if not
 STRIP = strip

 # 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 +23,8 @@ 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 -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Woverloaded-virtual -Wno-parentheses
+LDFLAGS  ?= -Wl,--as-needed

 ### The directory environment:

@@ -33,6 +32,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp

+### Make sure that necessary options are included:
+
+-include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:

 -include $(VDRDIR)/Make.config
@@ -52,10 +55,6 @@ INCLUDES += -I$(VDRDIR)/include

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

-ifdef FEMON_NTSC
-DEFINES += -DNTSC
-endif
-
 ifdef FEMON_DEBUG
 DEFINES += -DDEBUG
 endif
@@ -65,16 +64,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 femonlatm.o femonh264.o femonsymbol.o
+
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n

 ### Implicit rules:

-%.o: %.c
+%.o: %.c Makefile
 	$(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,32 +89,30 @@ $(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='<see README>' -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 $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 ifndef FEMON_DEBUG
 	@$(STRIP) $@
 endif
@@ -126,5 +127,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/14
+++ b/14
@@ -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/

@@ -14,7 +15,7 @@ See the file COPYING for license information.

 Requirements:

-VDR & DVB. BMW & Ph.D.. BEER. YARRR!
+VDR and a DVB card.

 Description:

@@ -25,9 +26,7 @@ transponder and stream information are also available in advanced display modes.

 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.
+information).

 Terminology:

@@ -108,9 +107,8 @@ Notes:
  specifications those values cannot be calculated into any real units.

 - If the OSD isn't visible, you've configured the OSD height too big or too
-  small. Please, try to adjust the variable on the setup page before writing
-  any bug reports. NTSC users should use a shrinked default OSD height by
-  compiling the plugin with: make FEMON_NTSC=1
+  small. Please, try to adjust the variable on the OSD setup page before
+  writing any bug reports.

 - If the SVDRP service is used: femon won't notice if the server is tuned
  to a different channel and tuning the channel on the server might annoy
--- 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/player.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 < 10716
+#error "VDR-1.7.16 API version or greater is required!"
 #endif

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

@@ -50,13 +50,13 @@ cPluginFemon::cPluginFemon()
  // Initialize any member variables here.
  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
 }

 cPluginFemon::~cPluginFemon()
 {
  // Clean up after yourself!
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
 }

 const char *cPluginFemon::CommandLineHelp(void)
@@ -96,9 +96,9 @@ void cPluginFemon::Housekeeping(void)
 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"));
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  if (cControl::Control() || (Channels.Count() <= 0))
+     Skins.Message(mtInfo, tr("Femon not available"));
  else
     return cFemonOsd::Instance(true);
  return NULL;
@@ -110,11 +110,9 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)
  if      (!strcasecmp(Name, "HideMenu"))       femonConfig.hidemenu       = atoi(Value);
  else if (!strcasecmp(Name, "DisplayMode"))    femonConfig.displaymode    = atoi(Value);
  else if (!strcasecmp(Name, "Position"))       femonConfig.position       = atoi(Value);
-  else if (!strcasecmp(Name, "OSDHeight"))      femonConfig.osdheight      = atoi(Value);
-  else if (!strcasecmp(Name, "OSDOffset"))      femonConfig.osdoffset      = atoi(Value);
  else if (!strcasecmp(Name, "Skin"))           femonConfig.skin           = atoi(Value);
  else if (!strcasecmp(Name, "Theme"))          femonConfig.theme          = atoi(Value);
-  else if (!strcasecmp(Name, "ShowCASystem"))   femonConfig.showcasystem   = atoi(Value);
+  else if (!strcasecmp(Name, "Downscale"))      femonConfig.downscale      = atoi(Value);
  else if (!strcasecmp(Name, "RedLimit"))       femonConfig.redlimit       = atoi(Value);
  else if (!strcasecmp(Name, "GreenLimit"))     femonConfig.greenlimit     = atoi(Value);
  else if (!strcasecmp(Name, "UpdateInterval")) femonConfig.updateinterval = atoi(Value);
@@ -132,18 +130,22 @@ 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;
+        if (!cDevice::ActualDevice())
+           return false; 
+        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;
     }

@@ -194,7 +196,7 @@ cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int
        return cString("Cannot open femon plugin while replaying");
        }
     if (!cFemonOsd::Instance())
-        cRemote::CallPlugin("femon");
+        cRemote::CallPlugin(Name());
     return cString("Opening femon plugin");
     }
  else if (strcasecmp(Command, "QUIT") == 0) {
@@ -264,7 +266,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);
@@ -274,7 +277,7 @@ public:

 cMenuFemonSetup::cMenuFemonSetup(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
  dispmodes[eFemonModeBasic]       = tr("basic");
  dispmodes[eFemonModeTransponder] = tr("transponder");
  dispmodes[eFemonModeStream]      = tr("stream");
@@ -285,6 +288,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 +305,52 @@ 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 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(tr("Downscale OSD size [%]"), &data.downscale, 0, 20));
+  help.Append(tr("Define the downscale ratio for OSD size."));
+
+  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));
@@ -327,16 +359,14 @@ void cMenuFemonSetup::Setup(void)

 void cMenuFemonSetup::Store(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
  femonConfig = data;
  SetupStore("HideMenu",       femonConfig.hidemenu);
  SetupStore("DisplayMode",    femonConfig.displaymode);
  SetupStore("Skin",           femonConfig.skin);
  SetupStore("Theme",          femonConfig.theme);
  SetupStore("Position",       femonConfig.position);
-  SetupStore("OSDHeight",      femonConfig.osdheight);
-  SetupStore("OSDOffset",      femonConfig.osdoffset);
-  SetupStore("ShowCASystem",   femonConfig.showcasystem);
+  SetupStore("Downscale",      femonConfig.downscale);
  SetupStore("RedLimit",       femonConfig.redlimit);
  SetupStore("GreenLimit",     femonConfig.greenlimit);
  SetupStore("UpdateInterval", femonConfig.updateinterval);
@@ -354,9 +384,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,105 @@
+/*
+ * 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))
+
+unsigned int cFemonAAC::s_Samplerates[16] =
+{
+  96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, -1, -1, -1, -1
+};
+
+cFemonAAC::cFemonAAC(cFemonAudioIf *audiohandler)
+: m_AudioHandler(audiohandler)
+{
+}
+
+cFemonAAC::~cFemonAAC()
+{
+}
+
+bool cFemonAAC::processAudio(const uint8_t *buf, int len)
+{
+  cBitStream bs(buf, len * 8);
+
+  if (!m_AudioHandler)
+     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)
+   */
+
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.skipBits(8 * PesPayloadOffset(buf));
+
+  // HE-AAC audio detection
+  if (bs.getBits(12) != 0xFFF)                  // syncword
+     return false;
+
+  bs.skipBit();                                 // id
+
+  // layer must be 0
+  if (bs.getBits(2))                            // layer
+      return false;
+
+  bs.skipBit();                                 // protection_absent
+  bs.skipBits(2);                               // profile
+  int sampling_frequency_index = bs.getBits(4); // sampling_frequency_index
+  bs.skipBit();                                 // private pid
+  int channel_configuration = bs.getBits(3);    // channel_configuration
+
+  m_AudioHandler->SetAudioCodec(AUDIO_CODEC_HEAAC);
+  m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
+
+  switch (channel_configuration) {
+    case 0:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
+         break;
+
+    case 1:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
+         break;
+
+    case 2:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
+         break;
+
+    case 3:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
+         break;
+  }
+
+  switch (sampling_frequency_index) {
+    case 0xC ... 0xF:
+         m_AudioHandler->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioSamplingFrequency(s_Samplerates[sampling_frequency_index]);
+         break;
+  }
+
+  return true;
+}
--- a/femonaac.h
+++ b/femonaac.h
@@ -0,0 +1,26 @@
+/*
+ * 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"
+
+class cFemonAAC {
+private:
+  cFemonAudioIf *m_AudioHandler;
+
+  static unsigned int s_Samplerates[16];
+
+public:
+  cFemonAAC(cFemonAudioIf *audiohandler);
+  virtual ~cFemonAAC();
+
+  bool processAudio(const uint8_t *buf, int len);
+  };
+
+#endif //__FEMONAAC_H
--- a/femonac3.c
+++ b/femonac3.c
@@ -0,0 +1,93 @@
+/*
+ * 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"
+
+unsigned int cFemonAC3::s_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
+};
+
+unsigned int cFemonAC3::s_Frequencies[4] =
+{
+  480, 441, 320, 0
+};
+
+unsigned int cFemonAC3::s_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}
+};
+
+cFemonAC3::cFemonAC3(cFemonAC3If *audiohandler)
+: m_AudioHandler(audiohandler)
+{
+}
+
+cFemonAC3::~cFemonAC3()
+{
+}
+
+bool cFemonAC3::processAudio(const uint8_t *buf, int len)
+{
+  int fscod, frmsizcod, bsmod, acmod;
+  int centermixlevel = AUDIO_CENTER_MIX_LEVEL_INVALID;
+  int surroundmixlevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
+  int dolbysurroundmode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
+  cBitStream bs(buf, len * 8);
+
+  if (!m_AudioHandler)
+     return false;
+
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.skipBits(8 * PesPayloadOffset(buf));
+
+  // http://rmworkshop.com/dvd_info/related_info/ac3hdr.htm
+
+  // AC3 audio detection
+  if (bs.getU16() != 0x0B77)        // syncword
+     return false;
+
+  bs.skipBits(16);                  // CRC1
+
+  fscod = bs.getBits(2);            // sampling rate values
+  frmsizcod = bs.getBits(6);        // frame size code
+
+  bs.skipBits(5);                   // bitstream id
+  bsmod = bs.getBits(3);            // bitstream mode
+  acmod = bs.getBits(3);            // audio coding mode
+
+  // 3 front channels
+  if ((acmod & 0x01) && (acmod != 0x01))
+     centermixlevel = bs.getBits(2);
+
+  // if a surround channel exists
+  if (acmod & 0x04)
+     surroundmixlevel = bs.getBits(2);
+
+  // if in 2/0 mode
+  if (acmod == 0x02)
+      dolbysurroundmode = bs.getBits(2);
+
+  m_AudioHandler->SetAC3Bitrate(1000 * s_Bitrates[frmsizcod >> 1]);
+  m_AudioHandler->SetAC3SamplingFrequency(100 * s_Frequencies[fscod]);
+  m_AudioHandler->SetAC3Bitstream(bsmod);
+  m_AudioHandler->SetAC3AudioCoding(acmod);
+  m_AudioHandler->SetAC3CenterMix(centermixlevel);
+  m_AudioHandler->SetAC3SurroundMix(surroundmixlevel);
+  m_AudioHandler->SetAC3DolbySurround(dolbysurroundmode);
+
+  m_AudioHandler->SetAC3LFE(bs.getBit());       // low frequency effects on
+  m_AudioHandler->SetAC3Dialog(bs.getBits(5));  // dialog normalization
+
+  return true;
+}
--- a/femonac3.h
+++ b/femonac3.h
@@ -0,0 +1,28 @@
+/*
+ * 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"
+
+class cFemonAC3 {
+private:
+  cFemonAC3If *m_AudioHandler;
+
+  static unsigned int s_Bitrates[32];
+  static unsigned int s_Frequencies[4];
+  static unsigned int s_Frames[3][32];
+
+public:
+  cFemonAC3(cFemonAC3If *audiohandler);
+  virtual ~cFemonAC3();
+
+  bool processAudio(const uint8_t *buf, int len);
+  };
+
+#endif //__FEMONAC3_H
--- a/femonaudio.h
+++ b/femonaudio.h
@@ -0,0 +1,150 @@
+/*
+ * 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,
+  AUDIO_CODEC_LATM
+  };
+
+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;           // bit/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;
+
+class cFemonAudioIf {
+public:
+  cFemonAudioIf() {}
+  virtual ~cFemonAudioIf() {}
+
+  // enum
+  virtual void SetAudioCodec(eAudioCodec codec) = 0;
+  // kbit/s or eAudioBitrate
+  virtual void SetAudioBitrate(double bitrate) = 0;
+  // Hz or eAudioSamplingFrequency
+  virtual void SetAudioSamplingFrequency(int sampling) = 0;
+  // eAudioChannelMode
+  virtual void SetAudioChannel(eAudioChannelMode mode) = 0;
+  };
+
+class cFemonAC3If {
+public:
+  cFemonAC3If() {}
+  virtual ~cFemonAC3If() {}
+
+  // bit/s or eAudioBitrate
+  virtual void SetAC3Bitrate(int bitrate) = 0;
+  // Hz or eAudioSamplingFrequency
+  virtual void SetAC3SamplingFrequency(int sampling) = 0;
+  // 0..7 or eAudioBitstreamMode
+  virtual void SetAC3Bitstream(int mode) = 0;
+  // 0..7 or eAudioCodingMode
+  virtual void SetAC3AudioCoding(int mode) = 0;
+  // eAudioDolbySurroundMode
+  virtual void SetAC3DolbySurround(int mode) = 0;
+  // eAudioCenterMixLevel
+  virtual void SetAC3CenterMix(int level) = 0;
+  // eAudioSurroundMixLevel
+  virtual void SetAC3SurroundMix(int level) = 0;
+  // -dB
+  virtual void SetAC3Dialog(int level) = 0;
+  // boolean
+  virtual void SetAC3LFE(bool onoff) = 0;
+  };
+
+#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>
@@ -18,20 +17,14 @@ cFemonConfig::cFemonConfig(void)
  skin           = 0;
  theme          = 0;
  position       = 1;
+  downscale      = 0;
  redlimit       = 33;
  greenlimit     = 66;
  updateinterval = 5;
  analyzestream  = 1;
  calcinterval   = 20;
-  showcasystem   = 0;
-#ifdef NTSC
-  osdheight      = 420;
-#else
-  osdheight      = 480;
-#endif
-  osdoffset      = 0;
  usesvdrp       = 0;
-  svdrpport      = 2001;
+  svdrpport      = 6419;
  strncpy(svdrpip, "0.0.0.0", sizeof(svdrpip));
 }

@@ -61,6 +54,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
@@ -29,14 +28,12 @@ public:
  int skin;
  int theme;
  int position;
+  int downscale;
  int redlimit;
  int greenlimit;
  int updateinterval;
  int analyzestream;
  int calcinterval;
-  int showcasystem;
-  int osdheight;
-  int osdoffset;
  int usesvdrp;
  int svdrpport;
  char svdrpip[MaxSvdrpIp + 1]; // must end with additional null
@@ -55,6 +52,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.4.tgz
+++ b/femonclient/vdr-femonclient-0.0.4.tgz
--- a/femonh264.c
+++ b/femonh264.c
@@ -0,0 +1,769 @@
+/*
+ * 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 "femonh264.h"
+
+const cFemonH264::t_DAR cFemonH264::s_DAR[] =
+{
+  {  VIDEO_ASPECT_RATIO_1_1,      100  },
+  {  VIDEO_ASPECT_RATIO_4_3,      133  },
+  {  VIDEO_ASPECT_RATIO_16_9,     177  },
+  {  VIDEO_ASPECT_RATIO_2_21_1,   221  },
+  {  VIDEO_ASPECT_RATIO_12_11,    109  },
+  {  VIDEO_ASPECT_RATIO_10_11,    90   },
+  {  VIDEO_ASPECT_RATIO_16_11,    145  },
+  {  VIDEO_ASPECT_RATIO_40_33,    121  },
+  {  VIDEO_ASPECT_RATIO_24_11,    218  },
+  {  VIDEO_ASPECT_RATIO_20_11,    181  },
+  {  VIDEO_ASPECT_RATIO_32_11,    290  },
+  {  VIDEO_ASPECT_RATIO_80_33,    242  },
+  {  VIDEO_ASPECT_RATIO_18_11,    163  },
+  {  VIDEO_ASPECT_RATIO_15_11,    136  },
+  {  VIDEO_ASPECT_RATIO_64_33,    193  },
+  {  VIDEO_ASPECT_RATIO_160_99,   161  },
+  {  VIDEO_ASPECT_RATIO_3_2,      150  },
+  {  VIDEO_ASPECT_RATIO_2_1,      200  }
+};
+
+const cFemonH264::t_SAR cFemonH264::s_SAR[] =
+{
+  { 0,   0  }, // VIDEO_ASPECT_RATIO_INVALID
+  { 1,   1  }, // VIDEO_ASPECT_RATIO_1_1
+  { 12,  11 }, // VIDEO_ASPECT_RATIO_12_11
+  { 10,  11 }, // VIDEO_ASPECT_RATIO_10_11
+  { 16,  11 }, // VIDEO_ASPECT_RATIO_16_11
+  { 40,  33 }, // VIDEO_ASPECT_RATIO_40_33
+  { 24,  11 }, // VIDEO_ASPECT_RATIO_24_11
+  { 20,  11 }, // VIDEO_ASPECT_RATIO_20_11
+  { 32,  11 }, // VIDEO_ASPECT_RATIO_32_11
+  { 80,  33 }, // VIDEO_ASPECT_RATIO_80_33
+  { 18,  11 }, // VIDEO_ASPECT_RATIO_18_11
+  { 15,  11 }, // VIDEO_ASPECT_RATIO_15_11
+  { 64,  33 }, // VIDEO_ASPECT_RATIO_64_33
+  { 160, 99 }, // VIDEO_ASPECT_RATIO_160_99
+  { 4,   3  }, // VIDEO_ASPECT_RATIO_4_3
+  { 3,   2  }, // VIDEO_ASPECT_RATIO_3_2
+  { 2,   1  }  // VIDEO_ASPECT_RATIO_2_1
+};
+
+const eVideoFormat cFemonH264::s_VideoFormats[] =
+{
+  VIDEO_FORMAT_COMPONENT,
+  VIDEO_FORMAT_PAL,
+  VIDEO_FORMAT_NTSC,
+  VIDEO_FORMAT_SECAM,
+  VIDEO_FORMAT_MAC,
+  VIDEO_FORMAT_UNKNOWN,
+  VIDEO_FORMAT_RESERVED
+};
+
+const uint8_t cFemonH264::s_SeiNumClockTsTable[9] =
+{
+  1, 1, 1, 2, 2, 3, 3, 2, 3
+};
+
+cFemonH264::cFemonH264(cFemonVideoIf *videohandler)
+: m_VideoHandler(videohandler),
+  m_Width(0),
+  m_Height(0),
+  m_AspectRatio(VIDEO_ASPECT_RATIO_INVALID),
+  m_Format(VIDEO_FORMAT_INVALID),
+  m_FrameRate(0),
+  m_BitRate(0),
+  m_Scan(VIDEO_SCAN_INVALID),
+  m_CpbDpbDelaysPresentFlag(false),
+  m_PicStructPresentFlag(false),
+  m_FrameMbsOnlyFlag(false),
+  m_MbAdaptiveFrameFieldFlag(false),
+  m_TimeOffsetLength(0)
+{
+  reset();
+}
+
+cFemonH264::~cFemonH264()
+{
+}
+
+bool cFemonH264::processVideo(const uint8_t *buf, int len)
+{
+  uint8_t nal_data[len];
+  bool aud_found = false, sps_found = false, sei_found = true; // SEI temporarily disabled!
+  const uint8_t *start = buf;
+  const uint8_t *end = start + len;
+
+  if (!m_VideoHandler)
+     return false;
+
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  buf += PesPayloadOffset(buf);
+  start = buf;
+
+  reset();
+
+  for (;;) {
+      int consumed = 0;
+
+      buf = nextStartCode(buf, end);
+      if (buf >= end)
+         break;
+
+      switch (buf[3] & 0x1F) {
+        case NAL_AUD:
+             if (!aud_found) {
+                 switch (buf[4] >> 5) {
+                   case 0: case 3: case 5: // I_FRAME
+                       //debug("H.264: Found NAL AUD at offset %d/%d\n", int(buf - start), len);
+                       aud_found = true;
+                       break;
+                   case 1: case 4: case 6: // P_FRAME;
+                   case 2: case 7:         // B_FRAME;
+                   default:                // NO_PICTURE;
+                        break;
+                   }
+             }
+             break;
+
+        case NAL_SPS:
+             if (!sps_found) {
+               //debug("H.264: Found NAL SPS at offset %d/%d\n", int(buf - start), len);
+               int nal_len = nalUnescape(nal_data, buf + 4, int(end - buf - 4));
+               consumed = parseSPS(nal_data, nal_len);
+               if (consumed > 0)
+                  sps_found = true;
+             }
+             break;
+
+        case NAL_SEI:
+             if (!sei_found) {
+               //debug("H.264: Found NAL SEI at offset %d/%d\n", int(buf - start), len);
+               int nal_len = nalUnescape(nal_data, buf + 4, int(end - buf - 4));
+               consumed = parseSEI(nal_data, nal_len);
+               if (consumed > 0)
+                  sei_found = true;
+             }
+             break;
+
+        default:
+             break;
+        }
+
+      if (aud_found && sps_found && sei_found)
+         break;
+
+      buf += consumed + 4;
+      }
+
+  if (aud_found) {
+     m_VideoHandler->SetVideoCodec(VIDEO_CODEC_H264);
+     if (sps_found) {
+        //debug("H.264 SPS: size %dx%d, aspect %d format %d framerate %.2f bitrate %.0f\n", m_Width, m_Height, m_AspectRatio, m_Format, m_FrameRate, m_BitRate);
+        m_VideoHandler->SetVideoFormat(m_Format);
+        m_VideoHandler->SetVideoSize(m_Width, m_Height);
+        m_VideoHandler->SetVideoAspectRatio(m_AspectRatio);
+        m_VideoHandler->SetVideoFramerate(m_FrameRate);
+        m_VideoHandler->SetVideoBitrate(m_BitRate);
+        }
+     if (sei_found) {
+        //debug("H.264 SEI: scan %d\n", m_Scan);
+        m_VideoHandler->SetVideoScan(m_Scan);
+        }
+  }
+
+  return aud_found;
+}
+
+void cFemonH264::reset()
+{
+  m_CpbDpbDelaysPresentFlag = false;
+  m_PicStructPresentFlag = false;
+  m_FrameMbsOnlyFlag = false;
+  m_MbAdaptiveFrameFieldFlag = false;
+  m_TimeOffsetLength = 0;
+}
+
+const uint8_t *cFemonH264::nextStartCode(const uint8_t *start, const uint8_t *end)
+{
+  for (end -= 3; start < end; ++start) {
+      if ((start[0] == 0x00) && (start[1] == 0x00) && (start[2] == 0x01))
+         return start;
+      }
+  return (end + 3);
+}
+
+int cFemonH264::nalUnescape(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;
+}
+
+int cFemonH264::parseSPS(const uint8_t *buf, int len)
+{
+  int profile_idc, level_idc, constraint_set3_flag, pic_order_cnt_type, i, j;
+  cBitStream bs(buf, len);
+
+  uint32_t width = m_Width;
+  uint32_t height = m_Height;
+  eVideoAspectRatio aspect_ratio = m_AspectRatio;
+  eVideoFormat format = m_Format;
+  double frame_rate = m_FrameRate;
+  double bit_rate = m_BitRate;
+  bool cpb_dpb_delays_present_flag = m_CpbDpbDelaysPresentFlag;
+  bool pic_struct_present_flag = m_PicStructPresentFlag;
+  bool frame_mbs_only_flag = m_FrameMbsOnlyFlag;
+  bool mb_adaptive_frame_field_flag = m_MbAdaptiveFrameFieldFlag;
+  uint32_t time_offset_length = m_TimeOffsetLength;
+
+  profile_idc = bs.getU8();                 // profile_idc
+  bs.skipBit();                             // constraint_set0_flag
+  bs.skipBit();                             // constraint_set1_flag
+  bs.skipBit();                             // constraint_set2_flag
+  constraint_set3_flag = bs.getBit();       // constraint_set3_flag
+  bs.skipBits(4);                           // reserved_zero_4bits
+  level_idc = bs.getU8();                   // level_idc
+  bs.skipUeGolomb();                        // seq_parameter_set_id
+  //debug("H.264 SPS: profile_idc %d level_idc %d\n", profile_idc, level_idc);
+  switch (profile_idc) {
+    case 66:                                // baseline profile
+    case 77:                                // main profile
+    case 88:                                // extended profile
+         switch (level_idc) {
+           case 10:                         // level 1.0
+                bit_rate = 64000;
+                break;
+           case 11:                         // level 1b / 1.1
+                bit_rate = constraint_set3_flag ? 128000 : 192000;
+                break;
+           case 12:                         // level 1.2
+                bit_rate = 384000;
+                break;
+           case 13:                         // level 1.3
+                bit_rate = 768000;
+                break;
+           case 20:                         // level 2.0
+                bit_rate = 2000000;
+                break;
+           case 21:                         // level 2.1
+                bit_rate = 4000000;
+                break;
+           case 22:                         // level 2.2
+                bit_rate = 4000000;
+                break;
+           case 30:                         // level 3.0
+                bit_rate = 10000000;
+                break;
+           case 31:                         // level 3.1
+                bit_rate = 14000000;
+                break;
+           case 32:                         // level 3.2
+                bit_rate = 20000000;
+                break;
+           case 40:                         // level 4.0
+                bit_rate = 20000000;
+                break;
+           case 41:                         // level 4.1
+                bit_rate = 50000000;
+                break;
+           case 42:                         // level 4.2
+                bit_rate = 50000000;
+                break;
+           case 50:                         // level 5.0
+                bit_rate = 135000000;
+                break;
+           case 51:                         // level 5.1
+                bit_rate = 240000000;
+                break;
+           default:
+                break;
+         }
+         break;
+    case 100:                               // high profile
+         switch (level_idc) {
+           case 10:                         // level 1.0
+                bit_rate = 80000;
+                break;
+           case 11:                         // level 1b / 1.1
+                bit_rate = constraint_set3_flag ? 160000 : 240000;
+                break;
+           case 12:                         // level 1.2
+                bit_rate = 480000;
+                break;
+           case 13:                         // level 1.3
+                bit_rate = 960000;
+                break;
+           case 20:                         // level 2.0
+                bit_rate = 2500000;
+                break;
+           case 21:                         // level 2.1
+                bit_rate = 5000000;
+                break;
+           case 22:                         // level 2.2
+                bit_rate = 5000000;
+                break;
+           case 30:                         // level 3.0
+                bit_rate = 12500000;
+                break;
+           case 31:                         // level 3.1
+                bit_rate = 17500000;
+                break;
+           case 32:                         // level 3.2
+                bit_rate = 25000000;
+                break;
+           case 40:                         // level 4.0
+                bit_rate = 25000000;
+                break;
+           case 41:                         // level 4.1
+                bit_rate = 62500000;
+                break;
+           case 42:                         // level 4.2
+                bit_rate = 62500000;
+                break;
+           case 50:                         // level 5.0
+                bit_rate = 168750000;
+                break;
+           case 51:                         // level 5.1
+                bit_rate = 300000000;
+                break;
+           default:
+                break;
+         }
+         break;
+    case 110:                               // high 10 profile
+         switch (level_idc) {
+           case 10:                         // level 1.0
+                bit_rate = 192000;
+                break;
+           case 11:                         // level 1b / 1.1
+                bit_rate = constraint_set3_flag ? 384000 : 576000;
+                break;
+           case 12:                         // level 1.2
+                bit_rate = 115200;
+                break;
+           case 13:                         // level 1.3
+                bit_rate = 2304000;
+                break;
+           case 20:                         // level 2.0
+                bit_rate = 6000000;
+                break;
+           case 21:                         // level 2.1
+                bit_rate = 12000000;
+                break;
+           case 22:                         // level 2.2
+                bit_rate = 12000000;
+                break;
+           case 30:                         // level 3.0
+                bit_rate = 30000000;
+                break;
+           case 31:                         // level 3.1
+                bit_rate = 42000000;
+                break;
+           case 32:                         // level 3.2
+                bit_rate = 60000000;
+                break;
+           case 40:                         // level 4.0
+                bit_rate = 60000000;
+                break;
+           case 41:                         // level 4.1
+                bit_rate = 150000000;
+                break;
+           case 42:                         // level 4.2
+                bit_rate = 150000000;
+                break;
+           case 50:                         // level 5.0
+                bit_rate = 405000000;
+                break;
+           case 51:                         // level 5.1
+                bit_rate = 720000000;
+                break;
+           default:
+                break;
+         }
+         break;
+    case 122:                               // high 4:2:2 profile
+    case 144:                               // high 4:4:4 profile
+         switch (level_idc) {
+           case 10:                         // level 1.0
+                bit_rate = 256000;
+                break;
+           case 11:                         // level 1b / 1.1
+                bit_rate = constraint_set3_flag ? 512000 : 768000;
+                break;
+           case 12:                         // level 1.2
+                bit_rate = 1536000;
+                break;
+           case 13:                         // level 1.3
+                bit_rate = 3072000;
+                break;
+           case 20:                         // level 2.0
+                bit_rate = 8000000;
+                break;
+           case 21:                         // level 2.1
+                bit_rate = 16000000;
+                break;
+           case 22:                         // level 2.2
+                bit_rate = 16000000;
+                break;
+           case 30:                         // level 3.0
+                bit_rate = 40000000;
+                break;
+           case 31:                         // level 3.1
+                bit_rate = 56000000;
+                break;
+           case 32:                         // level 3.2
+                bit_rate = 80000000;
+                break;
+           case 40:                         // level 4.0
+                bit_rate = 80000000;
+                break;
+           case 41:                         // level 4.1
+                bit_rate = 200000000;
+                break;
+           case 42:                         // level 4.2
+                bit_rate = 200000000;
+                break;
+           case 50:                         // level 5.0
+                bit_rate = 540000000;
+                break;
+           case 51:                         // level 5.1
+                bit_rate = 960000000;
+                break;
+           default:
+                break;
+         }
+         break;
+    default:
+         break;
+  }
+  if ((profile_idc == 100) || (profile_idc == 110) || (profile_idc == 122) || (profile_idc == 144)) {
+     if (bs.getUeGolomb() == 3)             // chroma_format_idc
+        bs.skipBit();                       // residual_colour_transform_flag
+     bs.skipUeGolomb();                     // bit_depth_luma_minus8
+     bs.skipUeGolomb();                     // bit_depth_chroma_minus8
+     bs.skipBit();                          // qpprime_y_zero_transform_bypass_flag
+     if (bs.getBit()) {                     // seq_scaling_matrix_present_flag
+        for (i = 0; i < 8; ++i) {
+            if (bs.getBit()) {              // seq_scaling_list_present_flag[i]
+               int last = 8, next = 8, size = (i < 6) ? 16 : 64;
+               for (j = 0; j < size; ++j) {
+                   if (next)
+                      next = (last + bs.getSeGolomb()) & 0xff;
+                   last = next ?: last;
+                   }
+               }
+            }
+        }
+     }
+  bs.skipUeGolomb();                        // log2_max_frame_num_minus4
+  pic_order_cnt_type = bs.getUeGolomb();    // pic_order_cnt_type
+  if (pic_order_cnt_type == 0)
+     bs.skipUeGolomb();                     // log2_max_pic_order_cnt_lsb_minus4
+  else if (pic_order_cnt_type == 1) {
+     bs.skipBit();                          // delta_pic_order_always_zero
+     bs.skipSeGolomb();                     // offset_for_non_ref_pic
+     bs.skipSeGolomb();                     // offset_for_top_to_bottom_field
+     j = bs.getUeGolomb();                  // num_ref_frames_in_pic_order_cnt_cycle
+     for (i = 0; i < j; ++i)
+         bs.skipSeGolomb();                 // offset_for_ref_frame[i]
+     }
+  bs.skipUeGolomb();                        // num_ref_frames
+  bs.skipBit();                             // gaps_in_frame_num_value_allowed_flag
+  width  = bs.getUeGolomb() + 1;            // pic_width_in_mbs_minus1
+  height = bs.getUeGolomb() + 1;            // pic_height_in_mbs_minus1
+  frame_mbs_only_flag = bs.getBit();        // frame_mbs_only_flag
+  //debug("H.264 SPS: pic_width:  %u mbs\n", width);
+  //debug("H.264 SPS: pic_height: %u mbs\n", height);
+  //debug("H.264 SPS: frame only flag: %d\n", frame_mbs_only_flag);
+  width  *= 16;
+  height *= 16 * (frame_mbs_only_flag ? 1 : 2);
+  if (!frame_mbs_only_flag)
+     mb_adaptive_frame_field_flag = bs.getBit(); // mb_adaptive_frame_field_flag
+  bs.skipBit();                             // direct_8x8_inference_flag
+  if (bs.getBit()) {                        // frame_cropping_flag
+     uint32_t crop_left, crop_right, crop_top, crop_bottom;
+     crop_left   = bs.getUeGolomb();        // frame_crop_left_offset
+     crop_right  = bs.getUeGolomb();        // frame_crop_rigth_offset
+     crop_top    = bs.getUeGolomb();        // frame_crop_top_offset
+     crop_bottom = bs.getUeGolomb();        // frame_crop_bottom_offset
+     //debug("H.264 SPS: cropping %d %d %d %d\n", crop_left, crop_top, crop_right, crop_bottom);
+     width -= 2 * (crop_left + crop_right);
+     if (frame_mbs_only_flag)
+        height -= 2 * (crop_top + crop_bottom);
+     else
+        height -= 4 * (crop_top + crop_bottom);
+     }
+  // VUI parameters
+  if (bs.getBit()) {                        // vui_parameters_present_flag
+     if (bs.getBit()) {                     // aspect_ratio_info_present
+        uint32_t aspect_ratio_idc, sar_width = 0, sar_height = 0;
+        aspect_ratio_idc = bs.getU8();      // aspect_ratio_idc
+        //debug("H.264 SPS: aspect_ratio_idc %d\n", aspect_ratio_idc);
+        if (aspect_ratio_idc == 255) {      // extended sar
+           sar_width  = bs.getU16();        // sar_width
+           sar_height = bs.getU16();        // sar_height
+           }
+        else if (aspect_ratio_idc < ELEMENTS(s_SAR)) {
+           sar_width  = s_SAR[aspect_ratio_idc].w;
+           sar_height = s_SAR[aspect_ratio_idc].h;
+           }
+        if (sar_width && sar_height) {
+           int index = -1, ratio = int(100.0L * sar_width * width / sar_height / height);
+           for (unsigned int i = 0; i < ELEMENTS(s_DAR); ++i) {
+               if (s_DAR[i].ratio == ratio) {
+                  index = i;
+                  break;
+                  }
+               }
+           if (index < 0) {
+              if (aspect_ratio_idc == 255)
+                 aspect_ratio = VIDEO_ASPECT_RATIO_EXTENDED;
+              else
+                 aspect_ratio = VIDEO_ASPECT_RATIO_INVALID;
+              }
+           else
+              aspect_ratio = s_DAR[index].dar;
+           //debug("H.264 SPS: DAR %dx%d (%d)\n", sar_width, sar_height, aspect_ratio);
+           }
+        }
+     if (bs.getBit())                       // overscan_info_present_flag
+        bs.skipBit();                       // overscan_approriate_flag
+     if (bs.getBit()) {                     // video_signal_type_present_flag
+        uint32_t video_format;
+        video_format = bs.getBits(3);       // video_format
+        if (video_format < sizeof(s_VideoFormats) / sizeof(s_VideoFormats[0])) {
+           format = s_VideoFormats[video_format];
+           //debug("H.264 SPS: video format %d\n", format);
+           }
+        bs.skipBit();                       // video_full_range_flag
+        if (bs.getBit()) {                  // colour_description_present_flag
+           bs.skipBits(8);                  // colour_primaries
+           bs.skipBits(8);                  // transfer_characteristics
+           bs.skipBits(8);                  // matrix_coefficients
+           }
+        }
+     if (bs.getBit()) {                     // chroma_loc_info_present_flag
+        bs.skipUeGolomb();                  // chroma_sample_loc_type_top_field
+        bs.skipUeGolomb();                  // chroma_sample_loc_type_bottom_field
+        }
+     if (bs.getBit()) {                     // timing_info_present_flag
+        uint32_t num_units_in_tick, time_scale;
+        num_units_in_tick = bs.getU32();    // num_units_in_tick
+        time_scale        = bs.getU32();    // time_scale
+        if (num_units_in_tick > 0)
+           frame_rate = time_scale / num_units_in_tick;
+        bs.skipBit();                       // fixed_frame_rate_flag
+        }
+     int nal_hrd_parameters_present_flag = bs.getBit(); // nal_hrd_parameters_present_flag
+     if (nal_hrd_parameters_present_flag) {
+        int cpb_cnt_minus1;
+        cpb_cnt_minus1 = bs.getUeGolomb();  // cpb_cnt_minus1
+        bs.skipBits(4);                     // bit_rate_scale
+        bs.skipBits(4);                     // cpb_size_scale
+        for (int i = 0; i < cpb_cnt_minus1; ++i) {
+            bs.skipUeGolomb();              // bit_rate_value_minus1[i]
+            bs.skipUeGolomb();              // cpb_size_value_minus1[i]
+            bs.skipBit();                   // cbr_flag[i]
+            }
+        bs.skipBits(5);                     // initial_cpb_removal_delay_length_minus1
+        bs.skipBits(5);                     // cpb_removal_delay_length_minus1
+        bs.skipBits(5);                     // dpb_output_delay_length_minus1
+        time_offset_length = bs.getBits(5); // time_offset_length
+        }
+     int vlc_hrd_parameters_present_flag = bs.getBit(); // vlc_hrd_parameters_present_flag
+     if (vlc_hrd_parameters_present_flag) {
+         int cpb_cnt_minus1;
+         cpb_cnt_minus1 = bs.getUeGolomb(); // cpb_cnt_minus1
+         bs.skipBits(4);                    // bit_rate_scale
+         bs.skipBits(4);                    // cpb_size_scale
+         for (int i = 0; i < cpb_cnt_minus1; ++i) {
+             bs.skipUeGolomb();             // bit_rate_value_minus1[i]
+             bs.skipUeGolomb();             // cpb_size_value_minus1[i]
+             bs.skipBit();                  // cbr_flag[i]
+             }
+         bs.skipBits(5);                    // initial_cpb_removal_delay_length_minus1
+         bs.skipBits(5);                    // cpb_removal_delay_length_minus1
+         bs.skipBits(5);                    // dpb_output_delay_length_minus1
+         time_offset_length = bs.getBits(5);// time_offset_length
+        }
+     cpb_dpb_delays_present_flag = (nal_hrd_parameters_present_flag | vlc_hrd_parameters_present_flag);
+     if (cpb_dpb_delays_present_flag)
+        bs.skipBit();                       // low_delay_hrd_flag
+     pic_struct_present_flag = bs.getBit(); // pic_struct_present_flag
+     if (bs.getBit()) {                     // bitstream_restriction_flag
+        bs.skipBit();                       // motion_vectors_over_pic_boundaries_flag
+        bs.skipUeGolomb();                  // max_bytes_per_pic_denom
+        bs.skipUeGolomb();                  // max_bits_per_mb_denom
+        bs.skipUeGolomb();                  // log2_max_mv_length_horizontal
+        bs.skipUeGolomb();                  // log2_max_mv_length_vertical
+        bs.skipUeGolomb();                  // num_reorder_frames
+        bs.skipUeGolomb();                  // max_dec_frame_buffering
+        }
+     }
+
+  m_Width = width;
+  m_Height = height;
+  m_AspectRatio = aspect_ratio;
+  m_Format = format;
+  m_FrameRate = frame_rate;
+  m_BitRate = bit_rate;
+  m_CpbDpbDelaysPresentFlag = cpb_dpb_delays_present_flag;
+  m_PicStructPresentFlag = pic_struct_present_flag;
+  m_FrameMbsOnlyFlag = frame_mbs_only_flag;
+  m_MbAdaptiveFrameFieldFlag = mb_adaptive_frame_field_flag;
+  m_TimeOffsetLength = time_offset_length;
+
+  return (bs.getIndex() / 8);
+}
+
+int cFemonH264::parseSEI(const uint8_t *buf, int len)
+{
+  int num_referenced_subseqs, i;
+  cBitStream bs(buf, len);
+
+  eVideoScan scan = m_Scan;
+
+  while ((bs.getIndex() * 8 + 16) < len) {               // sei_message
+    int lastByte, payloadSize = 0, payloadType = 0;
+
+    do {
+       lastByte = bs.getU8() & 0xFF;
+       payloadType += lastByte;
+    } while (lastByte == 0xFF);                          // last_payload_type_byte
+
+    do {
+       lastByte = bs.getU8() & 0xFF;
+       payloadSize += lastByte;
+    } while (lastByte == 0xFF);                          // last_payload_size_byte
+
+    switch (payloadType) {                               // sei_payload
+      case 1:                                            // pic_timing
+           if (m_CpbDpbDelaysPresentFlag) {              // cpb_dpb_delays_present_flag
+              bs.skipUeGolomb();                         // cpb_removal_delay
+              bs.skipUeGolomb();                         // dpb_output_delay
+              }
+           if (m_PicStructPresentFlag) {                 // pic_struct_present_flag
+              uint32_t pic_struct;
+              pic_struct = bs.getBits(4);                // pic_struct
+              if (pic_struct >= (sizeof(s_SeiNumClockTsTable)) / sizeof(s_SeiNumClockTsTable[0]))
+                 return 0;
+              if (m_FrameMbsOnlyFlag && !m_MbAdaptiveFrameFieldFlag)
+                 scan = VIDEO_SCAN_PROGRESSIVE;
+              else {
+                 switch (pic_struct) {
+                   case 0:                               // frame
+                   case 7:                               // frame doubling
+                   case 8:                               // frame tripling
+                        scan = VIDEO_SCAN_PROGRESSIVE;
+                        break;
+                   case 1:                               // top
+                   case 2:                               // bottom
+                   case 3:                               // top bottom
+                   case 4:                               // bottom top
+                   case 5:                               // top bottom top
+                   case 6:                               // bottom top bottom
+                        scan = VIDEO_SCAN_INTERLACED;
+                        break;
+                   default:
+                        scan = VIDEO_SCAN_RESERVED;
+                        break;
+                   }
+                }
+              //debug("H.264 SEI: pic struct %d scan type %d\n", pic_struct, scan);
+              for (int i = 0; i < s_SeiNumClockTsTable[pic_struct]; ++i) {
+                  if (bs.getBit()) {                     // clock_timestamp_flag[i]
+                     int full_timestamp_flag;
+                     switch (bs.getBits(2)) {            // ct_type
+                       case 0:
+                            scan = VIDEO_SCAN_PROGRESSIVE;
+                            break;
+                       case 1:
+                            scan = VIDEO_SCAN_INTERLACED;
+                            break;
+                       case 2:
+                            scan = VIDEO_SCAN_UNKNOWN;
+                            break;
+                       default:
+                            scan = VIDEO_SCAN_RESERVED;
+                            break;
+                       }
+                     //debug("H.264 SEI: scan type %d\n", scan);
+                     bs.skipBit();                       // nuit_field_based_flag
+                     bs.skipBits(5);                     // counting_type
+                     full_timestamp_flag = bs.getBit();  // full_timestamp_flag
+                     bs.skipBit();                       // discontinuity_flag
+                     bs.skipBit();                       // cnt_dropped_flag
+                     bs.skipBits(8);                     // n_frames
+                     if (full_timestamp_flag) {
+                        bs.skipBits(6);                  // seconds_value
+                        bs.skipBits(6);                  // minutes_value
+                        bs.skipBits(5);                  // hours_value
+                        }
+                     else {
+                        if (bs.getBit()) {               // seconds_flag
+                           bs.skipBits(6);               // seconds_value
+                           if (bs.getBit()) {            // minutes_flag
+                              bs.skipBits(6);            // minutes_value
+                              if (bs.getBit())           // hours_flag
+                                  bs.skipBits(5);        // hours_value
+                              }
+                           }
+                        }
+                     if (m_TimeOffsetLength > 0)
+                        bs.skipBits(m_TimeOffsetLength); // time_offset
+                     }
+                  }
+              }
+           break;
+
+      case 12:                                           // sub_seq_characteristics
+           bs.skipUeGolomb();                            // sub_seq_layer_num
+           bs.skipUeGolomb();                            // sub_seq_id
+           if (bs.getBit())                              // duration_flag
+              bs.skipBits(32);                           // sub_seq_duration
+           if (bs.getBit()) {                            // average_rate_flag
+              bs.skipBit();                              // accurate_statistics_flag
+              bs.skipBits(16);                           // average_bit_rate (1000 bit/s)
+              bs.skipBits(16);                           // average_frame_rate (frames per 256s)
+              }
+           num_referenced_subseqs = bs.getUeGolomb();    // num_referenced_subseqs
+           for (i = 0; i < num_referenced_subseqs; ++i) {
+               bs.skipUeGolomb();                        // ref_sub_seq_layer_num
+               bs.skipUeGolomb();                        // ref_sub_seq_id
+               bs.getBit();                              // ref_sub_seq_direction
+               }
+           break;
+
+      default:
+           bs.skipBits(payloadSize * 8);
+           break;
+      }
+
+    // force byte align
+    bs.byteAlign();
+    }
+
+  m_Scan = scan;
+
+  return (bs.getIndex() / 8);
+}
--- a/femonh264.h
+++ b/femonh264.h
@@ -0,0 +1,64 @@
+/*
+ * 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"
+
+class cFemonH264 {
+private:
+  enum {
+    NAL_SEI     = 0x06, // Supplemental Enhancement Information
+    NAL_SPS     = 0x07, // Sequence Parameter Set
+    NAL_AUD     = 0x09, // Access Unit Delimiter
+    NAL_END_SEQ = 0x0A  // End of Sequence
+  };
+
+  typedef struct DAR {
+    eVideoAspectRatio dar;
+    int               ratio;
+  } t_DAR;
+
+  typedef struct SAR {
+    int               w;
+    int               h;
+  } t_SAR;
+
+  cFemonVideoIf    *m_VideoHandler;
+  uint32_t          m_Width;
+  uint32_t          m_Height;
+  eVideoAspectRatio m_AspectRatio;
+  eVideoFormat      m_Format;
+  double            m_FrameRate;
+  double            m_BitRate;
+  eVideoScan        m_Scan;
+  bool              m_CpbDpbDelaysPresentFlag;
+  bool              m_PicStructPresentFlag;
+  bool              m_FrameMbsOnlyFlag;
+  bool              m_MbAdaptiveFrameFieldFlag;
+  uint32_t          m_TimeOffsetLength;
+
+  void           reset();
+  const uint8_t *nextStartCode(const uint8_t *start, const uint8_t *end);
+  int            nalUnescape(uint8_t *dst, const uint8_t *src, int len);
+  int            parseSPS(const uint8_t *buf, int len);
+  int            parseSEI(const uint8_t *buf, int len);
+
+  static const t_SAR             s_SAR[];
+  static const t_DAR             s_DAR[];
+  static const eVideoFormat      s_VideoFormats[];
+  static const uint8_t           s_SeiNumClockTsTable[9];
+
+public:
+  cFemonH264(cFemonVideoIf *videohandler);
+  virtual ~cFemonH264();
+
+  bool processVideo(const uint8_t *buf, int len);
+  };
+
+#endif //__FEMONH264_H
--- a/femonlatm.c
+++ b/femonlatm.c
@@ -0,0 +1,112 @@
+/*
+ * 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 "femonlatm.h"
+
+unsigned int cFemonLATM::s_Bitrates[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
+};
+
+unsigned int cFemonLATM::s_Samplerates[4] =
+{
+  22050, 24000, 16000, -1
+};
+
+cFemonLATM::cFemonLATM(cFemonAudioIf *audiohandler)
+: m_AudioHandler(audiohandler)
+{
+}
+
+cFemonLATM::~cFemonLATM()
+{
+}
+
+bool cFemonLATM::processAudio(const uint8_t *buf, int len)
+{
+  cBitStream bs(buf, len * 8);
+
+  if (!m_AudioHandler)
+     return false;
+
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.skipBits(8 * PesPayloadOffset(buf));
+
+  // MPEG audio detection
+  if (bs.getBits(12) != 0x56E)              // syncword
+     return false;
+
+  m_AudioHandler->SetAudioCodec(AUDIO_CODEC_LATM);
+
+  if (bs.getBit() == 0)                     // id: MPEG-1=1, extension to lower sampling frequencies=0
+     return true;                           // @todo: lower sampling frequencies support
+  int layer = 3 - bs.getBits(2);            // layer: I=11, II=10, III=01
+  bs.skipBit();                             // protection bit
+  int bit_rate_index = bs.getBits(4);       // bitrate index
+  int sampling_frequency = bs.getBits(2);   // sampling frequency
+  bs.skipBit();                             // padding bit
+  bs.skipBit();                             // private pid
+  int mode = bs.getBits(2);                 // mode
+
+  switch (mode) {
+    case 0:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
+         break;
+
+    case 1:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
+         break;
+
+    case 2:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
+         break;
+
+    case 3:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
+         break;
+  }
+
+  if (layer == 3) {
+      m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
+  }
+  else {
+     switch (bit_rate_index) {
+       case 0:
+            m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
+            break;
+
+       case 0xF:
+            m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
+            break;
+
+       default:
+            m_AudioHandler->SetAudioBitrate(1000 * s_Bitrates[layer][bit_rate_index]);
+            break;
+     }
+  }
+
+  switch (sampling_frequency) {
+    case 3:
+         m_AudioHandler->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioSamplingFrequency(s_Samplerates[sampling_frequency]);
+         break;
+  }
+
+  return true;
+}
--- a/femonlatm.h
+++ b/femonlatm.h
@@ -0,0 +1,27 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONLATM_H
+#define __FEMONLATM_H
+
+#include "femonaudio.h"
+
+class cFemonLATM {
+private:
+  cFemonAudioIf *m_AudioHandler;
+
+  static unsigned int s_Bitrates[3][16];
+  static unsigned int s_Samplerates[4];
+
+public:
+  cFemonLATM(cFemonAudioIf *audiohandler);
+  virtual ~cFemonLATM();
+
+  bool processAudio(const uint8_t *buf, int len);
+  };
+
+#endif //__FEMONLATM_H
--- a/femonmpeg.c
+++ b/femonmpeg.c
@@ -0,0 +1,286 @@
+/*
+ * 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_EXTENSION_START(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == 0xB5))
+
+unsigned int cFemonMPEG::s_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
+  }
+};
+
+unsigned int cFemonMPEG::s_Samplerates[2][4] =
+{
+  {22050, 24000, 16000, -1}, // MPEG-2
+  {44100, 48000, 32000, -1}  // MPEG-1
+};
+
+eAudioCodec cFemonMPEG::s_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
+};
+
+cFemonMPEG::cFemonMPEG(cFemonVideoIf *videohandler, cFemonAudioIf *audiohandler)
+: m_VideoHandler(videohandler),
+  m_AudioHandler(audiohandler)
+{
+}
+
+cFemonMPEG::~cFemonMPEG()
+{
+}
+
+bool cFemonMPEG::processAudio(const uint8_t *buf, int len)
+{
+  cBitStream bs(buf, len * 8);
+
+  if (!m_AudioHandler)
+     return false;
+
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.skipBits(8 * PesPayloadOffset(buf));
+
+  // MPEG audio detection
+  if (bs.getBits(12) != 0xFFF)              // syncword
+     return false;
+
+  int id = bs.getBit();                     // id: MPEG-2=0, MPEG-1=1
+  int layer = 3 - bs.getBits(2);            // layer: I=11, II=10, III=01
+  bs.skipBit();                             // protection bit
+  int bit_rate_index = bs.getBits(4);       // bitrate index
+  int sampling_frequency = bs.getBits(2);   // sampling frequency
+  bs.skipBit();                             // padding bit
+  bs.skipBit();                             // private pid
+  int mode = bs.getBits(2);                 // mode
+
+  m_AudioHandler->SetAudioCodec(s_Formats[id][layer]);
+
+  switch (mode) {
+    case 0:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
+         break;
+
+    case 1:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
+         break;
+
+    case 2:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
+         break;
+
+    case 3:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
+         break;
+  }
+
+  switch (bit_rate_index) {
+    case 0:
+         m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
+         break;
+
+    case 0xF:
+         m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioBitrate(1000 * s_Bitrates[id][layer][bit_rate_index]);
+         break;
+  }
+
+  switch (sampling_frequency) {
+    case 3:
+         m_AudioHandler->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioSamplingFrequency(s_Samplerates[id][sampling_frequency]);
+         break;
+  }
+
+  return true;
+}
+
+bool cFemonMPEG::processVideo(const uint8_t *buf, int len)
+{
+  cBitStream bs(buf, len * 8);
+
+  if (!m_VideoHandler)
+     return false;
+
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.skipBits(8 * PesPayloadOffset(buf));
+
+  // MPEG-2 video detection, search for start code
+  if (bs.getU32() != 0x000001B3)            // sequence header
+     return false;
+
+  int scan = VIDEO_SCAN_UNKNOWN;
+  int format = VIDEO_FORMAT_UNKNOWN;
+  int aspect = VIDEO_ASPECT_RATIO_RESERVED;
+
+  int horizontal_size = bs.getBits(12);     // horizontal size value
+  int vertical_size = bs.getBits(12);       // vertical size value
+
+  switch (bs.getBits(4)) {                  // aspect ratio information
+    case 1:
+         aspect = VIDEO_ASPECT_RATIO_1_1;
+         break;
+
+    case 2:
+         aspect = VIDEO_ASPECT_RATIO_4_3;
+         break;
+
+    case 3:
+         aspect = VIDEO_ASPECT_RATIO_16_9;
+         break;
+
+    case 4:
+         aspect = VIDEO_ASPECT_RATIO_2_21_1;
+         break;
+
+    case 5 ... 15:
+    default:
+         aspect = VIDEO_ASPECT_RATIO_RESERVED;
+         break;
+    }
+
+  double frame_rate = 0;
+  switch (bs.getBits(4)) {                  // frame rate code
+    case 1:
+         frame_rate = 24000 / 1001.0;
+         format = VIDEO_FORMAT_UNKNOWN;
+         break;
+
+    case 2:
+         frame_rate = 24.0;
+         format = VIDEO_FORMAT_UNKNOWN;
+         break;
+
+    case 3:
+         frame_rate = 25.0;
+         format = VIDEO_FORMAT_PAL;
+         break;
+
+    case 4:
+         frame_rate = 30000 / 1001.0;
+         format = VIDEO_FORMAT_NTSC;
+         break;
+
+    case 5:
+         frame_rate = 30.0;
+         format = VIDEO_FORMAT_NTSC;
+         break;
+
+    case 6:
+         frame_rate = 50.0;
+         format = VIDEO_FORMAT_PAL;
+         break;
+
+    case 7:
+         frame_rate = 60.0;
+         format = VIDEO_FORMAT_NTSC;
+         break;
+
+    case 8:
+         frame_rate = 60000 / 1001.0;
+         format = VIDEO_FORMAT_NTSC;
+         break;
+
+    case 9 ... 15:
+    default:
+         frame_rate = 0;
+         format = VIDEO_FORMAT_UNKNOWN;
+         break;
+    }
+
+  int bit_rate = bs.getBits(18);            // bit rate value
+
+  bs.skipBit();             // marker bit
+  bs.skipBits(10);          // vbv buffer size value
+  bs.skipBit();             // constrained parameters value
+  if (bs.getBit())          // load intra quantizer matrix
+     bs.skipBits(8 * 64);   // intra quantizer matrix
+  if (bs.getBit())          // load non-intra quantizer matrix
+     bs.skipBits(8 * 64);   // non-intra quantizer matrix
+
+  if (bs.getU32() != 0x000001B5) {                  // extension start
+     bs.skipBits(4);                                // extension start code identifier
+     bs.skipBits(8);                                // profile and level indicator
+     scan = bs.getBit() ? VIDEO_SCAN_PROGRESSIVE :
+                          VIDEO_SCAN_INTERLACED;    // progressive sequence
+     bs.skipBits(2);                                // chroma format
+     horizontal_size |= (bs.getBits(2) << 12);      // horizontal size extension
+     vertical_size |= (bs.getBits(2) << 12);        // vertical size extension
+     bit_rate |= (bs.getBits(12) << 18);            // bit rate extension
+     bs.skipBit();                                  // marker bit
+     bs.skipBits(8);                                // vpv buffer size extension
+     bs.skipBit();                                  // low delay
+     bs.skipBits(2);                                // frame rate extension n
+     bs.skipBits(5);                                // frame rate extension d
+
+     if ((bs.getU32() != 0x000001B5) &&             // extension start code
+         (bs.getBits(4) == 0x0010)) {               // sequence display extension id
+        switch (bs.getBits(3)) {                    // video format
+          case 0x000:
+               format = VIDEO_FORMAT_COMPONENT;
+               break;
+          case 0x001:
+               format = VIDEO_FORMAT_PAL;
+               break;
+          case 0x010:
+               format = VIDEO_FORMAT_NTSC;
+               break;
+          case 0x011:
+               format = VIDEO_FORMAT_SECAM;
+               break;
+          case 0x100:
+               format = VIDEO_FORMAT_MAC;
+               break;
+          case 0x101:
+               format = VIDEO_FORMAT_UNKNOWN;
+               break;
+          case 0x110:
+          case 0x111:
+               format = VIDEO_FORMAT_RESERVED;
+               break;
+          default:
+               format = VIDEO_FORMAT_INVALID;
+               break;
+          }
+        }
+     }
+
+  m_VideoHandler->SetVideoCodec(VIDEO_CODEC_MPEG2);
+  m_VideoHandler->SetVideoSize(horizontal_size, vertical_size);
+  m_VideoHandler->SetVideoBitrate(400.0 * (double)(bit_rate));
+  m_VideoHandler->SetVideoFramerate(frame_rate);
+  m_VideoHandler->SetVideoScan(eVideoScan(scan));
+  m_VideoHandler->SetVideoAspectRatio(eVideoAspectRatio(aspect));
+  m_VideoHandler->SetVideoFormat(eVideoFormat(format));
+
+  return true;
+}
--- a/femonmpeg.h
+++ b/femonmpeg.h
@@ -0,0 +1,31 @@
+/*
+ * 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 "femonvideo.h"
+#include "femonaudio.h"
+
+class cFemonMPEG {
+private:
+  cFemonVideoIf *m_VideoHandler;
+  cFemonAudioIf *m_AudioHandler;
+
+  static unsigned int s_Bitrates[2][3][16];
+  static unsigned int s_Samplerates[2][4];
+  static eAudioCodec  s_Formats[2][4];
+
+public:
+  cFemonMPEG(cFemonVideoIf *videohandler, cFemonAudioIf *audiohandler);
+  virtual ~cFemonMPEG();
+
+  bool processVideo(const uint8_t *buf, int len);
+  bool processAudio(const uint8_t *buf, int len);
+  };
+
+#endif //__FEMONMPEG_H
--- a/femonosd.c
+++ b/femonosd.c
--- 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,37 +20,43 @@
 #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;
-  int m_Frontend;
-  int m_SvdrpFrontend;
-  double m_SvdrpVideoBitrate;
-  double m_SvdrpAudioBitrate;
+
+  cOsd             *m_Osd;
+  cFemonReceiver   *m_Receiver;
+  int               m_Frontend;
+  int               m_SvdrpFrontend;
+  double            m_SvdrpVideoBitrate;
+  double            m_SvdrpAudioBitrate;
  SvdrpConnection_v1_0 m_SvdrpConnection;
-  cPlugin *m_SvdrpPlugin;
-  struct dvb_frontend_info m_FrontendInfo;
-  int m_Number;
-  int m_OldNumber;
-  uint16_t m_SNR;
-  uint16_t m_Signal;
-  uint32_t m_BER;
-  uint32_t m_UNC;
-  fe_status_t m_FrontendStatus;
-  int m_DisplayMode;
-  const cFont *m_Font;
-  cTimeMs m_InputTime;
-  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;
+  cPlugin          *m_SvdrpPlugin;
+  int               m_Number;
+  int               m_OldNumber;
+  uint16_t          m_SNR;
+  bool              m_SNRValid;
+  uint16_t          m_Signal;
+  bool              m_SignalValid;
+  uint32_t          m_BER;
+  bool              m_BERValid;
+  uint32_t          m_UNC;
+  bool              m_UNCValid;
+  fe_status_t       m_FrontendStatus;
+  bool              m_FrontendStatusValid;
+  dvb_frontend_info m_FrontendInfo;
+  int               m_DisplayMode;
+  int               m_OsdWidth;
+  int               m_OsdHeight;
+  int               m_OsdLeft;
+  int               m_OsdTop;
+  cFont            *m_Font;
+  cTimeMs           m_InputTime;
+  cCondWait         m_Sleep;
+  cMutex            m_Mutex;
+
  void DrawStatusWindow(void);
  void DrawInfoWindow(void);
  bool SvdrpConnect(void);
@@ -72,10 +77,10 @@ public:
  virtual void Show(void);
  virtual eOSState ProcessKey(eKeys Key);

-  bool DeviceSwitch(int direction);
-  double GetVideoBitrate(void);
-  double GetAudioBitrate(void);
-  double GetDolbyBitrate(void);
+  bool    DeviceSwitch(int direction);
+  double  GetVideoBitrate(void);
+  double  GetAudioBitrate(void);
+  double  GetDolbyBitrate(void);
 };

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

 #include <unistd.h>
@@ -11,361 +10,239 @@
 #include "femoncfg.h"
 #include "femonreceiver.h"

-#define TS_SIZE       188
-#define PAY_START     0x40
-#define ADAPT_FIELD   0x20
-#define PAYLOAD       0x10
-#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
+cFemonReceiver::cFemonReceiver(int Vtype, int Vpid, int Apid, int Dpid)
+: cThread("femon receiver"),
+  m_Mutex(),
+  m_Sleep(),
+  m_Active(false),
+  m_DetectH264(this),
+  m_DetectMPEG(this, this),
+  m_DetectAAC(this),
+  m_DetectLATM(this),
+  m_DetectAC3(this),
+  m_VideoBuffer(KILOBYTE(512), TS_SIZE, false, "Femon video"),
+  m_VideoType(Vtype),
+  m_VideoPid(Vpid),
+  m_VideoPacketCount(0),
+  m_VideoBitrate(0.0),
+  m_VideoValid(false),
+  m_AudioBuffer(KILOBYTE(256), TS_SIZE, false, "Femon audio"),
+  m_AudioPid(Apid),
+  m_AudioPacketCount(0),
+  m_AudioBitrate(0.0),
+  m_AudioValid(false),
+  m_AC3Buffer(KILOBYTE(256), TS_SIZE, false, "Femon AC3"),
+  m_AC3Pid(Dpid),
+  m_AC3PacketCount(0),
+  m_AC3Bitrate(0),
+  m_AC3Valid(false)
 {
-  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;
+  debug("%s()\n", __PRETTY_FUNCTION__);
+
+  AddPid(m_VideoPid);
+  AddPid(m_AudioPid);
+  AddPid(m_AC3Pid);
+
+  m_VideoBuffer.SetTimeouts(0, 100);
+  m_AudioBuffer.SetTimeouts(0, 100);
+  m_AC3Buffer.SetTimeouts(0, 100);
+
+  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;
+  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;
+  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;
 }

 cFemonReceiver::~cFemonReceiver(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  if (Running())
-     Cancel(3);
-  Detach();
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  Deactivate();
 }

-/* The following function originates from libdvbmpeg: */
-void cFemonReceiver::GetVideoInfo(uint8_t *mbuf, int count)
+void cFemonReceiver::Deactivate(void)
 {
-  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++;
-    }
-  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] =
-{
-  {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++;
-    }	
-  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] =
-{
-  {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++;
-    }
-  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);
-           }
-        }
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  if (m_Active) {
+     m_Active = false;
+     m_Sleep.Signal();
+     if (Running())
+        Cancel(3);
+     Detach();
     }
 }

 void cFemonReceiver::Activate(bool On)
 {
-  Dprintf("%s(%d)\n", __PRETTY_FUNCTION__, On);
+  debug("%s(%d)\n", __PRETTY_FUNCTION__, On);
  if (On)
     Start();
  else
-     Cancel();
+     Deactivate();
 }

 void cFemonReceiver::Receive(uchar *Data, int Length)
 {
  // TS packet length: TS_SIZE
-  if (Length == TS_SIZE) {
-     int pid = ((Data[1] & 0x1f) << 8) | (Data[2]);
+  if (Running() && (*Data == TS_SYNC_BYTE) && (Length == TS_SIZE)) {
+     int len, pid = TsPid(Data);
     if (pid == m_VideoPid) {
-        m_VideoPacketCount++;
-        }
-     else if (pid == m_AudioPid) {
-        m_AudioPacketCount++;
-        }
-     else if (pid == m_AC3Pid) {
-        m_AC3PacketCount++;
-        }
-     /* the following originates from libdvbmpeg: */
-     if (!(Data[3] & PAYLOAD)) {
-        return;
-        }
-     uint8_t off = 0;
-     if (Data[3] & ADAPT_FIELD) {
-        off = Data[4] + 1;
-        }
-     if (Data[1] & PAY_START) {
-        uint8_t *sb = Data + 4 + off;
-        if (sb[7] & PTS_DTS_FLAGS) {
-           uint8_t *pay = sb + sb[8] + 9; 
-           int l = TS_SIZE - 13 - off - sb[8];
-           if (pid == m_VideoPid) {
-              GetVideoInfo(pay, l);
-              }
-           else if (pid == m_AudioPid) {
-              GetAudioInfo(pay, l);
-              }
-           else if (pid == m_AC3Pid) {
-              GetAC3Info(pay, l);
-              }
+        ++m_VideoPacketCount;
+        len = m_VideoBuffer.Put(Data, Length);
+        if (len != Length) {
+           m_VideoBuffer.ReportOverflow(Length - len);
+           m_VideoBuffer.Clear();
+           }
+        }
+     else if (pid == m_AudioPid) {
+        ++m_AudioPacketCount;
+        len = m_AudioBuffer.Put(Data, Length);
+        if (len != Length) {
+           m_AudioBuffer.ReportOverflow(Length - len);
+           m_AudioBuffer.Clear();
+           }
+        }
+     else if (pid == m_AC3Pid) {
+        ++m_AC3PacketCount;
+        len = m_AC3Buffer.Put(Data, Length);
+        if (len != Length) {
+           m_AC3Buffer.ReportOverflow(Length - len);
+           m_AC3Buffer.Clear();
           }
        }
-     /* end */
     }
 }

 void cFemonReceiver::Action(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  cTimeMs t;
-  while (Running()) {
-        t.Set(0);
-        // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
-        m_VideoBitrate = (10.0 * 8.0 * 184.0 * m_VideoPacketCount) / femonConfig.calcinterval;
-        m_VideoPacketCount = 0;
-        m_AudioBitrate = (10.0 * 8.0 * 184.0 * m_AudioPacketCount) / femonConfig.calcinterval;
-        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());
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  cTimeMs calcPeriod(0);
+  m_Active = true;
+
+  while (Running() && m_Active) {
+    uint8_t *Data;
+    double timeout;
+    int len, Length;
+    bool processed = false;
+
+    // process available video data
+    while (Data = m_VideoBuffer.Get(Length)) {
+      if (!m_Active || (Length < TS_SIZE))
+         break;
+      Length = TS_SIZE;
+      if (*Data != TS_SYNC_BYTE) {
+         for (int i = 1; i < Length; ++i) {
+             if (Data[i] == TS_SYNC_BYTE) {
+                Length = i;
+                break;
+                }
+             }
+         m_VideoBuffer.Del(Length);
+         continue;
+         }
+      processed = true;
+      if (TsPayloadStart(Data)) {
+         while (const uint8_t *p = m_VideoAssembler.GetPes(len)) {
+           if (m_VideoType == 0x1B) { // MPEG4
+              if (m_DetectH264.processVideo(p, len)) {
+                 m_VideoValid = true;
+                 break;
+                 }
+              }
+           else {
+              if (m_DetectMPEG.processVideo(p, len)) {
+                 m_VideoValid = true;
+                 break;
+                 }
+              }
+           }
+         m_VideoAssembler.Reset();
+         }
+      m_VideoAssembler.PutTs(Data, Length);
+      m_VideoBuffer.Del(Length);
+      }
+
+    // process available audio data
+    while (Data = m_AudioBuffer.Get(Length)) {
+      if (!m_Active || (Length < TS_SIZE))
+         break;
+      Length = TS_SIZE;
+      if (*Data != TS_SYNC_BYTE) {
+         for (int i = 1; i < Length; ++i) {
+             if (Data[i] == TS_SYNC_BYTE) {
+                Length = i;
+                break;
+                }
+             }
+         m_AudioBuffer.Del(Length);
+         continue;
+         }
+      processed = true;
+      if (const uint8_t *p = m_AudioAssembler.GetPes(len)) {
+         if (m_DetectAAC.processAudio(p, len) || m_DetectLATM.processAudio(p, len) || m_DetectMPEG.processAudio(p, len))
+            m_AudioValid = true;
+         m_AudioAssembler.Reset();
+         }
+      m_AudioAssembler.PutTs(Data, Length);
+      m_AudioBuffer.Del(Length);
+      }
+
+    // process available dolby data
+    while (Data = m_AC3Buffer.Get(Length)) {
+      if (!m_Active || (Length < TS_SIZE))
+         break;
+      Length = TS_SIZE;
+      if (*Data != TS_SYNC_BYTE) {
+         for (int i = 1; i < Length; ++i) {
+             if (Data[i] == TS_SYNC_BYTE) {
+                Length = i;
+                break;
+                }
+             }
+         m_AC3Buffer.Del(Length);
+         continue;
+         }
+      processed = true;
+      if (const uint8_t *p = m_AC3Assembler.GetPes(len)) {
+         if (m_DetectAC3.processAudio(p, len))
+            m_AC3Valid = true;
+         m_AC3Assembler.Reset();
+         }
+      m_AC3Assembler.PutTs(Data, Length);
+      m_AC3Buffer.Del(Length);
+      }
+
+    // calculate bitrates
+    timeout = double(calcPeriod.Elapsed());
+    if (m_Active && (timeout >= (100.0 * femonConfig.calcinterval))) {
+       // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
+       // PES headers should be compensated!
+       m_VideoBitrate     = (1000.0 * 8.0 * 184.0 * m_VideoPacketCount) / timeout;
+       m_VideoPacketCount = 0;
+       m_AudioBitrate     = (1000.0 * 8.0 * 184.0 * m_AudioPacketCount) / timeout;
+       m_AudioPacketCount = 0;
+       m_AC3Bitrate       = (1000.0 * 8.0 * 184.0 * m_AC3PacketCount)   / timeout;
+       m_AC3PacketCount   = 0;
+       calcPeriod.Set(0);
+       }
+
+    if (!processed)
+       m_Sleep.Wait(10); // to avoid busy loop and reduce cpu load
    }
 }
--- 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,51 @@
 #include <vdr/thread.h>
 #include <vdr/receiver.h>

-enum eVideoFormat {
-  VF_UNKNOWN = 0,
-  VF_PAL     = 1,
-  VF_NTSC    = 2,
-  };
+#include "femonh264.h"
+#include "femonmpeg.h"
+#include "femonaac.h"
+#include "femonlatm.h"
+#include "femonac3.h"
+#include "femonaudio.h"
+#include "femonvideo.h"
+#include "femontools.h"

-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
-  };
-
-class cFemonReceiver : public cReceiver, public cThread {
+class cFemonReceiver : public cReceiver, public cThread, public cFemonVideoIf, public cFemonAudioIf, public cFemonAC3If {
 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);
+  cMutex            m_Mutex;
+  cCondWait         m_Sleep;
+  bool              m_Active;
+
+  cFemonH264        m_DetectH264;
+  cFemonMPEG        m_DetectMPEG;
+  cFemonAAC         m_DetectAAC;
+  cFemonLATM        m_DetectLATM;
+  cFemonAC3         m_DetectAC3;
+
+  cRingBufferLinear m_VideoBuffer;
+  cTsToPes          m_VideoAssembler;
+  int               m_VideoType;
+  int               m_VideoPid;
+  int               m_VideoPacketCount;
+  double            m_VideoBitrate;
+  bool              m_VideoValid;
+  video_info_t      m_VideoInfo;
+
+  cRingBufferLinear m_AudioBuffer;
+  cTsToPes          m_AudioAssembler;
+  int               m_AudioPid;
+  int               m_AudioPacketCount;
+  double            m_AudioBitrate;
+  bool              m_AudioValid;
+  audio_info_t      m_AudioInfo;
+
+  cRingBufferLinear m_AC3Buffer;
+  cTsToPes          m_AC3Assembler;
+  int               m_AC3Pid;
+  int               m_AC3PacketCount;
+  double            m_AC3Bitrate;
+  bool              m_AC3Valid;
+  ac3_info_t        m_AC3Info;

 protected:
  virtual void Activate(bool On);
@@ -96,38 +63,115 @@ protected:
  virtual void Action(void);

 public:
-  cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[]);
+  virtual void SetVideoCodec(eVideoCodec codec)                   { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.codec = codec; }
+  virtual void SetVideoFormat(eVideoFormat format)                { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.format = format; }
+  virtual void SetVideoScan(eVideoScan scan)                      { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.scan = scan; }
+  virtual void SetVideoAspectRatio(eVideoAspectRatio aspectratio) { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.aspectRatio = aspectratio; }
+  virtual void SetVideoSize(int width, int height)                { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.width  = width;
+                                                                    m_VideoInfo.height = height; }
+  virtual void SetVideoFramerate(double framerate)                { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.frameRate = framerate; }
+  virtual void SetVideoBitrate(double bitrate)                    { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.bitrate = bitrate; }
+
+  virtual void SetAudioCodec(eAudioCodec codec)        { cMutexLock MutexLock(&m_Mutex);
+                                                         m_AudioInfo.codec = codec; }
+  virtual void SetAudioBitrate(double bitrate)         { cMutexLock MutexLock(&m_Mutex);
+                                                         m_AudioInfo.bitrate = bitrate; }
+  virtual void SetAudioSamplingFrequency(int sampling) { cMutexLock MutexLock(&m_Mutex);
+                                                         m_AudioInfo.samplingFrequency = sampling; }
+  virtual void SetAudioChannel(eAudioChannelMode mode) { cMutexLock MutexLock(&m_Mutex);
+                                                         m_AudioInfo.channelMode = mode; }
+
+  virtual void SetAC3Bitrate(int bitrate)            { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.bitrate = bitrate; }
+  virtual void SetAC3SamplingFrequency(int sampling) { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.samplingFrequency = sampling; }
+  virtual void SetAC3Bitstream(int mode)             { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.bitstreamMode = mode; }
+  virtual void SetAC3AudioCoding(int mode)           { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.audioCodingMode = mode; }
+  virtual void SetAC3DolbySurround(int mode)         { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.dolbySurroundMode = mode; }
+  virtual void SetAC3CenterMix(int level)            { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.centerMixLevel = level; }
+  virtual void SetAC3SurroundMix(int level)          { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.surroundMixLevel = level; }
+  virtual void SetAC3Dialog(int level)               { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.dialogLevel = level; }
+  virtual void SetAC3LFE(bool onoff)                 { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.lfe = onoff; }
+
+public:
+  cFemonReceiver(int Vtype, int Vpid, int Apid, int Dpid);
  virtual ~cFemonReceiver();
+  void Deactivate(void);

-  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)           { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoValid; };                  // boolean
+  double VideoBitrate(void)         { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoBitrate; };                // bit/s
+  int    VideoCodec(void)           { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.codec; };             // eVideoCodec
+  int    VideoFormat(void)          { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.format; };            // eVideoFormat
+  int    VideoScan(void)            { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.scan; };              // eVideoScan
+  int    VideoAspectRatio(void)     { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.aspectRatio; };       // eVideoAspectRatio
+  int    VideoHorizontalSize(void)  { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.width; };             // pixels
+  int    VideoVerticalSize(void)    { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.height; };            // pixels
+  double VideoFrameRate(void)       { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.frameRate; };         // Hz
+  double VideoStreamBitrate(void)   { cMutexLock MutexLock(&m_Mutex);
+                                      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)           { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioValid; };                  // boolean
+  double AudioBitrate(void)         { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioBitrate; };                // bit/s
+  int    AudioCodec(void)           { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioInfo.codec; };             // eAudioCodec
+  int    AudioChannelMode(void)     { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioInfo.channelMode; };       // eAudioChannelMode
+  double AudioStreamBitrate(void)   { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioInfo.bitrate; };           // bit/s or eAudioBitrate
+  int    AudioSamplingFreq(void)    { cMutexLock MutexLock(&m_Mutex);
+                                      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)             { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AC3Valid; };                    // boolean
+  double AC3Bitrate(void)           { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AC3Bitrate; };                  // bit/s
+  double AC3StreamBitrate(void)     { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AC3Info.bitrate; };             // bit/s or eAudioBitrate
+  int    AC3SamplingFreq(void)      { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AC3Info.samplingFrequency; };   // Hz or eAudioSamplingFrequency
+  int    AC3BitStreamMode(void)     { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AC3Info.bitstreamMode; };       // 0..7 or eAudioBitstreamMode
+  int    AC3AudioCodingMode(void)   { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AC3Info.audioCodingMode; };     // 0..7 or eAudioCodingMode
+  bool   AC3_2_0(void)              { cMutexLock MutexLock(&m_Mutex);
+                                      return (m_AC3Info.audioCodingMode == AUDIO_CODING_MODE_2_0); }; // boolean
+  bool   AC3_5_1(void)	            { cMutexLock MutexLock(&m_Mutex);
+                                      return (m_AC3Info.audioCodingMode == AUDIO_CODING_MODE_3_2); }; // boolean
+  int    AC3DolbySurroundMode(void) { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AC3Info.dolbySurroundMode; };   // eAudioDolbySurroundMode
+  int    AC3CenterMixLevel(void)    { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AC3Info.centerMixLevel; };      // eAudioCenterMixLevel
+  int    AC3SurroundMixLevel(void)  { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AC3Info.surroundMixLevel; };    // eAudioSurroundMixLevel
+  int    AC3DialogLevel(void)       { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AC3Info.dialogLevel; };         // -dB
+  bool   AC3Lfe(void)               { cMutexLock MutexLock(&m_Mutex);
+                                      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,83 @@
+/*
+ * 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"
+#include "symbols/eight.xpm"
+#include "symbols/format1080.xpm"
+#include "symbols/format720.xpm"
+#include "symbols/format576.xpm"
+#include "symbols/format480.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
+  cBitmap(eight_xpm),          // SYMBOL_EIGHT
+  cBitmap(format1080_xpm),     // SYMBOL_FORMAT_1080
+  cBitmap(format720_xpm),      // SYMBOL_FORMAT_720
+  cBitmap(format576_xpm),      // SYMBOL_FORMAT_576
+  cBitmap(format480_xpm)       // SYMBOL_FORMAT_480
+};
--- a/femonsymbol.h
+++ b/femonsymbol.h
@@ -0,0 +1,54 @@
+/*
+ * 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_EIGHT,
+  SYMBOL_FORMAT_1080,
+  SYMBOL_FORMAT_720,
+  SYMBOL_FORMAT_576,
+  SYMBOL_FORMAT_480,
+  SYMBOL_MAX_COUNT
+  };
+
+extern cBitmap bmSymbol[SYMBOL_MAX_COUNT];
+
+#endif // __FEMONSYMBOL_H
--- a/femontools.c
+++ b/femontools.c
@@ -3,9 +3,13 @@
 *
 * See the README file for copyright information and how to reach the author.
 *
- * $Id$
 */

+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
@@ -14,6 +18,64 @@
 #include "femonosd.h"
 #include "femontools.h"

+static cString getCA(int value)
+{
+  // http://www.dvb.org/index.php?id=174
+  // http://en.wikipedia.org/wiki/Conditional_access_system
+  switch (value) {
+    case 0x0000:            return cString::sprintf("%s (%X)", trVDR("Free To Air"), value);  // Reserved
+    case 0x0001 ... 0x009F:
+    case 0x00A2 ... 0x00FF: return cString::sprintf("%s (%X)", tr("Fixed"),          value); // Standardized systems
+    case 0x00A0 ... 0x00A1: return cString::sprintf("%s (%X)", tr("Analog"),         value); // Analog signals
+    case 0x0100 ... 0x01FF: return cString::sprintf("%s (%X)", "SECA Mediaguard",    value); // Canal Plus
+    case 0x0464:            return cString::sprintf("%s (%X)", "EuroDec",            value); // EuroDec
+    case 0x0500 ... 0x05FF: return cString::sprintf("%s (%X)", "Viaccess",           value); // France Telecom
+    case 0x0600 ... 0x06FF: return cString::sprintf("%s (%X)", "Irdeto",             value); // Irdeto
+    case 0x0900 ... 0x09FF: return cString::sprintf("%s (%X)", "NDS Videoguard",     value); // News Datacom
+    case 0x0B00 ... 0x0BFF: return cString::sprintf("%s (%X)", "Conax",              value); // Norwegian Telekom
+    case 0x0D00 ... 0x0DFF: return cString::sprintf("%s (%X)", "CryptoWorks",        value); // Philips
+    case 0x0E00 ... 0x0EFF: return cString::sprintf("%s (%X)", "PowerVu",            value); // Scientific Atlanta
+    case 0x1000:            return cString::sprintf("%s (%X)", "RAS",                value); // Tandberg Television
+    case 0x1200 ... 0x12FF: return cString::sprintf("%s (%X)", "NagraVision",        value); // BellVu Express
+    case 0x1700 ... 0x17FF: return cString::sprintf("%s (%X)", "BetaCrypt",          value); // BetaTechnik
+    case 0x1800 ... 0x18FF: return cString::sprintf("%s (%X)", "NagraVision",        value); // Kudelski SA
+    case 0x22F0:            return cString::sprintf("%s (%X)", "Codicrypt",          value); // Scopus Network Technologies
+    case 0x2600:            return cString::sprintf("%s (%X)", "BISS",               value); // European Broadcasting Union
+    case 0x4347:            return cString::sprintf("%s (%X)", "CryptOn",            value); // CryptOn
+    case 0x4800:            return cString::sprintf("%s (%X)", "Accessgate",         value); // Telemann
+    case 0x4900:            return cString::sprintf("%s (%X)", "China Crypt",        value); // CryptoWorks
+    case 0x4A10:            return cString::sprintf("%s (%X)", "EasyCas",            value); // EasyCas
+    case 0x4A20:            return cString::sprintf("%s (%X)", "AlphaCrypt",         value); // AlphaCrypt
+    case 0x4A70:            return cString::sprintf("%s (%X)", "DreamCrypt",         value); // Dream Multimedia
+    case 0x4A60:            return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
+    case 0x4A61:            return cString::sprintf("%s (%X)", "Neotioncrypt",       value); // Neotion
+    case 0x4A62:            return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
+    case 0x4A63:            return cString::sprintf("%s (%X)", "Neotion SHL",        value); // Neotion
+    case 0x4A64 ... 0x4A6F: return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
+    case 0x4A80:            return cString::sprintf("%s (%X)", "ThalesCrypt",        value); // TPS
+    case 0x4AA1:            return cString::sprintf("%s (%X)", "KeyFly",             value); // SIDSA
+    case 0x4ABF:            return cString::sprintf("%s (%X)", "DG-Crypt",           value); // Beijing Compunicate Technology Inc.
+    case 0x4AD0 ... 0x4AD1: return cString::sprintf("%s (%X)", "X-Crypt",            value); // XCrypt Inc.
+    case 0x4AD4:            return cString::sprintf("%s (%X)", "OmniCrypt",          value); // Widevine Technologies, Inc.
+    case 0x4AE0:            return cString::sprintf("%s (%X)", "RossCrypt",          value); // Digi Raum Electronics Co. Ltd.
+    case 0x5500:            return cString::sprintf("%s (%X)", "Z-Crypt",            value); // Digi Raum Electronics Co. Ltd.
+    case 0x5501:            return cString::sprintf("%s (%X)", "Griffin",            value); // Griffin
+    default:                break;
+    }
+  return cString::sprintf("%X", value);
+}
+
+static const char *getUserString(int Value, const tDvbParameterMap *Map)
+{
+  const tDvbParameterMap *map = Map;
+  while (map && map->userValue != -1) {
+        if (map->driverValue == Value)
+           return map->userString ? trVDR(map->userString) : "---";
+        map++;
+        }
+  return "---";
+}
+
 cString getFrontendInfo(int cardIndex)
 {
  cString info;
@@ -23,29 +85,34 @@ 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));
-  CHECK(ioctl(fe, FE_READ_STATUS, &status));
-  CHECK(ioctl(fe, FE_READ_SIGNAL_STRENGTH, &signal));
-  CHECK(ioctl(fe, FE_READ_SNR, &snr));
-  CHECK(ioctl(fe, FE_READ_BER, &ber));
-  CHECK(ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &unc));
-  close(fe);

-  info = cString::sprintf("CARD:%d\nTYPE:%d\nNAME:%s\nSTAT:%02X\nSGNL:%04X\nSNRA:%04X\nBERA:%08X\nUNCB:%08X", cardIndex, value.type, value.name, status, signal, snr, ber, unc);
+  info = cString::sprintf("CARD:%d", cardIndex);
+
+  if (ioctl(fe, FE_GET_INFO, &value) >= 0)
+     info = cString::sprintf("%s\nTYPE:%d\nNAME:%s", *info, value.type, value.name);
+  if (ioctl(fe, FE_READ_STATUS, &status) >= 0)
+     info = cString::sprintf("%s\nSTAT:%02X", *info, status);
+  if (ioctl(fe, FE_READ_SIGNAL_STRENGTH, &signal) >= 0)
+     info = cString::sprintf("%s\nSGNL:%04X", *info, signal);
+  if (ioctl(fe, FE_READ_SNR, &snr) >= 0)
+     info = cString::sprintf("%s\nSNRA:%04X", *info, snr);
+  if (ioctl(fe, FE_READ_BER, &ber) >= 0)
+     info = cString::sprintf("%s\nBERA:%08X", *info, ber);
+  if (ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &unc) >= 0)
+     info = cString::sprintf("%s\nUNCB:%08X", *info, unc);
+  close(fe);

  if (cFemonOsd::Instance())
     info = cString::sprintf("%s\nVIBR:%.0f\nAUBR:%.0f\nDDBR:%.0f", *info, cFemonOsd::Instance()->GetVideoBitrate(), cFemonOsd::Instance()->GetAudioBitrate(), cFemonOsd::Instance()->GetDolbyBitrate());

  if (channel)
-     info  = cString::sprintf("%s\nCHAN:%s", *info, *channel->ToText());
+     info = cString::sprintf("%s\nCHAN:%s", *info, *channel->ToText());

  return info;
 }
@@ -53,14 +120,13 @@ 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));
+  memset(&value, 0, sizeof(value));
+  ioctl(fe, FE_GET_INFO, &value);
  close(fe);

  return (cString::sprintf("%s on device #%d", value.name, cardIndex));
@@ -69,14 +135,13 @@ 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));
+  memset(&value, 0, sizeof(value));
+  ioctl(fe, FE_READ_STATUS, &value);
  close(fe);

  return (cString::sprintf("Status %s:%s:%s:%s:%s on device #%d", (value & FE_HAS_LOCK) ? "LOCKED" : "-", (value & FE_HAS_SIGNAL) ? "SIGNAL" : "-", (value & FE_HAS_CARRIER) ? "CARRIER" : "-", (value & FE_HAS_VITERBI) ? "VITERBI" : "-", (value & FE_HAS_SYNC) ? "SYNC" : "-", cardIndex));
@@ -85,14 +150,12 @@ 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));
+  ioctl(fe, FE_READ_SIGNAL_STRENGTH, &value);
  close(fe);

  return (value);
@@ -101,14 +164,12 @@ 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));
+  ioctl(fe, FE_READ_SNR, &value);
  close(fe);

  return (value);
@@ -117,14 +178,12 @@ 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));
+  ioctl(fe, FE_READ_BER, &value);
  close(fe);

  return (value);
@@ -133,14 +192,12 @@ 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));
+  ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &value);
  close(fe);

  return (value);
@@ -164,141 +221,178 @@ cString getDpids(const cChannel *channel)
  return dpids;
 }

-cString getCAids(const cChannel *channel, bool identify)
+cString getSpids(const cChannel *channel)
 {
-  cString caids;
  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;
+}

-  if (identify) {
-     caids = cString::sprintf("%s", *getCA(channel->Ca(value)));
-     while (channel->Ca(++value) && (value < MAXCAIDS))
-       caids = cString::sprintf("%s, %s", *caids, *getCA(channel->Ca(value)));
-     }
-  else {
-     caids = cString::sprintf("%04x", channel->Ca(value));
-     while (channel->Ca(++value) && (value < MAXCAIDS))
-       caids = cString::sprintf("%s, %04x", *caids, channel->Ca(value));
-     }
+cString getCAids(const cChannel *channel)
+{
+  int value = 0;
+  cString caids = cString::sprintf("%s", *getCA(channel->Ca(value)));
+  while (channel->Ca(++value) && (value < MAXCAIDS))
+    caids = cString::sprintf("%s, %s", *caids, *getCA(channel->Ca(value)));
  return caids;
 }

-cString getCA(int value)
+cString getVideoStream(int value)
+{
+  if (value != 0)
+     return cString::sprintf("#%d", value);
+  return cString::sprintf("---");
+}
+
+cString getAudioStream(int value, const cChannel *channel)
+{
+  int pid = 0;
+  if (IS_AUDIO_TRACK(value))
+     pid = int(value - ttAudioFirst);
+  if (channel && channel->Apid(pid)) {
+     if (channel->Alang(pid))
+        return cString::sprintf("#%d (%s)", channel->Apid(pid), channel->Alang(pid));
+     else
+        return cString::sprintf("#%d", channel->Apid(pid));
+     }
+  return cString::sprintf("---");
+}
+
+cString getAC3Stream(int value, const cChannel *channel)
+{
+  int pid = 0;
+  if (IS_DOLBY_TRACK(value))
+     pid = int(value - ttDolbyFirst);
+  if (channel && channel->Dpid(pid)) {
+     if (channel->Dlang(pid))
+        return cString::sprintf("#%d (%s)", channel->Dpid(pid), channel->Dlang(pid));
+     else
+        return cString::sprintf("#%d", channel->Dpid(pid));
+     }
+  return cString::sprintf("---");
+}
+
+cString getVideoCodec(int value)
 {
-  /* http://www.dvb.org/index.php?id=174 */
  switch (value) {
-    case 0x0000:            return cString::sprintf("%s", tr("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 VIDEO_CODEC_MPEG2: return cString::sprintf("%s", tr("MPEG-2"));
+    case VIDEO_CODEC_H264:  return cString::sprintf("%s", tr("H.264"));
+    default:                break;
    }
-  return cString::sprintf("%X", value);
+  return cString::sprintf("---");
+}
+
+cString getAudioCodec(int value)
+{
+  switch (value) {
+    case AUDIO_CODEC_MPEG1_I:   return cString::sprintf("%s", tr("MPEG-1 Layer I"));
+    case AUDIO_CODEC_MPEG1_II:  return cString::sprintf("%s", tr("MPEG-1 Layer II"));
+    case AUDIO_CODEC_MPEG1_III: return cString::sprintf("%s", tr("MPEG-1 Layer III"));
+    case AUDIO_CODEC_MPEG2_I:   return cString::sprintf("%s", tr("MPEG-2 Layer I"));
+    case AUDIO_CODEC_MPEG2_II:  return cString::sprintf("%s", tr("MPEG-2 Layer II"));
+    case AUDIO_CODEC_MPEG2_III: return cString::sprintf("%s", tr("MPEG-2 Layer III"));
+    case AUDIO_CODEC_HEAAC:     return cString::sprintf("%s", tr("HE-AAC"));
+    case AUDIO_CODEC_LATM:      return cString::sprintf("%s", tr("LATM"));
+    default:                    break;
+    }
+  return cString::sprintf("---");
+}
+
+cString getAudioChannelMode(int value)
+{
+  switch (value) {
+    case AUDIO_CHANNEL_MODE_STEREO:       return cString::sprintf("%s", tr("stereo"));
+    case AUDIO_CHANNEL_MODE_JOINT_STEREO: return cString::sprintf("%s", tr("joint Stereo"));
+    case AUDIO_CHANNEL_MODE_DUAL:         return cString::sprintf("%s", tr("dual"));
+    case AUDIO_CHANNEL_MODE_SINGLE:       return cString::sprintf("%s", tr("mono"));
+    default:                              break;
+    }
+  return cString::sprintf("---");
 }

 cString getCoderate(int value)
 {
-  switch (value) {
-    case FEC_NONE: return cString::sprintf("%s", tr("None"));
-    case FEC_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");
-    case FEC_4_5:  return cString::sprintf("4/5");
-    case FEC_5_6:  return cString::sprintf("5/6");
-    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"));
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, CoderateValues));
 }

 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"));
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, TransmissionValues));
 }

 cString getBandwidth(int value)
 {
-  switch (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"));
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, BandwidthValues));
 }

 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"));
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, InversionValues));
 }

 cString getHierarchy(int value)
 {
-  switch (value) {
-    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"));
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, HierarchyValues));
 }

 cString getGuard(int value)
 {
-  switch (value) {
-    case GUARD_INTERVAL_1_32: return cString::sprintf("1/32");
-    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"));
-    }
-  return cString::sprintf("---");
+  return cString::sprintf("%s", getUserString(value, GuardValues));
 }

 cString getModulation(int value)
 {
-  switch (value) {
-    case QPSK:     return cString::sprintf("QPSK");
-    case QAM_16:   return cString::sprintf("QAM 16");
-    case QAM_32:   return cString::sprintf("QAM 32");
-    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"));
-    }
+  return cString::sprintf("%s", getUserString(value, ModulationValues));
+}
+
+cString getSystem(int value)
+{
+  return cString::sprintf("%s", getUserString(value, SystemValues));
+}
+
+cString getRollOff(int value)
+{
+  return cString::sprintf("%s", getUserString(value, RollOffValues));
+}
+
+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");
+    default:                          break;
    }
  return cString::sprintf("---");
 }
@@ -306,24 +400,37 @@ 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"));
+    default:                     break;
    }
  return cString::sprintf("---");
 }

+cString getFrameRate(double value)
+{
+  if (value > 0)
+     return cString::sprintf("%.2f %s", value, tr("Hz"));
+  return cString::sprintf("---");
+}
+
 cString getAC3BitStreamMode(int value, int coding)
 {
  switch (value) {
-    case 0: return cString::sprintf("%s", tr("Complete Main (CM)"));
-    case 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"));
+    default:                          break;
    }
  return cString::sprintf("---");
 }
@@ -332,14 +439,15 @@ cString getAC3AudioCodingMode(int value, int stream)
 {
  if (stream != 7) {
     switch (value) {
-       case 0: return cString::sprintf("1+1 - %s, %s", tr("Ch1"), tr("Ch2"));
-       case 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"));
+       default:                    break;
       }
     }
  return cString::sprintf("---");
@@ -348,10 +456,11 @@ cString getAC3AudioCodingMode(int value, int stream)
 cString getAC3CenterMixLevel(int value)
 {
  switch (value) {
-    case CML_MINUS_3dB:   return cString::sprintf("-3.0 %s", tr("dB"));
-    case 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"));
+    default:                                 break;
    }
  return cString::sprintf("---");
 }
@@ -359,10 +468,11 @@ 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"));
+    default:                                 break;
    }
  return cString::sprintf("---");
 }
@@ -370,10 +480,11 @@ 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"));
+    default:                                          break;
    }
  return cString::sprintf("---");
 }
@@ -394,32 +505,121 @@ 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"));
+    default:                                break;
    }
-  return cString::sprintf("%.1f %s", ((double)value / 1000.0), tr("kHz"));
+  return cString::sprintf("%d %s", value, tr("Hz"));
 }

 cString getAudioBitrate(double value, double stream)
 {
  switch ((int)stream) {
-    case FR_NOTVALID: return cString::sprintf("---");
-    case 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));
+    default:                     break;
    }
  return cString::sprintf("%s (%s)", *getBitrateKbits(stream), *getBitrateKbits(value));
 }

+cString getVideoBitrate(double value, double stream)
+{
+  return cString::sprintf("%s (%s)", *getBitrateMbits(stream), *getBitrateMbits(value));
+}
+
 cString getBitrateMbits(double value)
 {
-  if (value >= 0)
+  if (value > 0)
     return cString::sprintf("%.2f %s", value / 1000000.0, tr("Mbit/s"));
-  return cString::sprintf("--- %s", tr("Mbit/s"));
+  return cString::sprintf("---");
 }

 cString getBitrateKbits(double value)
 {
-  if (value >= 0) 
+  if (value > 0)
     return cString::sprintf("%.0f %s", value / 1000.0, tr("kbit/s"));
-  return cString::sprintf("--- %s", tr("kbit/s"));
+  return cString::sprintf("---");
+}
+
+cBitStream::cBitStream(const uint8_t *buf, const int len)
+: data(buf),
+  count(len),
+  index(0)
+{
+}
+
+cBitStream::~cBitStream()
+{
+}
+
+int cBitStream::getBit()
+{
+  if (index >= count)
+     return (1); // -> no infinite colomb's ...
+
+  int r = (data[index >> 3] >> (7 - (index & 7))) & 1;
+  ++index;
+
+  return (r);
+}
+
+uint32_t cBitStream::getBits(uint32_t n)
+{
+  uint32_t r = 0;
+
+  while (n--)
+    r = (r | (getBit() << n));
+
+  return (r);
+}
+
+void cBitStream::skipBits(uint32_t n)
+{
+  index += n;
+}
+
+uint32_t cBitStream::getUeGolomb()
+{
+  int n = 0;
+
+  while (!getBit() && (n < 32))
+    n++;
+
+  return (n ? ((1 << n) - 1) + getBits(n) : 0);
+}
+
+int32_t cBitStream::getSeGolomb()
+{
+  uint32_t r = getUeGolomb() + 1;
+
+  return ((r & 1) ? -(r >> 1) : (r >> 1));
+}
+
+void cBitStream::skipGolomb()
+{
+  int n = 0;
+
+  while (!getBit() && (n < 32))
+    n++;
+
+  skipBits(n);
+}
+
+void cBitStream::skipUeGolomb()
+{
+  skipGolomb();
+}
+
+void cBitStream::skipSeGolomb()
+{
+  skipGolomb();
+}
+
+void cBitStream::byteAlign()
+{
+  int n = index % 8;
+
+  if (n > 0)
+     skipBits(8 - n);
 }
--- 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
@@ -11,14 +10,19 @@

 #include <stdint.h>
 #include <vdr/channels.h>
+#include <vdr/remux.h>
 #include <vdr/tools.h>

 #ifdef DEBUG
-#define Dprintf(x...) printf(x);
+#define debug(x...) dsyslog("FEMON: " x);
+#define error(x...) esyslog("ERROR: " x);
 #else
-#define Dprintf(x...) ;
+#define debug(x...) ;
+#define error(x...) esyslog("ERROR: " 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 +37,13 @@ uint32_t getUNC(int cardIndex = 0);

 cString getApids(const cChannel *channel);
 cString getDpids(const cChannel *channel);
-cString getCAids(const cChannel *channel, bool identify = false);
-cString getCA(int value);
+cString getSpids(const cChannel *channel);
+cString getCAids(const cChannel *channel);
+cString getVideoStream(int value);
+cString getVideoCodec(int value);
+cString getAudioStream(int value, const cChannel *channel);
+cString getAudioCodec(int value);
+cString getAudioChannelMode(int value);
 cString getCoderate(int value);
 cString getTransmission(int value);
 cString getBandwidth(int value);
@@ -42,8 +51,13 @@ cString getInversion(int value);
 cString getHierarchy(int value);
 cString getGuard(int value);
 cString getModulation(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 getAC3Stream(int value, const cChannel *channel);
 cString getAC3BitStreamMode(int value, int coding);
 cString getAC3AudioCodingMode(int value, int stream);
 cString getAC3CenterMixLevel(int value);
@@ -53,7 +67,39 @@ 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);

+class cBitStream {
+private:
+  const uint8_t *data;
+  int            count; // in bits
+  int            index; // in bits
+
+public:
+  cBitStream(const uint8_t *buf, const int len);
+  ~cBitStream();
+
+  int            getBit();
+  uint32_t       getBits(uint32_t n);
+  void           skipBits(uint32_t n);
+  uint32_t       getUeGolomb();
+  int32_t        getSeGolomb();
+  void           skipGolomb();
+  void           skipUeGolomb();
+  void           skipSeGolomb();
+  void           byteAlign();
+
+  void           skipBit()  { skipBits(1); }
+  uint32_t       getU8()    { return getBits(8); }
+  uint32_t       getU16()   { return ((getBits(8) << 8) | getBits(8)); }
+  uint32_t       getU24()   { return ((getBits(8) << 16) | (getBits(8) << 8) | getBits(8)); }
+  uint32_t       getU32()   { return ((getBits(8) << 24) | (getBits(8) << 16) | (getBits(8) << 8) | getBits(8)); }
+  bool           isEOF()    { return (index >= count); }
+  void           reset()    { index = 0; }
+  int            getIndex() { return (isEOF() ? count : index); }
+  const uint8_t *getData()  { return (isEOF() ? NULL : data + (index / 8)); }
+};
+
 #endif // __FEMONTOOLS_H
--- a/femonvideo.h
+++ b/femonvideo.h
@@ -0,0 +1,93 @@
+/*
+ * 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;     // bit/s
+} video_info_t;
+
+class cFemonVideoIf {
+public:
+  cFemonVideoIf() {}
+  virtual ~cFemonVideoIf() {}
+
+  // eVideoCodec
+  virtual void SetVideoCodec(eVideoCodec codec) = 0;
+  // eVideoFormat
+  virtual void SetVideoFormat(eVideoFormat format) = 0;
+  // eVideoScan
+  virtual void SetVideoScan(eVideoScan scan) = 0;
+  // eVideoAspectRatio
+  virtual void SetVideoAspectRatio(eVideoAspectRatio aspectratio) = 0;
+  // pixels
+  virtual void SetVideoSize(int width, int height) = 0;
+  // Hz
+  virtual void SetVideoFramerate(double framerate) = 0;
+  // Mbit/s
+  virtual void SetVideoBitrate(double bitrate) = 0;
+  };
+
+#endif //__FEMONVIDEO_H
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,535 +1,385 @@
 # 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"
-"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"
+"Project-Id-Version: femon 1.7.8\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Christian Wieninger\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\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 "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"
-
-#: 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 "Downscale OSD size [%]"
+msgstr ""

-#: femon.c:309
-msgid "Height"
-msgstr "H<>he"
+msgid "Define the downscale ratio for OSD size."
+msgstr ""

-#: femon.c:310
-msgid "Horizontal offset"
-msgstr "Horizontaler Offset"
-
-#: femon.c:311
-msgid "Show CA system"
-msgstr "CA System anzeigen"
-
-#: femon.c:312
 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"
-msgstr "Ein"
-
-#: femonosd.c:487
 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"
+msgid "MPEG-2"
+msgstr ""

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

-#: femontools.c:195
-msgid "Irdeto"
-msgstr "Irdeto"
+msgid "MPEG-1 Layer I"
+msgstr ""

-#: femontools.c:196
-msgid "NDS/Videoguard"
-msgstr "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
+msgstr ""

-#: femontools.c:197
-msgid "Conax"
-msgstr "Conax"
+msgid "MPEG-1 Layer III"
+msgstr ""

-#: femontools.c:198
-msgid "CryptoWorks"
-msgstr "CryptoWorks"
+msgid "MPEG-2 Layer I"
+msgstr ""

-#: femontools.c:199
-msgid "PowerVu"
-msgstr "PowerVu"
+msgid "MPEG-2 Layer II"
+msgstr ""

-#: femontools.c:200 femontools.c:202
-msgid "NagraVision"
-msgstr "NagraVision"
+msgid "MPEG-2 Layer III"
+msgstr ""

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

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

-#: femontools.c:211 femontools.c:259
-msgid "None"
-msgstr "Nichts"
+msgid "stereo"
+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 "joint Stereo"
+msgstr ""

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
-msgid "MHz"
-msgstr "MHz"
+msgid "dual"
+msgstr ""
+
+msgid "mono"
+msgstr ""
+
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 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 "MHz"
+msgstr "MHz"
+
 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,533 +1,383 @@
 # 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"
-"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"
+"Project-Id-Version: femon 1.7.8\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Luis Palacios\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Spanish <vdr@linuxtv.org>\n"
+"Language: es\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 "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<>"
-
-#: 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 "Downscale OSD size [%]"
+msgstr ""

-#: femon.c:309
-msgid "Height"
-msgstr "Altura"
+msgid "Define the downscale ratio for OSD size."
+msgstr ""

-#: femon.c:310
-msgid "Horizontal offset"
-msgstr "Desplazamiento horizontal"
-
-#: femon.c:311
-msgid "Show CA system"
-msgstr "Mostrar sistema CA"
-
-#: femon.c:312
 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"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
-msgstr "On"
-
-#: 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"
+msgid "MPEG-2"
+msgstr ""

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

-#: femontools.c:195
-msgid "Irdeto"
-msgstr "Irdeto"
+msgid "MPEG-1 Layer I"
+msgstr ""

-#: femontools.c:196
-msgid "NDS/Videoguard"
-msgstr "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
+msgstr ""

-#: femontools.c:197
-msgid "Conax"
-msgstr "Conax"
+msgid "MPEG-1 Layer III"
+msgstr ""

-#: femontools.c:198
-msgid "CryptoWorks"
-msgstr "CryptoWorks"
+msgid "MPEG-2 Layer I"
+msgstr ""

-#: femontools.c:199
-msgid "PowerVu"
-msgstr "PowerVu"
+msgid "MPEG-2 Layer II"
+msgstr ""

-#: femontools.c:200 femontools.c:202
-msgid "NagraVision"
-msgstr "NagraVision"
+msgid "MPEG-2 Layer III"
+msgstr ""

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

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

-#: femontools.c:211 femontools.c:259
-msgid "None"
-msgstr "Ninguno"
+msgid "stereo"
+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 "joint Stereo"
+msgstr ""

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
-msgid "MHz"
-msgstr "MHz"
+msgid "dual"
+msgstr ""
+
+msgid "mono"
+msgstr "o"
+
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 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 "MHz"
+msgstr "MHz"
+
 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,533 +1,383 @@
 # 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"
-"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"
+"Project-Id-Version: femon 1.7.8\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Arthur Konovalov\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Estonian <vdr@linuxtv.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "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"
-msgstr ""
+msgid "Femon not available"
+msgstr "Femon ei ole k<>ttesaadav"

-#: 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"
+msgstr "Classic"

-#: 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"
+msgstr "Peita 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 "Valiku peamen<65><6E>s peitmise m<><6D>ritlemine."

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "jah"
-
-#: femon.c:305
 msgid "Default display mode"
-msgstr "Vaikimisi displei moodus"
+msgstr "Vaikemoodus"

-#: femon.c:306
-msgid "Skin"
-msgstr "Kest"
+msgid "Define the default display mode at startup."
+msgstr "K<>ivitamisel vaikemooduse m<><6D>ritlemine."

-#: femon.c:307
-msgid "Theme"
-msgstr "Teema"
+msgid "Define the used OSD skin."
+msgstr "Kasutatava ekraanikesta m<><6D>ritlemine."
+
+msgid "Define the used OSD theme."
+msgstr "Kasutatava teema m<><6D>ritlemine."

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

-#: femon.c:308
-msgid "bottom"
-msgstr "all"
+msgid "Define the position of OSD."
+msgstr "Ekraaniinfo positsiooni m<><6D>ritlemine."

-#: femon.c:308
-msgid "top"
-msgstr "<22>leval"
+msgid "Downscale OSD size [%]"
+msgstr "Ekraanimen<65><6E> v<>hendamine [%]"

-#: femon.c:309
-msgid "Height"
-msgstr "K<>rgus"
+msgid "Define the downscale ratio for OSD size."
+msgstr "Ekraanimen<65><6E> suuruse v<>hendamise m<><6D>ritlemine"

-#: femon.c:310
-msgid "Horizontal offset"
-msgstr "Horisontaalne nihe"
-
-#: femon.c:311
-msgid "Show CA system"
-msgstr "N<>ita CA s<>steemi"
-
-#: femon.c:312
 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 "Seaded punasele limiidile. Iseloomustab kehva signaali."
+
 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 "Seaded rohelisele limiidile. Iseloomustab head signaali."
+
 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 "Ekraaniinfo uuendamise intervalli m<><6D>ritlemine. V<>iksem intervall- suurem CPU koormus."
+
 msgid "Analyze stream"
 msgstr "Voo anal<61><6C>s"

-#: femon.c:317
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "DVB voo bitikiiruse rehkendamise m<><6D>ritlemine."
+
 msgid "Calculation interval [0.1s]"
-msgstr "Kalkulatsiooni intervall [0,1s]"
+msgstr "Arvutamise intervall [0,1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "Arvutamise intervalli m<><6D>ritlemine. Suurem intervall annab stabiilsemaid tulemusi."

-#: femon.c:318
 msgid "Use SVDRP service"
-msgstr ""
+msgstr "SVDRP teenus"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "SVDRP teenuse klient/server seadete m<><6D>ritlemine."

-#: femon.c:320
 msgid "SVDRP service port"
-msgstr ""
+msgstr "SVDRP port"
+
+msgid "Define the port number of SVDRP service."
+msgstr "SVDRP teenuse pordi m<><6D>ritlemine."

-#: femon.c:321
 msgid "SVDRP service IP"
-msgstr ""
+msgstr "SVDRP IP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "SVDRP teenuse IP aadressi m<><6D>ritlemine."
+
+msgid "Help"
+msgstr "Abi"

-#: femonosd.c:268
 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"
+msgstr "Vooinfo"

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

-#: femonosd.c:419 femonosd.c:437 femonosd.c:460
+msgid "Codec"
+msgstr "Koodek"
+
 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 "Kanalimoodus"

-#: 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"
-msgstr "Sees"
-
-#: femonosd.c:487
 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 ""
+msgstr "Analoog"

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

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

-#: femontools.c:195
-msgid "Irdeto"
-msgstr "Irdeto"
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layet I"

-#: femontools.c:196
-msgid "NDS/Videoguard"
-msgstr "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"

-#: femontools.c:197
-msgid "Conax"
-msgstr "Conax"
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"

-#: femontools.c:198
-msgid "CryptoWorks"
-msgstr "CryptoWorks"
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"

-#: femontools.c:199
-msgid "PowerVu"
-msgstr "PowerVu"
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"

-#: femontools.c:200 femontools.c:202
-msgid "NagraVision"
-msgstr "NagraVision"
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"

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

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

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

-#: 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 "joint Stereo"
+msgstr "joint stereo"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
-msgid "MHz"
-msgstr "MHz"
+msgid "dual"
+msgstr "duaalne"
+
+msgid "mono"
+msgstr "mono"
+
+msgid "interlaced"
+msgstr "<22>lerealaotus"
+
+msgid "progressive"
+msgstr "progressiivne"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 msgid "reserved"
-msgstr "reserveeritud"
+msgstr "reserv."
+
+msgid "extended"
+msgstr "laiendatud"

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

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

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

-#: femontools.c:319
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+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"
+msgstr "Kan.1"

-#: femontools.c:335
 msgid "Ch2"
-msgstr "Kan. 2"
+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 "MHz"
+msgstr "MHz"
+
 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,383 @@
 # 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"
-"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"
+"Project-Id-Version: femon 1.7.8\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\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>"
-
-#: 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 "Downscale OSD size [%]"
+msgstr "Pienennä näytön kokoa [%]"

-#: femon.c:309
-msgid "Height"
-msgstr "Korkeus"
+msgid "Define the downscale ratio for OSD size."
+msgstr "Määrittele näytön pienennyssuhde."

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

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

-#: femontools.c:195
-msgid "Irdeto"
-msgstr "Irdeto"
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 kerros I"

-#: femontools.c:196
-msgid "NDS/Videoguard"
-msgstr "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 kerros II"

-#: femontools.c:197
-msgid "Conax"
-msgstr "Conax"
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 kerros III"

-#: femontools.c:198
-msgid "CryptoWorks"
-msgstr "CryptoWorks"
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 kerros I"

-#: femontools.c:199
-msgid "PowerVu"
-msgstr "PowerVu"
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 kerros II"

-#: femontools.c:200 femontools.c:202
-msgid "NagraVision"
-msgstr "NagraVision"
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 kerros III"

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

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

-#: femontools.c:211 femontools.c:259
-msgid "None"
-msgstr "ei"
+msgid "stereo"
+msgstr "stereo"

-#: 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 "joint Stereo"
+msgstr "joint-stereo"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
-msgid "MHz"
-msgstr "MHz"
+msgid "dual"
+msgstr "kaksikanavainen"
+
+msgid "mono"
+msgstr "mono"
+
+msgid "interlaced"
+msgstr "lomiteltu"
+
+msgid "progressive"
+msgstr "lomittelematon"

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 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 "MHz"
+msgstr "MHz"
+
 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,383 @@
 # 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"
-"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"
+"Project-Id-Version: femon 1.7.8\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"Last-Translator: NIVAL Micha<68>l <mnival@club-internet.fr>\n"
+"Language-Team: French <vdr@linuxtv.org>\n"
+"Language: fr\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"
-
-#: 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 "Downscale OSD size [%]"
+msgstr ""

-#: femon.c:309
-msgid "Height"
-msgstr "Hauteur"
+msgid "Define the downscale ratio for OSD size."
+msgstr ""

-#: femon.c:310
-msgid "Horizontal offset"
-msgstr "D<>placement horizontal"
-
-#: femon.c:311
-msgid "Show CA system"
-msgstr "Syst<73>me CA"
-
-#: 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"
-msgstr "Oui"
-
-#: femonosd.c:487
 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"
+msgid "MPEG-2"
+msgstr ""

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

-#: femontools.c:195
-msgid "Irdeto"
-msgstr "Irdeto"
+msgid "MPEG-1 Layer I"
+msgstr ""

-#: femontools.c:196
-msgid "NDS/Videoguard"
-msgstr "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
+msgstr ""

-#: femontools.c:197
-msgid "Conax"
-msgstr "Conax"
+msgid "MPEG-1 Layer III"
+msgstr ""

-#: femontools.c:198
-msgid "CryptoWorks"
-msgstr "CryptoWorks"
+msgid "MPEG-2 Layer I"
+msgstr ""

-#: femontools.c:199
-msgid "PowerVu"
-msgstr "PowerVu"
+msgid "MPEG-2 Layer II"
+msgstr ""

-#: femontools.c:200 femontools.c:202
-msgid "NagraVision"
-msgstr "NagraVision"
+msgid "MPEG-2 Layer III"
+msgstr ""

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

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

-#: femontools.c:211 femontools.c:259
-msgid "None"
-msgstr "Aucun"
+msgid "stereo"
+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 "joint Stereo"
+msgstr ""

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
-msgid "MHz"
-msgstr "MHz"
+msgid "dual"
+msgstr ""
+
+msgid "mono"
+msgstr ""
+
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 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 "MHz"
+msgstr "MHz"
+
 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,387 @@
 # 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"
-"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"
+"Project-Id-Version: femon 1.7.8\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
+"Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\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"
+"X-Poedit-Language: Italian\n"
+"X-Poedit-Country: ITALY\n"
+"X-Poedit-SourceCharset: utf-8\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 è nascosta."

-#: femon.c:304 femon.c:311 femon.c:315 femontools.c:375
-msgid "yes"
-msgstr "si"
-
-#: femon.c:305
 msgid "Default display mode"
-msgstr "Modo di visualizzazione standard"
+msgstr "Modalità visualizz. predefinita"

-#: femon.c:306
-msgid "Skin"
-msgstr "Stile interfaccia"
+msgid "Define the default display mode at startup."
+msgstr "Definisci la modalità 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 "Downscale OSD size [%]"
+msgstr "Riduci dimensione OSD [%]"

-#: femon.c:309
-msgid "Height"
-msgstr "Altezza"
+msgid "Define the downscale ratio for OSD size."
+msgstr "Definisci il rapporto di riduzione della dimensione OSD."

-#: femon.c:310
-msgid "Horizontal offset"
-msgstr ""
-
-#: femon.c:311
-msgid "Show CA system"
-msgstr ""
-
-#: 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ù piccolo è l'intervallo maggiore sarà 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 è 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ù grande genera valori più 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"
-
-#: 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 ""
+msgstr "Flusso video"
+
+msgid "Codec"
+msgstr "Codifica"

-#: 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 ""
+msgstr "Flusso audio"

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

-#: 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à bitstream"

-#: femonosd.c:472
 msgid "Audio Coding Mode"
-msgstr ""
+msgstr "Modalità 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à Dolby Surround"

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

-#: femonosd.c:485 femontools.c:249
-msgid "Off"
-msgstr "Off"
-
-#: femonosd.c:485 femontools.c:250
-msgid "On"
-msgstr "On"
-
-#: 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 ""
+msgid "MPEG-2"
+msgstr "MPEG-2"

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

-#: femontools.c:195
-msgid "Irdeto"
-msgstr ""
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layer I"

-#: femontools.c:196
-msgid "NDS/Videoguard"
-msgstr ""
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"

-#: femontools.c:197
-msgid "Conax"
-msgstr ""
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"

-#: femontools.c:198
-msgid "CryptoWorks"
-msgstr ""
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"

-#: femontools.c:199
-msgid "PowerVu"
-msgstr ""
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"

-#: femontools.c:200 femontools.c:202
-msgid "NagraVision"
-msgstr ""
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"

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

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

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

-#: 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 "joint Stereo"
+msgstr "joint Stereo"

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
-msgid "MHz"
-msgstr "MHz"
+msgid "dual"
+msgstr "dual"
+
+msgid "mono"
+msgstr "mono"
+
+msgid "interlaced"
+msgstr "interlacciato"
+
+msgid "progressive"
+msgstr "progressivo"

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

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

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

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

-#: femontools.c:319
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+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"
+
+msgid "MHz"
+msgstr "MHz"

-#: 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/lt_LT.po
+++ b/po/lt_LT.po
@@ -0,0 +1,383 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Valdemaras Pipiras
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: femon 1.7.8\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
+"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
+"Language: lt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "DVB signalo informacijos stebėjimas (OSD)"
+
+msgid "Signal Information"
+msgstr "Signalo informacija"
+
+msgid "Femon not available"
+msgstr "Femon įskiepas nepasiekiamas"
+
+msgid "basic"
+msgstr "Standartinis"
+
+msgid "transponder"
+msgstr "Siųstuvas"
+
+msgid "stream"
+msgstr "Srautas"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Klasikinis"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "Hide main menu entry"
+msgstr "Paslėpti pagrindinio meniu įrašus"
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "Nustatyti pagrindinio meniu įrašų paslėpimą."
+
+msgid "Default display mode"
+msgstr "Numatytasis rodymo būdas"
+
+msgid "Define the default display mode at startup."
+msgstr "Nustatyti numatytąjį rodymo būdą paleidžiant."
+
+msgid "Define the used OSD skin."
+msgstr "Nustatyti naudojamą ekrano apvalkalą."
+
+msgid "Define the used OSD theme."
+msgstr "Nustatyti naudojamą ekrano temą."
+
+msgid "Position"
+msgstr "Pozicija"
+
+msgid "Define the position of OSD."
+msgstr "Nustatyti ekrano užsklandos poziciją."
+
+msgid "Downscale OSD size [%]"
+msgstr ""
+
+msgid "Define the downscale ratio for OSD size."
+msgstr ""
+
+msgid "Red limit [%]"
+msgstr "Raudonoji ribą [%]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "Nustatyti raudonos juostos ribą, kuri naudojama blogo signalo indikacijai."
+
+msgid "Green limit [%]"
+msgstr "Žalioji riba [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "Nustatyti žalios juostos ribą, kuri naudojama gero signalo indikacijai."
+
+msgid "OSD update interval [0.1s]"
+msgstr "Ekrano užsklandos atnaujinimo intervalas [0.1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "Nustatyti ekrano užsklandos atnaujinimo intervalą. Mažesnis intervalas labiau apkrauna centrinį procesorių (CPU)."
+
+msgid "Analyze stream"
+msgstr "Analizuoti srautą"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "Nurodyti ar DVB srautas turi būti analizuojamas bei jo kokybė išskaičiuojama."
+
+msgid "Calculation interval [0.1s]"
+msgstr "Apskaitos intervalos [0.1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "Nustatyti apskaitos intervalą. Kuo didesnis intervalas, tuo tikslesni duomenys."
+
+msgid "Use SVDRP service"
+msgstr "Naudoti SVDRP paslaugą"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "Nurodyti ar SVDRP paslauga naudojama kliento/serverio nustatymuose."
+
+msgid "SVDRP service port"
+msgstr "SVDRP įrenginio portas"
+
+msgid "Define the port number of SVDRP service."
+msgstr "Nustatyti SVDRP įrenginio prievadą."
+
+msgid "SVDRP service IP"
+msgstr "SVDRP įrenginio IP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "Nustatyti SVDRP įrenginio IP adresą."
+
+msgid "Help"
+msgstr "Pagalba"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Transponder Information"
+msgstr "Siųstuvo informacija"
+
+msgid "Apid"
+msgstr "Apid"
+
+msgid "Dpid"
+msgstr "Dpid"
+
+msgid "Spid"
+msgstr "Spid"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Coderate"
+msgstr "Kodavimo dažnis"
+
+msgid "Stream Information"
+msgstr "Srauto informacija"
+
+msgid "Video Stream"
+msgstr "Video srautas"
+
+msgid "Codec"
+msgstr "Kodekas"
+
+msgid "Bitrate"
+msgstr "Kokybė"
+
+msgid "Aspect Ratio"
+msgstr "Proporcijos"
+
+msgid "Frame Rate"
+msgstr "Kadrų dažnis"
+
+msgid "Video Format"
+msgstr "Video formatas"
+
+msgid "Resolution"
+msgstr "Rezoliucija"
+
+msgid "Audio Stream"
+msgstr "Audio srautas"
+
+msgid "Channel Mode"
+msgstr "kanalo būsena"
+
+msgid "Sampling Frequency"
+msgstr "Parodomasis dažnis"
+
+msgid "AC-3 Stream"
+msgstr "AC-3 srautas"
+
+msgid "Bit Stream Mode"
+msgstr "Bitstream būsena"
+
+msgid "Audio Coding Mode"
+msgstr "Audio kodavimas"
+
+msgid "Center Mix Level"
+msgstr "Centerinis Mix lygis"
+
+msgid "Surround Mix Level"
+msgstr "Surround Mix lygis"
+
+msgid "Dolby Surround Mode"
+msgstr "Dolby Surround būklė"
+
+msgid "Low Frequency Effects"
+msgstr "Žemo dažnio efektai"
+
+msgid "Dialogue Normalization"
+msgstr "Dialogo normalizacija"
+
+msgid "Fixed"
+msgstr "Fest"
+
+msgid "Analog"
+msgstr "Analog"
+
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layer I"
+
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"
+
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"
+
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"
+
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"
+
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"
+
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
+
+msgid "stereo"
+msgstr "stereo"
+
+msgid "joint Stereo"
+msgstr "jungtinis stereo"
+
+msgid "dual"
+msgstr "dvigubas"
+
+msgid "mono"
+msgstr "mono"
+
+msgid "interlaced"
+msgstr "persipynęs (interlaced)"
+
+msgid "progressive"
+msgstr "progresyvinis"
+
+msgid "reserved"
+msgstr "belegt"
+
+msgid "extended"
+msgstr "išplėstas"
+
+msgid "unknown"
+msgstr "nežinomas"
+
+msgid "component"
+msgstr "komponentas"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Complete Main (CM)"
+msgstr "Pilnai pagrindinis (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Muzika ir efektai (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr " (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr " (HI)"
+
+msgid "Dialogue (D)"
+msgstr "Dialogas (D)"
+
+msgid "Commentary (C)"
+msgstr "Komentavimas (C)"
+
+msgid "Emergency (E)"
+msgstr "Avarinis (E)"
+
+msgid "Voice Over (VO)"
+msgstr "Voice over (VO)"
+
+msgid "Karaoke"
+msgstr "Karaoke"
+
+msgid "Ch1"
+msgstr "Kan1"
+
+msgid "Ch2"
+msgstr "Kan2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "L"
+
+msgid "R"
+msgstr "R"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SL"
+
+msgid "SR"
+msgstr "SR"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "nerasta"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "free"
+msgstr "frei"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,533 +1,383 @@
 # 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"
-"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"
+"Project-Id-Version: femon 1.7.8\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Vyacheslav Dikonov\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Russian <vdr@linuxtv.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "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><>"
-
-#: 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>"
-
-#: femon.c:308
-msgid "top"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femon.c:309
-msgid "Height"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-#: femon.c:310
-msgid "Horizontal offset"
+msgid "Define the position of OSD."
 msgstr ""

-#: femon.c:311
-msgid "Show CA system"
+msgid "Downscale OSD size [%]"
+msgstr ""
+
+msgid "Define the downscale ratio for OSD size."
 msgstr ""

-#: femon.c:312
 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"
-msgstr "<22><><EFBFBD>"
-
-#: femonosd.c:487
 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"
+msgid "MPEG-2"
 msgstr ""

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

-#: femontools.c:195
-msgid "Irdeto"
+msgid "MPEG-1 Layer I"
 msgstr ""

-#: femontools.c:196
-msgid "NDS/Videoguard"
+msgid "MPEG-1 Layer II"
 msgstr ""

-#: femontools.c:197
-msgid "Conax"
+msgid "MPEG-1 Layer III"
 msgstr ""

-#: femontools.c:198
-msgid "CryptoWorks"
+msgid "MPEG-2 Layer I"
 msgstr ""

-#: femontools.c:199
-msgid "PowerVu"
+msgid "MPEG-2 Layer II"
 msgstr ""

-#: femontools.c:200 femontools.c:202
-msgid "NagraVision"
+msgid "MPEG-2 Layer III"
 msgstr ""

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

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

-#: femontools.c:211 femontools.c:259
-msgid "None"
-msgstr "<22><><EFBFBD>"
+msgid "stereo"
+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 "<22><><EFBFBD><EFBFBD>"
+msgid "joint Stereo"
+msgstr ""

-#: femontools.c:238 femontools.c:239 femontools.c:240 femontools.c:391
-msgid "MHz"
-msgstr "<22><><EFBFBD>"
+msgid "dual"
+msgstr ""
+
+msgid "mono"
+msgstr ""
+
+msgid "interlaced"
+msgstr ""
+
+msgid "progressive"
+msgstr ""

-#: femontools.c:297 femontools.c:354 femontools.c:365 femontools.c:376
-#: femontools.c:398 femontools.c:407
 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 "MHz"
+msgstr "<22><><EFBFBD>"
+
 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/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -0,0 +1,383 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Nan Feng VDR <nfgx@21cn.com>, 2009.2
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: femon 1.7.8\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"Last-Translator: NanFeng <nfgx@21cn.com>\n"
+"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "卫星信号信息显示(OSD)"
+
+msgid "Signal Information"
+msgstr "频道信息浏览"
+
+msgid "Femon not available"
+msgstr "Femon插件无法使用"
+
+msgid "basic"
+msgstr "基本"
+
+msgid "transponder"
+msgstr "转发器"
+
+msgid "stream"
+msgstr "数据流"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "经典"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "双色调"
+
+msgid "SilverGreen"
+msgstr "银绿"
+
+msgid "Hide main menu entry"
+msgstr "隐藏主菜单条目."
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "确定是否进入主菜单是隐藏的."
+
+msgid "Default display mode"
+msgstr "默认启动时显示模式."
+
+msgid "Define the default display mode at startup."
+msgstr "定义默认启动时显示模式."
+
+msgid "Define the used OSD skin."
+msgstr "确定使用的菜单皮肤."
+
+msgid "Define the used OSD theme."
+msgstr "确定使用的菜单主题."
+
+msgid "Position"
+msgstr "位置"
+
+msgid "Define the position of OSD."
+msgstr "确定菜单的位置."
+
+msgid "Downscale OSD size [%]"
+msgstr ""
+
+msgid "Define the downscale ratio for OSD size."
+msgstr ""
+
+msgid "Red limit [%]"
+msgstr "红限制[ ％ ]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "定义一个限制红键，这是用来表示一个坏的信号."
+
+msgid "Green limit [%]"
+msgstr "绿限制[ ％ ]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "定义一个限制的绿色键，这是用来表示一个良好的信号."
+
+msgid "OSD update interval [0.1s]"
+msgstr "菜单更新间隔时间 [0.1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "确定一个OSD的更新时间间隔.较小的间隔产生较高的CPU负载."
+
+msgid "Analyze stream"
+msgstr "分析流"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "确定是否DVB流分析和比特率计算."
+
+msgid "Calculation interval [0.1s]"
+msgstr "计算时间间隔 [0.1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "定义一个时间间隔来计算.更大的时间价格产生将更稳定."
+
+msgid "Use SVDRP service"
+msgstr "使用SVDRP服务"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "定义是否SVDRP服务是用来在客户机/服务器的设置."
+
+msgid "SVDRP service port"
+msgstr "SVDRP服务端口"
+
+msgid "Define the port number of SVDRP service."
+msgstr "定义SVDRP服务的端口号."
+
+msgid "SVDRP service IP"
+msgstr "SVDRP服务的IP地址"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "定义SVDRP服务的IP地址."
+
+msgid "Help"
+msgstr "帮助"
+
+msgid "Video"
+msgstr "视频"
+
+msgid "Audio"
+msgstr "音频"
+
+msgid "Transponder Information"
+msgstr "转发器信息"
+
+msgid "Apid"
+msgstr "Apid"
+
+msgid "Dpid"
+msgstr "Dpid"
+
+msgid "Spid"
+msgstr "Spid"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Coderate"
+msgstr "码速率"
+
+msgid "Stream Information"
+msgstr "流信息"
+
+msgid "Video Stream"
+msgstr "视频流"
+
+msgid "Codec"
+msgstr "解码模式"
+
+msgid "Bitrate"
+msgstr "比特率"
+
+msgid "Aspect Ratio"
+msgstr "纵横比"
+
+msgid "Frame Rate"
+msgstr "帧速率"
+
+msgid "Video Format"
+msgstr "视频制式"
+
+msgid "Resolution"
+msgstr "分辨率"
+
+msgid "Audio Stream"
+msgstr "音频流"
+
+msgid "Channel Mode"
+msgstr "声道模式"
+
+msgid "Sampling Frequency"
+msgstr "采样频率"
+
+msgid "AC-3 Stream"
+msgstr "AC-3流"
+
+msgid "Bit Stream Mode"
+msgstr "比特流模式"
+
+msgid "Audio Coding Mode"
+msgstr "音频编码模式"
+
+msgid "Center Mix Level"
+msgstr "中心混合级别"
+
+msgid "Surround Mix Level"
+msgstr "环绕混合级别"
+
+msgid "Dolby Surround Mode"
+msgstr "杜比环绕声模式"
+
+msgid "Low Frequency Effects"
+msgstr "低频效果"
+
+msgid "Dialogue Normalization"
+msgstr "对话正常化"
+
+msgid "Fixed"
+msgstr "固定"
+
+msgid "Analog"
+msgstr "模拟"
+
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layer I"
+
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"
+
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"
+
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"
+
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"
+
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"
+
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
+
+msgid "stereo"
+msgstr "立体声"
+
+msgid "joint Stereo"
+msgstr "联合立体声"
+
+msgid "dual"
+msgstr "双重"
+
+msgid "mono"
+msgstr "单声道"
+
+msgid "interlaced"
+msgstr "隔行扫描"
+
+msgid "progressive"
+msgstr "进步"
+
+msgid "reserved"
+msgstr "保留"
+
+msgid "extended"
+msgstr "扩展"
+
+msgid "unknown"
+msgstr "未知"
+
+msgid "component"
+msgstr "组件"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "赫兹"
+
+msgid "Complete Main (CM)"
+msgstr "完成主要 (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "音乐和效果 (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "视障 (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "听障 (HI)"
+
+msgid "Dialogue (D)"
+msgstr "对话 (D)"
+
+msgid "Commentary (C)"
+msgstr "评论 (C)"
+
+msgid "Emergency (E)"
+msgstr "紧急 (E)"
+
+msgid "Voice Over (VO)"
+msgstr "旁白 (VO)"
+
+msgid "Karaoke"
+msgstr "卡拉OK"
+
+msgid "Ch1"
+msgstr "Ch1"
+
+msgid "Ch2"
+msgstr "Ch2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "L"
+
+msgid "R"
+msgstr "R"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SL"
+
+msgid "SR"
+msgstr "SR"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "没有说明"
+
+msgid "MHz"
+msgstr "兆赫兹"
+
+msgid "free"
+msgstr "免费"
+
+msgid "Mbit/s"
+msgstr "兆位/秒"
+
+msgid "kbit/s"
+msgstr "千字节/秒"
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -0,0 +1,383 @@
+# VDR plugin language source file. 
+# Copyright (C) 2007 Rolf Ahrenberg 
+# This file is distributed under the same license as the femon package. 
+# Nan Feng VDR <nfgx@21cn.com>, 2009.2 
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: femon 1.7.8\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"Last-Translator: NanFeng <nfgx@21cn.com>\n"
+"Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "衛星信號信息顯示(OSD)"
+
+msgid "Signal Information"
+msgstr "頻道信息瀏覽"
+
+msgid "Femon not available"
+msgstr "Femon插件無法使用"
+
+msgid "basic"
+msgstr "基本"
+
+msgid "transponder"
+msgstr "轉發器"
+
+msgid "stream"
+msgstr "數據流"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "經典"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "雙色調"
+
+msgid "SilverGreen"
+msgstr "銀綠"
+
+msgid "Hide main menu entry"
+msgstr "隱藏主菜單條目."
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "確定是否進入主菜單是隱藏的."
+
+msgid "Default display mode"
+msgstr "默認啟動時顯示模式."
+
+msgid "Define the default display mode at startup."
+msgstr "定義默認啟動時顯示模式."
+
+msgid "Define the used OSD skin."
+msgstr "確定使用的菜單皮膚."
+
+msgid "Define the used OSD theme."
+msgstr "確定使用的菜單主題."
+
+msgid "Position"
+msgstr "位置"
+
+msgid "Define the position of OSD."
+msgstr "確定菜單的位置."
+
+msgid "Downscale OSD size [%]"
+msgstr ""
+
+msgid "Define the downscale ratio for OSD size."
+msgstr ""
+
+msgid "Red limit [%]"
+msgstr "紅限制[ ％ ]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "定義一個限制紅鍵，這是用來表示一個壞的信號."
+
+msgid "Green limit [%]"
+msgstr "綠限制[ ％ ]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "定義一個限制的綠色鍵，這是用來表示一個良好的信號."
+
+msgid "OSD update interval [0.1s]"
+msgstr "菜單更新間隔時間[0.1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "確定一個OSD的更新時間間隔.較小的間隔產生較高的CPU負載."
+
+msgid "Analyze stream"
+msgstr "分析流"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "確定是否DVB流分析和比特率計算."
+
+msgid "Calculation interval [0.1s]"
+msgstr "計算時間間隔[0.1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "定義一個時間間隔來計算.更大的時間價格產生將更穩定."
+
+msgid "Use SVDRP service"
+msgstr "使用SVDRP服務"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "定義是否SVDRP服務是用來在客戶機/服務器的設置."
+
+msgid "SVDRP service port"
+msgstr "SVDRP服務端口"
+
+msgid "Define the port number of SVDRP service."
+msgstr "定義SVDRP服務的端口號."
+
+msgid "SVDRP service IP"
+msgstr "SVDRP服務的IP地址"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "定義SVDRP服務的IP地址."
+
+msgid "Help"
+msgstr "幫助"
+
+msgid "Video"
+msgstr "視頻"
+
+msgid "Audio"
+msgstr "音頻"
+
+msgid "Transponder Information"
+msgstr "轉發器信息"
+
+msgid "Apid"
+msgstr "Apid"
+
+msgid "Dpid"
+msgstr "Dpid"
+
+msgid "Spid"
+msgstr "Spid"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Coderate"
+msgstr "碼速率"
+
+msgid "Stream Information"
+msgstr "流信息"
+
+msgid "Video Stream"
+msgstr "視頻流"
+
+msgid "Codec"
+msgstr "解碼模式"
+
+msgid "Bitrate"
+msgstr "比特率"
+
+msgid "Aspect Ratio"
+msgstr "縱橫比"
+
+msgid "Frame Rate"
+msgstr "幀速率"
+
+msgid "Video Format"
+msgstr "視頻制式"
+
+msgid "Resolution"
+msgstr "分辨率"
+
+msgid "Audio Stream"
+msgstr "音頻流"
+
+msgid "Channel Mode"
+msgstr "聲道模式"
+
+msgid "Sampling Frequency"
+msgstr "採樣頻率"
+
+msgid "AC-3 Stream"
+msgstr "AC-3流"
+
+msgid "Bit Stream Mode"
+msgstr "比特流模式"
+
+msgid "Audio Coding Mode"
+msgstr "音頻編碼模式"
+
+msgid "Center Mix Level"
+msgstr "中心混合級別"
+
+msgid "Surround Mix Level"
+msgstr "環繞混合級別"
+
+msgid "Dolby Surround Mode"
+msgstr "杜比環繞聲模式"
+
+msgid "Low Frequency Effects"
+msgstr "低頻效果"
+
+msgid "Dialogue Normalization"
+msgstr "對話正常化"
+
+msgid "Fixed"
+msgstr "固定"
+
+msgid "Analog"
+msgstr "模擬"
+
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layer I"
+
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"
+
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"
+
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"
+
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"
+
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"
+
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
+
+msgid "stereo"
+msgstr "立體聲"
+
+msgid "joint Stereo"
+msgstr "聯合立體聲"
+
+msgid "dual"
+msgstr "雙重"
+
+msgid "mono"
+msgstr "單聲道"
+
+msgid "interlaced"
+msgstr "隔行掃描"
+
+msgid "progressive"
+msgstr "進步"
+
+msgid "reserved"
+msgstr "保留"
+
+msgid "extended"
+msgstr "擴展"
+
+msgid "unknown"
+msgstr "未知"
+
+msgid "component"
+msgstr "組件"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "赫茲"
+
+msgid "Complete Main (CM)"
+msgstr "完成主要(CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "音樂和效果(ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "視障(VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "聽障(HI)"
+
+msgid "Dialogue (D)"
+msgstr "對話(D)"
+
+msgid "Commentary (C)"
+msgstr "評論(C)"
+
+msgid "Emergency (E)"
+msgstr "緊急(E)"
+
+msgid "Voice Over (VO)"
+msgstr "旁白(VO)"
+
+msgid "Karaoke"
+msgstr "卡拉OK"
+
+msgid "Ch1"
+msgstr "Ch1"
+
+msgid "Ch2"
+msgstr "Ch2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "L"
+
+msgid "R"
+msgstr "R"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SL"
+
+msgid "SR"
+msgstr "SR"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "沒有說明"
+
+msgid "MHz"
+msgstr "兆赫茲"
+
+msgid "free"
+msgstr "免費"
+
+msgid "Mbit/s"
+msgstr "兆位/秒"
+
+msgid "kbit/s"
+msgstr "千字節/秒"
--- a/symbols/eight.xpm
+++ b/symbols/eight.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const eight_xpm[] = {
+"15 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++",
+"..............+",
+".....++++.....+",
+"....++++++....+",
+"....++..++....+",
+"...++....++...+",
+"...++....++...+",
+"....++..++....+",
+".....++++.....+",
+".....++++.....+",
+"....++..++....+",
+"...++....++...+",
+"...++....++...+",
+"....++..++....+",
+"....++++++....+",
+".....++++.....+",
+"..............+",
+"+++++++++++++++"};
--- 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/format1080.xpm
+++ b/symbols/format1080.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const format1080_xpm[] = {
+"40 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++++++++++",
+"+......................................+",
+"+......++...++++.....++++.....++++.....+",
+"+...+++++..++++++...++++++...++++++....+",
+"+...+++++..++..++...++..++...++..++....+",
+"+......++.++....++.++....++.++....++...+",
+"+......++.++....++.++....++.++....++...+",
+"+......++.++....++..++..++..++....++...+",
+"+......++.++....++...++++...++....++...+",
+"+......++.++....++...++++...++....++...+",
+"+......++.++....++..++..++..++....++...+",
+"+......++.++....++.++....++.++....++...+",
+"+......++.++....++.++....++.++....++...+",
+"+......++..++..++...++..++...++..++....+",
+"+......++..++++++...++++++...++++++....+",
+"+......++...++++.....++++.....++++.....+",
+"+......................................+",
+"++++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/format480.xpm
+++ b/symbols/format480.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const format480_xpm[] = {
+"35 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++++++++",
+"+.................................+",
+"+.........++....++++.....++++.....+",
+"+........+++...++++++...++++++....+",
+"+.......++++...++..++...++..++....+",
+"+......++.++..++....++.++....++...+",
+"+.....++..++..++....++.++....++...+",
+"+.....++..++...++..++..++....++...+",
+"+....++...++....++++...++....++...+",
+"+...++....++....++++...++....++...+",
+"+...+++++++++..++..++..++....++...+",
+"+...+++++++++.++....++.++....++...+",
+"+.........++..++....++.++....++...+",
+"+.........++...++..++...++..++....+",
+"+.........++...++++++...++++++....+",
+"+.........++....++++.....++++.....+",
+"+.................................+",
+"+++++++++++++++++++++++++++++++++++"};
--- a/symbols/format576.xpm
+++ b/symbols/format576.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const format576_xpm[] = {
+"33 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"+++++++++++++++++++++++++++++++++",
+"+...............................+",
+"+...+++++++.++++++++..++++++....+",
+"+...+++++++.++++++++.++++++++...+",
+"+...++......++....++.+++...++...+",
+"+...++............++.++.........+",
+"+...++...........+++.++.........+",
+"+...++++++.......++..++.+++.....+",
+"+...+++++++......++..+++++++....+",
+"+...++...+++....+++..+++..+++...+",
+"+.........++....++...++....++...+",
+"+.........++....++...++....++...+",
+"+...++....++...+++...++....++...+",
+"+...++...+++...++....+++..+++...+",
+"+...+++++++....++....+++++++....+",
+"+....+++++.....++.....+++++.....+",
+"+...............................+",
+"+++++++++++++++++++++++++++++++++"};
--- a/symbols/format720.xpm
+++ b/symbols/format720.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const format720_xpm[] = {
+"34 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	d9f977e302	Updated HISTORY.	2010-12-27 10:30:43 +02:00
Rolf Ahrenberg	ebfc153940	Added support for LDFLAGS.	2010-12-14 19:25:09 +02:00
Rolf Ahrenberg	f3c52fab6e	Tweaked translation files.	2010-12-08 10:47:24 +02:00
Rolf Ahrenberg	b682dbf0fe	Updated translation files.	2010-12-04 19:06:15 +02:00
Rolf Ahrenberg	b4673bdece	Fixed detection of replaying.	2010-10-29 21:16:01 +03:00
Rolf Ahrenberg	c3b0254b2e	Added Makefile depencency for objects.	2010-10-11 23:27:30 +03:00
Rolf Ahrenberg	b8c7fdddb7	Updated for vdr-1.7.16.	2010-09-19 23:19:33 +03:00
Rolf Ahrenberg	23a8a72c38	Modified LATM parser.	2010-06-23 20:12:35 +03:00
Rolf Ahrenberg	f37f428670	Added preliminary support for LATM.	2010-06-23 12:16:17 +03:00
Rolf Ahrenberg	3235c67256	Fixed a crash in femon service (Thanks to Wolfgang Astleitner).	2010-05-31 16:55:19 +03:00
Rolf Ahrenberg	a21ed98163	Updated Italian translation (Thanks to Diego Pierotto).	2010-03-31 14:44:39 +03:00
Rolf Ahrenberg	0b38358442	Fixed a typo.	2010-03-09 15:31:18 +02:00
Rolf Ahrenberg	9c085fea51	Fixed device switching.	2010-03-06 22:01:42 +02:00
Rolf Ahrenberg	dfc66b3d69	Updated the femonclient plugin.	2010-03-04 22:54:45 +02:00
Rolf Ahrenberg	252bd0e479	Added parsing for a missing setup option.	2010-03-04 22:49:19 +02:00
Rolf Ahrenberg	7657d21d5e	Updated CXXFLAGS.	2010-03-04 12:58:25 +02:00
Rolf Ahrenberg	7b004e9427	Updated Estonian translation (Thanks to Arthur Konovalov).	2010-03-04 12:55:18 +02:00
Rolf Ahrenberg	a08f9de9d3	Updated for vdr-1.7.13.	2010-02-28 21:42:06 +02:00
Rolf Ahrenberg	513791d5f1	Added a setup option to downscale the OSD size.	2010-02-25 20:33:20 +02:00
Rolf Ahrenberg	60386835dd	Updated for vdr-1.7.12.	2010-02-01 13:48:28 +02:00
Rolf Ahrenberg	38f4d3d9b8	Added Lithuanian translation (Thanks to Valdemaras Pipiras).	2009-12-14 16:47:16 +02:00
Rolf Ahrenberg	078f0552fc	Fixed a typo.	2009-11-25 16:03:41 +02:00
Rolf Ahrenberg	1fd7c90c3b	Updated Estonian translation (Thanks to Arthur Konovalov). Updated version number.	2009-11-23 15:11:37 +02:00
Rolf Ahrenberg	44fa48c59f	Added debug() and error() macros.	2009-10-01 12:13:35 +03:00
Rolf Ahrenberg	554dac9674	Increased video buffer size, added buffer timeouts and fixed deleting AC3 buffer data.	2009-09-29 15:31:32 +03:00
Rolf Ahrenberg	8267abcc3b	Revert "Changed cRingBufferLinear to cRingBufferFrame." This reverts commit `edb8b4090a`.	2009-09-27 16:59:42 +03:00
Rolf Ahrenberg	ea4561a874	Silenced a compilation warning.	2009-09-26 12:15:26 +03:00
Rolf Ahrenberg	56b9b89204	Cleaned up translations and warnings.	2009-09-26 11:54:31 +03:00
Rolf Ahrenberg	3d994be0b7	Cosmetics.	2009-09-25 22:31:12 +03:00
Rolf Ahrenberg	b7d44e730e	Added Chinese translation (Thanks to NanFeng).	2009-09-24 17:28:02 +03:00
Rolf Ahrenberg	edb8b4090a	Changed cRingBufferLinear to cRingBufferFrame.	2009-09-22 20:37:15 +03:00
Rolf Ahrenberg	21d9c20beb	Removed bitstream parsing from Receive() method. Refactored the error logging from unimplemented ioctl functions.	2009-09-22 08:44:30 +03:00
Rolf Ahrenberg	080f390a75	Remove compilation warnings.	2009-09-16 12:05:15 +03:00
Rolf Ahrenberg	fefb7f0fde	Removed error logging from unimplemented ioctl functions.	2009-09-16 09:37:51 +03:00
Rolf Ahrenberg	ba133f15f8	Changed H.264 parser to show display aspect ratio.	2009-09-15 10:57:53 +03:00
Rolf Ahrenberg	4e87693de6	Tweaked symbols.	2009-09-05 01:22:27 +03:00
Rolf Ahrenberg	8ea980a60f	Fixed symbols.	2009-09-05 01:05:17 +03:00
Rolf Ahrenberg	5635c2dc52	Fixed debug print output.	2009-09-04 10:47:19 +03:00
Rolf Ahrenberg	7551788969	Changed bitrate to bit/s instead of Mbit/s.	2009-09-04 08:44:33 +03:00
Rolf Ahrenberg	6b6169d5f3	Disabled temporarily SEI in H.264 bitstream parser.	2009-09-03 18:24:51 +03:00
Rolf Ahrenberg	22644e6ae4	Header cleanup.	2009-09-03 18:20:31 +03:00
Rolf Ahrenberg	3fc73af3d5	Added non-strict limits for 1080/720/576/480 format symbols.	2009-09-03 18:15:04 +03:00
Rolf Ahrenberg	c07abc7ed5	Added 1080/720/576/480 symbols into status window.	2009-09-02 15:58:30 +03:00
Rolf Ahrenberg	e57b36a151	Fixed H.264 bitstream parser. Added a mutex to receiver class.	2009-09-01 15:30:48 +03:00
Rolf Ahrenberg	453ca7a2a5	Fixed H.264 bitstream parsing.	2009-08-31 19:12:15 +03:00
Rolf Ahrenberg	daf823435b	Changed to use VDR's core translations.	2009-08-29 21:01:20 +03:00
Rolf Ahrenberg	53b42a2d4a	Fixed H.264 parser.	2009-08-28 20:54:34 +03:00
Rolf Ahrenberg	167da08ab3	Silenced compiler warnings.	2009-08-26 22:44:49 +03:00
Rolf Ahrenberg	61ff96556e	Fixed bitstream parser for H.264.	2009-08-26 16:24:49 +03:00
Rolf Ahrenberg	a06ae6f6ff	Added PES assembler.	2009-08-25 20:22:06 +03:00
Rolf Ahrenberg	2e6a236a56	Removed OSD offset and height options.	2009-07-08 23:14:19 +03:00
Rolf Ahrenberg	6086c135c7	Added missing MINFONTSIZE and MAXFONTSIZE defines.	2009-06-18 23:08:25 +03:00
Rolf Ahrenberg	db9735b80b	Cleaned up compilation warnings.	2009-06-18 17:38:27 +03:00
Rolf Ahrenberg	84878bd1b9	Cleaned up compilation warnings.	2009-06-18 17:35:35 +03:00
Rolf Ahrenberg	afd72642e9	Fixed font handling to be thread-safe.	2009-06-18 12:16:11 +03:00
Rolf Ahrenberg	0a162a9a8c	Cleaned up compilation warnings.	2009-03-24 12:51:51 +02:00
Rolf Ahrenberg	2e2aacd573	Fixed end of sequence NAL unit.	2009-02-11 14:51:55 +02:00
Rolf Ahrenberg	4e8fdaf99f	Fixed closing of frontend file handles.	2009-01-06 23:10:02 +02:00
Rolf Ahrenberg	eb2da4721c	Added whitespace cleanups.	2008-12-16 12:51:59 +02:00
Rolf Ahrenberg	5cf9b4af0b	Updated for vdr-1.7.2. Removed the "Show CA system" setup option.	2008-12-16 12:26:46 +02:00
Rolf Ahrenberg	83556bf2d3	Added whitespace cleanups. Changed info window to use the channel source instead of the frontend type.	2008-12-13 22:25:26 +02:00
Rolf Ahrenberg	2340ade6c8	Updated HISTORY.	2008-11-30 15:18:12 +02:00
Rolf Ahrenberg	7db77978b5	Fixed partially H.264 SEI parsing.	2008-11-29 19:33:29 +02:00
Rolf Ahrenberg	ab8f5f3de8	Fixed a deadlock in cFemonReceiver.	2008-11-23 22:26:48 +02:00
Rolf Ahrenberg	427b3023ba	Added some OSD tweaks.	2008-11-23 04:45:20 +02:00
Rolf Ahrenberg	8f283f27f5	Removed the FEMON_NTSC option.	2008-11-23 03:12:21 +02:00
Rolf Ahrenberg	c4fda38364	Replaced "Use single area (8bpp)" option with VDR's "Setup/OSD/Anti-alias".	2008-11-23 02:22:13 +02:00
Rolf Ahrenberg	219fc78226	Fixed a crash.	2008-11-23 02:01:27 +02:00
Rolf Ahrenberg	5333a9274d	Added getAC3Stream() function.	2008-11-22 23:12:39 +02:00
Rolf Ahrenberg	a8c065639a	Fixed a memory leak. Added a check for the minimum OSD height.	2008-11-12 17:58:32 +02:00
Rolf Ahrenberg	fa41c95b1c	Updated Italian translation (Thanks to Diego Pierotto).	2008-11-11 16:30:21 +02:00
Rolf Ahrenberg	6eb4329fff	Added getVideoStream() and getAudioStream() functions.	2008-11-11 00:30:00 +02:00
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