2023-10-10 13:36:53 +02:00
64 changed files with 4614 additions and 6900 deletions
--- a/89
+++ b/89
@ -1,3 +1,4 @@
+
 ===================================
 VDR Plugin 'femon' Revision History
 ===================================
@ -65,7 +66,6 @@ VDR Plugin 'femon' Revision History

 -  Backported changes and fixes from version 0.1.6.

-
 ===================================
 VDR Plugin 'femon' Revision History
 ===================================
@ -343,7 +343,6 @@ VDR Plugin 'femon' Revision History

 - Backported from 1.7.2.

-
 ===================================
 VDR Plugin 'femon' Revision History
 ===================================
@ -465,89 +464,3 @@ VDR Plugin 'femon' Revision History

 - Updated for vdr-1.7.40.
 - Updated French translation (Thanks to Bernard Jaulin).
-
-
-===================================
-VDR Plugin 'femon' Revision History
-===================================
-
-2013-04-01: Version 2.0.0
-
- Updated for vdr-2.0.0.
- Added Slovak translation (Thanks to Milan Hrala).
-
-2014-01-10: Version 2.0.1
-
- Fixed a crash in SVDRP (Thanks for Lothar Englisch for reporting).
- Fixed a memory leak and issues reported by scan-build tool.
-
-2014-01-18: Version 2.0.2
-
- Added initial support for CAMs.
-
-2014-03-08: Version 2.0.3
-
- Added support for SAT>IP devices.
-
-2014-03-15: Version 2.0.4
-
- Refactored the SAT>IP support.
-
-
-===================================
-VDR Plugin 'femon' Revision History
-===================================
-
-2014-03-16: Version 2.1.0
-
- Updated for vdr-2.1.6.
-
-2014-05-10: Version 2.1.1
-
- Fixed the channel frequency value.
-
-2015-01-10: Version 2.1.2
-
-
-===================================
-VDR Plugin 'femon' Revision History
-===================================
-
-2015-02-19: Version 2.2.0
-
- Updated for vdr-2.2.0.
- Updated CA definitions.
- Fixed the SVDRP service IP menu item (Thanks to Toerless Eckert).
- Fixed the detaching of receiver during a channel switch.
-
-2015-04-04: Version 2.2.1
-
- Got rid of FEMON_DEBUG.
- Added support for tracing modes.
- Removed the 'femonclient' plugin.
-
-
-===================================
-VDR Plugin 'femon' Revision History
-===================================
-
-2017-06-24: Version 2.3.0
-
- Updated for vdr-2.3.7.
- Added support for H.265 video codec.
- Fixed frontend handling during a device switch.
- Added Polish translation (Thanks to Tomasz Nowak).
- Updated German translation (Thanks to Andreas Brachold).
-
-
-===================================
-VDR Plugin 'femon' Revision History
-===================================
-
-2018-04-15: Version 2.4.0
-
- Updated for vdr-2.4.0.
-
-2019-xx-xx: Version 2.4.1
-
- Added signal level units (Thanks to Winfried).
--- a/46
+++ b/46
@ -2,6 +2,14 @@
 # Makefile for Frontend Status Monitor plugin
 #

+# Debugging on/off
+
+#FEMON_DEBUG = 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.
@ -16,7 +24,7 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
 ### The directory environment:

 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
@ -27,7 +35,6 @@ TMPDIR ?= /tmp

 export CFLAGS   = $(call PKGCFG,cflags)
 export CXXFLAGS = $(call PKGCFG,cxxflags)
-STRIP           ?= /bin/true

 ### The version number of VDR's plugin API:

@ -52,6 +59,10 @@ INCLUDES +=

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

+ifdef FEMON_DEBUG
+DEFINES += -DDEBUG
+endif
+
 ifneq ($(strip $(GITTAG)),)
 DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"'
 endif
@ -61,7 +72,7 @@ all-redirect: all

 ### The object files (add further files here):

-OBJS = $(PLUGIN).o aac.o ac3.o config.o h264.o h265.o latm.o mpeg.o osd.o receiver.o setup.o symbol.o tools.o
+OBJS = $(PLUGIN).o femonosd.o femonreceiver.o femoncfg.o femontools.o femonmpeg.o femonac3.o femonaac.o femonlatm.o femonh264.o femonsymbol.o

 ### The main target:

@ -70,15 +81,14 @@ all: $(SOFILE) i18n
 ### Implicit rules:

 %.o: %.c
-	@echo CC $@
-	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<

 ### Dependencies:

 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	$(Q)$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@

 -include $(DEPFILE)

@ -91,21 +101,17 @@ I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLU
 I18Npot   = $(PODIR)/$(PLUGIN).pot

 %.mo: %.po
-	@echo MO $@
-	$(Q)msgfmt -c -o $@ $<
+	msgfmt -c -o $@ $<

 $(I18Npot): $(wildcard *.c)
-	@echo GT $@
-	$(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`

 %.po: $(I18Npot)
-	@echo PO $@
-	$(Q)msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@

 $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@echo IN $@
-	$(Q)install -D -m644 $< $@
+	install -D -m644 $< $@

 .PHONY: i18n
 i18n: $(I18Nmo) $(I18Npot)
@ -115,13 +121,13 @@ install-i18n: $(I18Nmsgs)
 ### Targets:

 $(SOFILE): $(OBJS)
-	@echo LD $@
-	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
-	$(Q)$(STRIP) $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+ifndef FEMON_DEBUG
+	@$(STRIP) $@
+endif

 install-lib: $(SOFILE)
-	@echo IN $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
-	$(Q)install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

 install: install-lib install-i18n

@ -139,4 +145,4 @@ clean:

 .PHONY: cppcheck
 cppcheck:
-	$(Q)cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)
+	@cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)
--- a/18
+++ b/18
@ -34,14 +34,15 @@ Terminology:
 |## Channel Name ################### [SVDRP][AR][VF][A/DD][D]|
 |[=====Signal Strength ===================|=================]|
 |[=====Signal Quality ================|=====================]|
-|  STR: 0   CNR: 0   BER: 0   PER: 0   Video: 0   Audio: 0   |
+| STR: #0000 (0%)       BER: #00000000       Video: 0 Mbit/s |
+| SNR: #0000 (0%)       UNC: #00000000       Audio: 0 kbit/s |
 | [LOCK]     [SIGNAL]     [CARRIER]     [VITERBI]     [SYNC] |
 --------------------------------------------------------------

-STR     - Signal strength in dBm/dBuV/dbV
-CNR     - Signal-to-noise ratio of the main carrier in dB
-BER     - Bit error rate after the forward error correction (FEC) done by inner code block
-PER     - Block error rate after the outer forward error correction coding
+STR     - Signal strength from driver
+SNR     - Signal-to-noise ratio from driver
+BER     - Bit error rate
+UNC     - Uncorrected blocks
 Video   - Calculated video bitrate in Mbit/s
 Audio   - Calculated audio / AC-3 bitrate in kbit/s

@ -70,8 +71,13 @@ Left/Right    - Switch to next/previous device that provides the current channel

 Installation:

+cd /put/your/path/here/VDR/PLUGINS/src
 tar -xzf /put/your/path/here/vdr-femon-X.Y.Z.tgz
-make -C femon-X.Y.Z install
+ln -s femon-X.Y.Z femon
+cd /put/your/path/here/VDR
+make
+make plugins
+./vdr -P femon

 Client-server architecture:

--- a/aac.h
+++ b/aac.h
@ -1,26 +0,0 @@
-/*
- * aac.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_AAC_H
-#define __FEMON_AAC_H
-
-#include "audio.h"
-
-class cFemonAAC {
-private:
-  cFemonAudioIf *audioHandlerM;
-
-  static int sampleRateS[16];
-
-public:
-  cFemonAAC(cFemonAudioIf *audioHandlerP);
-  virtual ~cFemonAAC();
-
-  bool processAudio(const uint8_t *bufP, int lenP);
-  };
-
-#endif //__FEMON_AAC_H
--- a/ac3.h
+++ b/ac3.h
@ -1,28 +0,0 @@
-/*
- * ac3.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_AC3_H
-#define __FEMON_AC3_H
-
-#include "audio.h"
-
-class cFemonAC3 {
-private:
-  cFemonAC3If *audioHandlerM;
-
-  static int bitrateS[32];
-  static int frequencieS[4];
-  static int frameS[3][32];
-
-public:
-  cFemonAC3(cFemonAC3If *audioHandlerP);
-  virtual ~cFemonAC3();
-
-  bool processAudio(const uint8_t *bufP, int lenP);
-  };
-
-#endif //__FEMON_AC3_H
--- a/config.h
+++ b/config.h
@ -1,147 +0,0 @@
-/*
- * config.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_CONFIG_H
-#define __FEMON_CONFIG_H
-
-#define MaxSvdrpIp 15 // xxx.xxx.xxx.xxx
-
-enum eFemonModes
-{
-  eFemonModeBasic,
-  eFemonModeTransponder,
-  eFemonModeStream,
-  eFemonModeAC3,
-  eFemonModeMaxNumber
-};
-
-enum eFemonSignalUnit
-{
-  eFemonSignalUnitdBm,
-  eFemonSignalUnitdBuV,
-  eFemonSignalUnitdBV,
-  eFemonSignalUnitMaxNumber
-};
-
-class cFemonConfig
-{
-private:
-  unsigned int traceModeM;
-  int hideMenuM;
-  int displayModeM;
-  int skinM;
-  int themeM;
-  int positionM;
-  int downscaleM;
-  int signalUnitM;
-  int redLimitM;
-  int greenLimitM;
-  int updateIntervalM;
-  int analyzeStreamM;
-  int calcIntervalM;
-  int useSvdrpM;
-  int svdrpPortM;
-  char svdrpIpM[MaxSvdrpIp + 1]; // must end with additional null
-
-public:
-  enum eTraceMode {
-    eTraceModeNormal  = 0x0000,
-    eTraceModeDebug1  = 0x0001,
-    eTraceModeDebug2  = 0x0002,
-    eTraceModeDebug3  = 0x0004,
-    eTraceModeDebug4  = 0x0008,
-    eTraceModeDebug5  = 0x0010,
-    eTraceModeDebug6  = 0x0020,
-    eTraceModeDebug7  = 0x0040,
-    eTraceModeDebug8  = 0x0080,
-    eTraceModeDebug9  = 0x0100,
-    eTraceModeDebug10 = 0x0200,
-    eTraceModeDebug11 = 0x0400,
-    eTraceModeDebug12 = 0x0800,
-    eTraceModeDebug13 = 0x1000,
-    eTraceModeDebug14 = 0x2000,
-    eTraceModeDebug15 = 0x4000,
-    eTraceModeDebug16 = 0x8000,
-    eTraceModeMask    = 0xFFFF
-  };
-  cFemonConfig();
-  unsigned int GetTraceMode(void) const { return traceModeM; }
-  bool IsTraceMode(eTraceMode modeP) const { return (traceModeM & modeP); }
-  int GetHideMenu(void) const { return hideMenuM; }
-  int GetDisplayMode(void) const { return displayModeM; }
-  int GetSkin(void) const { return skinM; }
-  int GetTheme(void) const { return themeM; }
-  int GetPosition(void) const { return positionM; }
-  int GetDownscale(void) const { return downscaleM; }
-  int GetSignalUnit(void) const { return signalUnitM; }
-  int GetRedLimit(void) const { return redLimitM; }
-  int GetGreenLimit(void) const { return greenLimitM; }
-  int GetUpdateInterval(void) const { return updateIntervalM; }
-  int GetAnalyzeStream(void) const { return analyzeStreamM; }
-  int GetCalcInterval(void) const { return calcIntervalM; }
-  int GetUseSvdrp(void) const { return useSvdrpM; }
-  int GetSvdrpPort(void) const { return svdrpPortM; }
-  const char *GetSvdrpIp(void) const { return svdrpIpM; }
-
-  void SetTraceMode(unsigned int modeP) { traceModeM = (modeP & eTraceModeMask); }
-  void SetHideMenu(int hideMenuP) { hideMenuM = hideMenuP; }
-  void SetDisplayMode(int displayModeP) { if (displayModeM < 0 || displayModeM >= eFemonModeMaxNumber) displayModeM = 0; else displayModeM = displayModeP; }
-  void SetSkin(int skinP) { skinM = skinP; }
-  void SetTheme(int themeP) { themeM = themeP; }
-  void SetPosition(int positionP) { positionM = positionP; }
-  void SetDownscale(int downscaleP) { downscaleM = downscaleP; }
-  void SetSignalUnit(int signalUnitP) { signalUnitM = signalUnitP; }
-  void SetRedLimit(int redLimitP) { redLimitM = redLimitP; }
-  void SetGreenLimit(int greenLimitP) { greenLimitM = greenLimitP; }
-  void SetUpdateInterval(int updateIntervalP) { updateIntervalM = updateIntervalP; }
-  void SetAnalyzeStream(int analyzeStreamP) { analyzeStreamM = analyzeStreamP; }
-  void SetCalcInterval(int calcIntervalP) { calcIntervalM = calcIntervalP; }
-  void SetUseSvdrp(int useSvdrpP) { useSvdrpM = useSvdrpP; }
-  void SetSvdrpPort(int svdrpPortP) { svdrpPortM = svdrpPortP; }
-  void SetSvdrpIp(const char *strP);
-};
-
-extern cFemonConfig FemonConfig;
-
-enum eFemonSkins
-{
-  eFemonSkinClassic,
-  eFemonSkinElchi,
-  eFemonSkinMaxNumber
-};
-
-enum eFemonThemes
-{
-  eFemonThemeClassic,
-  eFemonThemeElchi,
-  eFemonThemeSTTNG,
-  eFemonThemeDeepBlue,
-  eFemonThemeMoronimo,
-  eFemonThemeEnigma,
-  eFemonThemeEgalsTry,
-  eFemonThemeDuotone,
-  eFemonThemeSilverGreen,
-  eFemonThemePearlHD,
-  eFemonThemeMaxNumber
-};
-
-struct cFemonTheme
-{
-  int bpp;
-  unsigned int clrBackground;
-  unsigned int clrTitleBackground;
-  unsigned int clrTitleText;
-  unsigned int clrActiveText;
-  unsigned int clrInactiveText;
-  unsigned int clrRed;
-  unsigned int clrYellow;
-  unsigned int clrGreen;
-};
-
-extern const cFemonTheme FemonTheme[eFemonThemeMaxNumber];
-
-#endif // __FEMON_CONFIG_H
--- a/femon.c
+++ b/femon.c
@ -1,31 +1,28 @@
 /*
- * femon.c: Frontend Status Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 */

-#include <getopt.h>
 #include <vdr/menu.h>
 #include <vdr/remote.h>
 #include <vdr/player.h>
-
-#include "config.h"
+#include "femoncfg.h"
+#include "femonreceiver.h"
+#include "femonosd.h"
 #include "femonservice.h"
-#include "log.h"
-#include "osd.h"
-#include "tools.h"
-#include "setup.h"
+#include "femontools.h"

-#if defined(APIVERSNUM) && APIVERSNUM < 20400
-#error "VDR-2.4.0 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10740
+#error "VDR-1.7.40 API version or greater is required!"
 #endif

 #ifndef GITVERSION
 #define GITVERSION ""
 #endif

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

@ -43,13 +40,13 @@ public:
  virtual void Housekeeping(void);
  virtual void MainThreadHook(void) {}
  virtual cString Active(void) { return NULL; }
-  virtual const char *MainMenuEntry(void) { return (FemonConfig.GetHideMenu() ? NULL : tr(MAINMENUENTRY)); }
+  virtual const char *MainMenuEntry(void) { return (femonConfig.hidemenu ? NULL : tr(MAINMENUENTRY)); }
  virtual cOsdObject *MainMenuAction(void);
  virtual cMenuSetupPage *SetupMenu(void);
-  virtual bool SetupParse(const char *nameP, const char *valueP);
-  virtual bool Service(const char *idP, void *dataP);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  virtual bool Service(const char *Id, void *Data);
  virtual const char **SVDRPHelpPages(void);
-  virtual cString SVDRPCommand(const char *commandP, const char *optionP, int &replyCodeP);
+  virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
  };

 cPluginFemon::cPluginFemon()
@ -57,40 +54,24 @@ 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!
-  debug1("%s", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
 }

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

 const char *cPluginFemon::CommandLineHelp(void)
 {
  // Return a string that describes all known command line options.
-  return "  -t <mode>, --trace=<mode>  set the tracing mode\n";
+  return NULL;
 }

 bool cPluginFemon::ProcessArgs(int argc, char *argv[])
 {
  // Implement command line argument processing here if applicable.
-  static const struct option long_options[] = {
-    { "trace",    required_argument, NULL, 't' },
-    { NULL,       no_argument,       NULL,  0  }
-    };
-
-  cString server;
-  int c;
-  while ((c = getopt_long(argc, argv, "t:", long_options, NULL)) != -1) {
-    switch (c) {
-      case 't':
-           FemonConfig.SetTraceMode(strtol(optarg, NULL, 0));
-           break;
-      default:
-           return false;
-      }
-    }
  return true;
 }

@ -119,74 +100,52 @@ void cPluginFemon::Housekeeping(void)
 cOsdObject *cPluginFemon::MainMenuAction(void)
 {
  // Perform the action when selected from the main VDR menu.
-  debug1("%s", __PRETTY_FUNCTION__);
-  LOCK_CHANNELS_READ;
-  if (cControl::Control() || (Channels->Count() <= 0))
+  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;
 }

-cMenuSetupPage *cPluginFemon::SetupMenu(void)
-{
-  // Return a setup menu in case the plugin supports one.
-  return new cMenuFemonSetup;
-}
-
-bool cPluginFemon::SetupParse(const char *nameP, const char *valueP)
+bool cPluginFemon::SetupParse(const char *Name, const char *Value)
 {
  // Parse your own setup parameters and store their values.
-  if (!strcasecmp(nameP, "HideMenu"))
-     FemonConfig.SetHideMenu(atoi(valueP));
-  else if (!strcasecmp(nameP, "DisplayMode"))
-     FemonConfig.SetDisplayMode(atoi(valueP));
-  else if (!strcasecmp(nameP, "Position"))
-     FemonConfig.SetPosition(atoi(valueP));
-  else if (!strcasecmp(nameP, "Skin"))
-     FemonConfig.SetSkin(atoi(valueP));
-  else if (!strcasecmp(nameP, "Theme"))
-     FemonConfig.SetTheme(atoi(valueP));
-  else if (!strcasecmp(nameP, "Downscale"))
-     FemonConfig.SetDownscale(atoi(valueP));
-  else if (!strcasecmp(nameP, "RedLimit"))
-     FemonConfig.SetRedLimit(atoi(valueP));
-  else if (!strcasecmp(nameP, "GreenLimit"))
-     FemonConfig.SetGreenLimit(atoi(valueP));
-  else if (!strcasecmp(nameP, "UpdateInterval"))
-     FemonConfig.SetUpdateInterval(atoi(valueP));
-  else if (!strcasecmp(nameP, "AnalStream"))
-     FemonConfig.SetAnalyzeStream(atoi(valueP));
-  else if (!strcasecmp(nameP, "CalcInterval"))
-     FemonConfig.SetCalcInterval(atoi(valueP));
-  else if (!strcasecmp(nameP, "UseSvdrp"))
-     FemonConfig.SetUseSvdrp(atoi(valueP));
-  else if (!strcasecmp(nameP, "ServerPort"))
-     FemonConfig.SetSvdrpPort(atoi(valueP));
-  else if (!strcasecmp(nameP, "ServerIp"))
-     FemonConfig.SetSvdrpIp(valueP);
-  else if (!strcasecmp(nameP, "SignalUnit"))
-     FemonConfig.SetSignalUnit(atoi(valueP));
+  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, "Skin"))           femonConfig.skin           = atoi(Value);
+  else if (!strcasecmp(Name, "Theme"))          femonConfig.theme          = 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);
+  else if (!strcasecmp(Name, "AnalStream"))     femonConfig.analyzestream  = atoi(Value);
+  else if (!strcasecmp(Name, "CalcInterval"))   femonConfig.calcinterval   = atoi(Value);
+  else if (!strcasecmp(Name, "UseSvdrp"))       femonConfig.usesvdrp       = atoi(Value);
+  else if (!strcasecmp(Name, "ServerPort"))     femonConfig.svdrpport      = atoi(Value);
+  else if (!strcasecmp(Name, "ServerIp"))       strn0cpy(femonConfig.svdrpip, Value, sizeof(femonConfig.svdrpip));
  else
    return false;
+  if (femonConfig.displaymode < 0 || femonConfig.displaymode >= eFemonModeMaxNumber) femonConfig.displaymode = 0;

  return true;
 }

-bool cPluginFemon::Service(const char *idP, void *dataP)
+bool cPluginFemon::Service(const char *Id, void *Data)
 {
-  if (strcmp(idP, "FemonService-v1.1") == 0) {
-     if (dataP) {
-        FemonService_v1_1 *data = reinterpret_cast<FemonService_v1_1*>(dataP);
-        cDevice *dev = cDevice::ActualDevice();
-        if (!dev)
+  if (strcmp(Id,"FemonService-v1.0") == 0) {
+     if (Data) {
+        FemonService_v1_0 *data = reinterpret_cast<FemonService_v1_0*>(Data);
+        if (!cDevice::ActualDevice())
           return false;
+        cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
        data->fe_name = getFrontendName(dev);
        data->fe_status = getFrontendStatus(dev);
-        data->fe_cnr = getCNR(dev);
+        data->fe_snr = getSNR(dev);
        data->fe_signal = getSignal(dev);
        data->fe_ber = getBER(dev);
-        data->fe_per = getPER(dev);
+        data->fe_unc = getUNC(dev);
        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;
@ -220,104 +179,99 @@ const char **cPluginFemon::SVDRPHelpPages(void)
    "    Print the signal quality.",
    "SGNL <card index>\n"
    "    Print the signal strength from driver.",
-    "CNRA <card index>\n"
-    "    Print the carrier-to-noise ratio from driver.",
+    "SNRA <card index>\n"
+    "    Print the signal-to-noise ratio from driver.",
    "BERA <card index>\n"
-    "    Print the bit error rate from driver.",
-    "PERA <card index>\n"
-    "    Print the packet error rate from driver.",
+    "    Print the bit error rate.",
+    "UNCB <card index>\n"
+    "    Print the uncorrected blocks rate.",
    "VIBR\n"
    "    Print the current video bitrate [Mbit/s].",
    "AUBR\n"
    "    Print the current audio bitrate [kbit/s].",
    "DDBR\n"
    "    Print the current dolby bitrate [kbit/s].",
-    "TRAC [ <mode> ]\n"
-    "    Gets and/or sets used tracing mode.\n",
    NULL
    };
  return HelpPages;
 }

-cString cPluginFemon::SVDRPCommand(const char *commandP, const char *optionP, int &replyCodeP)
+cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
 {
-  cDevice *dev = cDevice::ActualDevice();
-  if (strcasecmp(commandP, "TRAC") == 0) {
-     if (optionP && *optionP)
-        FemonConfig.SetTraceMode(strtol(optionP, NULL, 0));
-     return cString::sprintf("Tracing mode: 0x%04X\n", FemonConfig.GetTraceMode());
-     }
-  if (*optionP && isnumber(optionP)) {
-     cDevice *dev2 = cDevice::GetDevice(int(strtol(optionP, NULL, 10)));
+  cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
+  if (*Option && isnumber(Option)) {
+     cDvbDevice *dev2 = dynamic_cast<cDvbDevice*>(cDevice::GetDevice(int(strtol(Option, NULL, 10))));
     if (dev2)
        dev = dev2;
     }
-  if (cReplayControl::NowReplaying() || !dev) {
-     replyCodeP = 550; // Requested action not taken
-     return cString("Cannot open femon plugin while replaying");
-     }
-  if (strcasecmp(commandP, "OPEN") == 0) {
+  if (strcasecmp(Command, "OPEN") == 0) {
+     if (cReplayControl::NowReplaying()) {
+        ReplyCode = 550; // Requested action not taken
+        return cString("Cannot open femon plugin while replaying");
+        }
     if (!cFemonOsd::Instance())
        cRemote::CallPlugin(Name());
     return cString("Opening femon plugin");
     }
-  else if (strcasecmp(commandP, "QUIT") == 0) {
+  else if (strcasecmp(Command, "QUIT") == 0) {
     if (cFemonOsd::Instance())
        cRemote::Put(kBack);
     return cString("Closing femon plugin");
     }
-  else if (strcasecmp(commandP, "NEXT") == 0) {
+  else if (strcasecmp(Command, "NEXT") == 0) {
     if (cFemonOsd::Instance())
        return cString::sprintf("Switching to next device: %s", cFemonOsd::Instance()->DeviceSwitch(1) ? "ok" : "failed");
     else
        return cString("Cannot switch device");
     }
-  else if (strcasecmp(commandP, "PREV") == 0) {
+  else if (strcasecmp(Command, "PREV") == 0) {
     if (cFemonOsd::Instance())
        return cString::sprintf("Switching to previous device: %s", cFemonOsd::Instance()->DeviceSwitch(-1) ? "ok" : "failed");
     else
        return cString("Cannot switch device");
     }
-  else if (strcasecmp(commandP, "INFO") == 0) {
+  else if (strcasecmp(Command, "INFO") == 0) {
     return getFrontendInfo(dev);
     }
-  else if (strcasecmp(commandP, "NAME") == 0) {
+  else if (strcasecmp(Command, "NAME") == 0) {
     return getFrontendName(dev);
     }
-  else if (strcasecmp(commandP, "STAT") == 0) {
+  else if (strcasecmp(Command, "STAT") == 0) {
     return getFrontendStatus(dev);
     }
-  else if (strcasecmp(commandP, "STRG") == 0) {
+  else if (strcasecmp(Command, "STRG") == 0) {
     return cString::sprintf("%d on device #%d", dev->SignalStrength(), dev->CardIndex());
     }
-  else if (strcasecmp(commandP, "QUAL") == 0) {
+  else if (strcasecmp(Command, "QUAL") == 0) {
     return cString::sprintf("%d on device #%d", dev->SignalQuality(), dev->CardIndex());
     }
-  else if (strcasecmp(commandP, "SGNL") == 0) {
-     return cString::sprintf("%s on device #%d", *getSignalStrength(getSignal(dev)), dev->CardIndex());
+  else if (strcasecmp(Command, "SGNL") == 0) {
+     int value = getSignal(dev);
+     return cString::sprintf("%04X (%02d%%) on device #%d", value, value / 655, dev->CardIndex());
     }
-  else if (strcasecmp(commandP, "CNRA") == 0) {
-     return cString::sprintf("%.2f dB on device #%d", getCNR(dev), dev->CardIndex());
+  else if (strcasecmp(Command, "SNRA") == 0) {
+     int value = getSNR(dev);
+     return cString::sprintf("%04X (%02d%%) on device #%d", value, value / 655, dev->CardIndex());
     }
-  else if (strcasecmp(commandP, "BERA") == 0) {
-     return cString::sprintf("%.0f on device #%d", getBER(dev), dev->CardIndex());
+  else if (strcasecmp(Command, "BERA") == 0) {
+     return cString::sprintf("%08X on device #%d", getBER(dev), dev->CardIndex());
     }
-  else if (strcasecmp(commandP, "PERA") == 0) {
-     return cString::sprintf("%.0f on device #%d", getPER(dev), dev->CardIndex());
+  else if (strcasecmp(Command, "UNCB") == 0) {
+     return cString::sprintf("%08X on device #%d", getUNC(dev), dev->CardIndex());
     }
-  else if (strcasecmp(commandP, "VIBR") == 0) {
+  else if (strcasecmp(Command, "VIBR") == 0) {
     if (cFemonOsd::Instance())
        return cString::sprintf("%s on device #%d", *getBitrateMbits(cFemonOsd::Instance()->GetVideoBitrate()), cDevice::ActualDevice()->CardIndex());
     else
        return cString::sprintf("--- Mbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
     }
-  else if (strcasecmp(commandP, "AUBR") == 0) {
+  else if (strcasecmp(Command, "AUBR") == 0) {
     if (cFemonOsd::Instance())
        return cString::sprintf("%s on device #%d", *getBitrateKbits(cFemonOsd::Instance()->GetAudioBitrate()), cDevice::ActualDevice()->CardIndex());
     else
        return cString::sprintf("--- kbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
     }
-  else if (strcasecmp(commandP, "DDBR") == 0) {
+  else if (strcasecmp(Command, "DDBR") == 0) {
     if (cFemonOsd::Instance())
        return cString::sprintf("%s on device #%d", *getBitrateKbits(cFemonOsd::Instance()->GetDolbyBitrate()), cDevice::ActualDevice()->CardIndex());
     else
@ -326,4 +280,144 @@ cString cPluginFemon::SVDRPCommand(const char *commandP, const char *optionP, in
  return NULL;
 }

+class cMenuFemonSetup : public cMenuSetupPage {
+private:
+  const char *dispmodes[eFemonModeMaxNumber];
+  const char *skins[eFemonSkinMaxNumber];
+  const char *themes[eFemonThemeMaxNumber];
+  cFemonConfig data;
+  cVector<const char*> help;
+  void Setup(void);
+protected:
+  virtual eOSState ProcessKey(eKeys Key);
+  virtual void Store(void);
+public:
+  cMenuFemonSetup(void);
+  };
+
+cMenuFemonSetup::cMenuFemonSetup(void)
+{
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  dispmodes[eFemonModeBasic]       = tr("basic");
+  dispmodes[eFemonModeTransponder] = tr("transponder");
+  dispmodes[eFemonModeStream]      = tr("stream");
+  dispmodes[eFemonModeAC3]         = tr("AC-3");
+
+  skins[eFemonSkinClassic]         = tr("Classic");
+  skins[eFemonSkinElchi]           = tr("Elchi");
+
+  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");
+  themes[eFemonThemeEgalsTry]      = tr("EgalsTry");
+  themes[eFemonThemeDuotone]       = tr("Duotone");
+  themes[eFemonThemeSilverGreen]   = tr("SilverGreen");
+  themes[eFemonThemePearlHD]       = tr("PearlHD");
+
+  data = femonConfig;
+  Setup();
+}
+
+void cMenuFemonSetup::Setup(void)
+{
+  int current = Current();
+
+  Clear();
+  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));
+     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));
+  Display();
+}
+
+void cMenuFemonSetup::Store(void)
+{
+  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("Downscale",      femonConfig.downscale);
+  SetupStore("RedLimit",       femonConfig.redlimit);
+  SetupStore("GreenLimit",     femonConfig.greenlimit);
+  SetupStore("UpdateInterval", femonConfig.updateinterval);
+  SetupStore("AnalStream",     femonConfig.analyzestream);
+  SetupStore("CalcInterval",   femonConfig.calcinterval);
+  SetupStore("UseSvdrp",       femonConfig.usesvdrp);
+  SetupStore("ServerPort",     femonConfig.svdrpport);
+  SetupStore("ServerIp",       femonConfig.svdrpip);
+}
+
+eOSState cMenuFemonSetup::ProcessKey(eKeys Key)
+{
+  int oldUsesvdrp = data.usesvdrp;
+  int oldAnalyzestream = data.analyzestream;
+
+  eOSState state = cMenuSetupPage::ProcessKey(Key);
+
+  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;
+}
+
+cMenuSetupPage *cPluginFemon::SetupMenu(void)
+{
+  // Return a setup menu in case the plugin supports one.
+  return new cMenuFemonSetup;
+}
+
 VDRPLUGINCREATOR(cPluginFemon); // Don't touch this!
--- a/femonaac.c
+++ b/femonaac.c
@ -1,22 +1,22 @@
 /*
- * aac.c: Frontend Status Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 */

-#include "tools.h"
-#include "aac.h"
+#include "femontools.h"
+#include "femonaac.h"

 #define IS_HEAAC_AUDIO(buf) (((buf)[0] == 0xFF) && (((buf)[1] & 0xF6) == 0xF0))

-int cFemonAAC::sampleRateS[16] =
+int cFemonAAC::s_Samplerates[16] =
 {
  96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, -1, -1, -1, -1
 };

-cFemonAAC::cFemonAAC(cFemonAudioIf *audioHandlerP)
-: audioHandlerM(audioHandlerP)
+cFemonAAC::cFemonAAC(cFemonAudioIf *audiohandler)
+: m_AudioHandler(audiohandler)
 {
 }

@ -24,11 +24,11 @@ cFemonAAC::~cFemonAAC()
 {
 }

-bool cFemonAAC::processAudio(const uint8_t *bufP, int lenP)
+bool cFemonAAC::processAudio(const uint8_t *buf, int len)
 {
-  cFemonBitStream bs(bufP, lenP * 8);
+  cFemonBitStream bs(buf, len * 8);

-  if (!audioHandlerM)
+  if (!m_AudioHandler)
     return false;

  /* ADTS Fixed Header:
@ -46,9 +46,9 @@ bool cFemonAAC::processAudio(const uint8_t *bufP, int lenP)
   */

  // skip PES header
-  if (!PesLongEnough(lenP))
+  if (!PesLongEnough(len))
      return false;
-  bs.SkipBits(8 * PesPayloadOffset(bufP));
+  bs.SkipBits(8 * PesPayloadOffset(buf));

  // HE-AAC audio detection
  if (bs.GetBits(12) != 0xFFF)                  // syncword
@ -66,38 +66,38 @@ bool cFemonAAC::processAudio(const uint8_t *bufP, int lenP)
  bs.SkipBit();                                 // private pid
  int channel_configuration = bs.GetBits(3);    // channel_configuration

-  audioHandlerM->SetAudioCodec(AUDIO_CODEC_HEAAC);
-  audioHandlerM->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
+  m_AudioHandler->SetAudioCodec(AUDIO_CODEC_HEAAC);
+  m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_RESERVED);

  switch (channel_configuration) {
    case 0:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
         break;

    case 1:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
         break;

    case 2:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
         break;

    case 3:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
         break;

    default:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
         break;
  }

  switch (sampling_frequency_index) {
    case 0xC ... 0xF:
-         audioHandlerM->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
+         m_AudioHandler->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
         break;

    default:
-         audioHandlerM->SetAudioSamplingFrequency(sampleRateS[sampling_frequency_index]);
+         m_AudioHandler->SetAudioSamplingFrequency(s_Samplerates[sampling_frequency_index]);
         break;
  }

--- 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 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
@ -1,33 +1,33 @@
 /*
- * ac3.c: Frontend Status Monitor plugin for the Video Disk Recorder
+ * 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 "tools.h"
-#include "ac3.h"
+#include "femontools.h"
+#include "femonac3.h"

-int cFemonAC3::bitrateS[32] =
+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
 };

-int cFemonAC3::frequencieS[4] =
+int cFemonAC3::s_Frequencies[4] =
 {
  480, 441, 320, 0
 };

-int cFemonAC3::frameS[3][32] =
+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 *audioHandlerP)
-: audioHandlerM(audioHandlerP)
+cFemonAC3::cFemonAC3(cFemonAC3If *audiohandler)
+: m_AudioHandler(audiohandler)
 {
 }

@ -35,21 +35,21 @@ cFemonAC3::~cFemonAC3()
 {
 }

-bool cFemonAC3::processAudio(const uint8_t *bufP, int lenP)
+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;
-  cFemonBitStream bs(bufP, lenP * 8);
+  cFemonBitStream bs(buf, len * 8);

-  if (!audioHandlerM)
+  if (!m_AudioHandler)
     return false;

  // skip PES header
-  if (!PesLongEnough(lenP))
+  if (!PesLongEnough(len))
      return false;
-  bs.SkipBits(8 * PesPayloadOffset(bufP));
+  bs.SkipBits(8 * PesPayloadOffset(buf));

  // http://rmworkshop.com/dvd_info/related_info/ac3hdr.htm

@ -78,16 +78,16 @@ bool cFemonAC3::processAudio(const uint8_t *bufP, int lenP)
  if (acmod == 0x02)
      dolbysurroundmode = bs.GetBits(2);

-  audioHandlerM->SetAC3Bitrate(1000 * bitrateS[frmsizcod >> 1]);
-  audioHandlerM->SetAC3SamplingFrequency(100 * frequencieS[fscod]);
-  audioHandlerM->SetAC3Bitstream(bsmod);
-  audioHandlerM->SetAC3AudioCoding(acmod);
-  audioHandlerM->SetAC3CenterMix(centermixlevel);
-  audioHandlerM->SetAC3SurroundMix(surroundmixlevel);
-  audioHandlerM->SetAC3DolbySurround(dolbysurroundmode);
+  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);

-  audioHandlerM->SetAC3LFE(bs.GetBit());       // low frequency effects on
-  audioHandlerM->SetAC3Dialog(bs.GetBits(5));  // dialog normalization
+  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 int s_Bitrates[32];
+  static int s_Frequencies[4];
+  static 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
@ -1,12 +1,12 @@
 /*
- * audio.h: Frontend Status Monitor plugin for the AUDIO Disk Recorder
+ * Frontend Status Monitor plugin for the AUDIO Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 */

-#ifndef __FEMON_AUDIO_H
-#define __FEMON_AUDIO_H
+#ifndef __FEMONAUDIO_H
+#define __FEMONAUDIO_H

 enum eAudioCodec {
  AUDIO_CODEC_INVALID = -1,
@ -113,13 +113,13 @@ public:
  virtual ~cFemonAudioIf() {}

  // enum
-  virtual void SetAudioCodec(eAudioCodec codecP) = 0;
+  virtual void SetAudioCodec(eAudioCodec codec) = 0;
  // kbit/s or eAudioBitrate
-  virtual void SetAudioBitrate(double bitRateP) = 0;
+  virtual void SetAudioBitrate(double bitrate) = 0;
  // Hz or eAudioSamplingFrequency
-  virtual void SetAudioSamplingFrequency(int samplingP) = 0;
+  virtual void SetAudioSamplingFrequency(int sampling) = 0;
  // eAudioChannelMode
-  virtual void SetAudioChannel(eAudioChannelMode modeP) = 0;
+  virtual void SetAudioChannel(eAudioChannelMode mode) = 0;
  };

 class cFemonAC3If {
@ -128,23 +128,23 @@ public:
  virtual ~cFemonAC3If() {}

  // bit/s or eAudioBitrate
-  virtual void SetAC3Bitrate(int bitRateP) = 0;
+  virtual void SetAC3Bitrate(int bitrate) = 0;
  // Hz or eAudioSamplingFrequency
-  virtual void SetAC3SamplingFrequency(int samplingP) = 0;
+  virtual void SetAC3SamplingFrequency(int sampling) = 0;
  // 0..7 or eAudioBitstreamMode
-  virtual void SetAC3Bitstream(int modeP) = 0;
+  virtual void SetAC3Bitstream(int mode) = 0;
  // 0..7 or eAudioCodingMode
-  virtual void SetAC3AudioCoding(int modeP) = 0;
+  virtual void SetAC3AudioCoding(int mode) = 0;
  // eAudioDolbySurroundMode
-  virtual void SetAC3DolbySurround(int modeP) = 0;
+  virtual void SetAC3DolbySurround(int mode) = 0;
  // eAudioCenterMixLevel
-  virtual void SetAC3CenterMix(int levelP) = 0;
+  virtual void SetAC3CenterMix(int level) = 0;
  // eAudioSurroundMixLevel
-  virtual void SetAC3SurroundMix(int levelP) = 0;
+  virtual void SetAC3SurroundMix(int level) = 0;
  // -dB
-  virtual void SetAC3Dialog(int levelP) = 0;
+  virtual void SetAC3Dialog(int level) = 0;
  // boolean
-  virtual void SetAC3LFE(bool onoffP) = 0;
+  virtual void SetAC3LFE(bool onoff) = 0;
  };

-#endif //__FEMON_AUDIO_H
+#endif //__FEMONAUDIO_H
--- a/femoncfg.c
+++ b/femoncfg.c
@ -1,43 +1,34 @@
 /*
- * config.c: Frontend Status Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 */

 #include <string.h>
+#include "femoncfg.h"

-#include "tools.h"
-#include "config.h"
+cFemonConfig femonConfig;

-cFemonConfig FemonConfig;
-
-cFemonConfig::cFemonConfig()
-: traceModeM(eTraceModeNormal),
-  hideMenuM(0),
-  displayModeM(0),
-  skinM(0),
-  themeM(0),
-  positionM(1),
-  downscaleM(0),
-  signalUnitM(0),
-  redLimitM(33),
-  greenLimitM(66),
-  updateIntervalM(5),
-  analyzeStreamM(1),
-  calcIntervalM(20),
-  useSvdrpM(0),
-  svdrpPortM(6419)
+cFemonConfig::cFemonConfig(void)
 {
-  SetSvdrpIp("0.0.0.0");
+  hidemenu       = 0;
+  displaymode    = 0;
+  skin           = 0;
+  theme          = 0;
+  position       = 1;
+  downscale      = 0;
+  redlimit       = 33;
+  greenlimit     = 66;
+  updateinterval = 5;
+  analyzestream  = 1;
+  calcinterval   = 20;
+  usesvdrp       = 0;
+  svdrpport      = 6419;
+  strncpy(svdrpip, "0.0.0.0", sizeof(svdrpip));
 }

-void cFemonConfig::SetSvdrpIp(const char *strP)
-{
-  strn0cpy(svdrpIpM, strP, sizeof(svdrpIpM));
-}
-
-const cFemonTheme FemonTheme[eFemonThemeMaxNumber] =
+const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
 {
  {
    // eFemonThemeClassic
--- a/femoncfg.h
+++ b/femoncfg.h
@ -0,0 +1,81 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONCFG_H
+#define __FEMONCFG_H
+
+#define MaxSvdrpIp 15 // xxx.xxx.xxx.xxx
+
+enum eFemonModes
+{
+  eFemonModeBasic,
+  eFemonModeTransponder,
+  eFemonModeStream,
+  eFemonModeAC3,
+  eFemonModeMaxNumber
+};
+
+struct cFemonConfig
+{
+public:
+  cFemonConfig(void);
+  int hidemenu;
+  int displaymode;
+  int skin;
+  int theme;
+  int position;
+  int downscale;
+  int redlimit;
+  int greenlimit;
+  int updateinterval;
+  int analyzestream;
+  int calcinterval;
+  int usesvdrp;
+  int svdrpport;
+  char svdrpip[MaxSvdrpIp + 1]; // must end with additional null
+};
+
+extern cFemonConfig femonConfig;
+
+enum eFemonSkins
+{
+  eFemonSkinClassic,
+  eFemonSkinElchi,
+  eFemonSkinMaxNumber
+};
+
+enum eFemonThemes
+{
+  eFemonThemeClassic,
+  eFemonThemeElchi,
+  eFemonThemeSTTNG,
+  eFemonThemeDeepBlue,
+  eFemonThemeMoronimo,
+  eFemonThemeEnigma,
+  eFemonThemeEgalsTry,
+  eFemonThemeDuotone,
+  eFemonThemeSilverGreen,
+  eFemonThemePearlHD,
+  eFemonThemeMaxNumber
+};
+
+struct cFemonTheme
+{
+  int bpp;
+  unsigned int clrBackground;
+  unsigned int clrTitleBackground;
+  unsigned int clrTitleText;
+  unsigned int clrActiveText;
+  unsigned int clrInactiveText;
+  unsigned int clrRed;
+  unsigned int clrYellow;
+  unsigned int clrGreen;
+};
+
+extern const cFemonTheme femonTheme[eFemonThemeMaxNumber];
+
+#endif // __FEMONCFG_H
--- a/femonclient/vdr-femonclient-0.0.5.tgz
+++ b/femonclient/vdr-femonclient-0.0.5.tgz
--- a/femonh264.c
+++ b/femonh264.c
@ -1,15 +1,14 @@
 /*
- * h264.c: Frontend Status Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 */

-#include "log.h"
-#include "tools.h"
-#include "h264.h"
+#include "femontools.h"
+#include "femonh264.h"

-const cFemonH264::t_DAR cFemonH264::darS[] =
+const cFemonH264::t_DAR cFemonH264::s_DAR[] =
 {
  {  VIDEO_ASPECT_RATIO_1_1,      100  },
  {  VIDEO_ASPECT_RATIO_4_3,      133  },
@ -31,7 +30,7 @@ const cFemonH264::t_DAR cFemonH264::darS[] =
  {  VIDEO_ASPECT_RATIO_2_1,      200  }
 };

-const cFemonH264::t_SAR cFemonH264::sarS[] =
+const cFemonH264::t_SAR cFemonH264::s_SAR[] =
 {
  { 0,   0  }, // VIDEO_ASPECT_RATIO_INVALID
  { 1,   1  }, // VIDEO_ASPECT_RATIO_1_1
@ -52,7 +51,7 @@ const cFemonH264::t_SAR cFemonH264::sarS[] =
  { 2,   1  }  // VIDEO_ASPECT_RATIO_2_1
 };

-const eVideoFormat cFemonH264::videoFormatS[] =
+const eVideoFormat cFemonH264::s_VideoFormats[] =
 {
  VIDEO_FORMAT_COMPONENT,
  VIDEO_FORMAT_PAL,
@ -63,25 +62,25 @@ const eVideoFormat cFemonH264::videoFormatS[] =
  VIDEO_FORMAT_RESERVED
 };

-const uint8_t cFemonH264::seiNumClockTsTableS[9] =
+const uint8_t cFemonH264::s_SeiNumClockTsTable[9] =
 {
  1, 1, 1, 2, 2, 3, 3, 2, 3
 };

-cFemonH264::cFemonH264(cFemonVideoIf *videoHandlerP)
-: videoHandlerM(videoHandlerP),
-  widthM(0),
-  heightM(0),
-  aspectRatioM(VIDEO_ASPECT_RATIO_INVALID),
-  formatM(VIDEO_FORMAT_INVALID),
-  frameRateM(0),
-  bitRateM(0),
-  scanM(VIDEO_SCAN_INVALID),
-  cpbDpbDelaysPresentFlagM(false),
-  picStructPresentFlagM(false),
-  frameMbsOnlyFlagM(false),
-  mbAdaptiveFrameFieldFlagM(false),
-  timeOffsetLengthM(0)
+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();
 }
@ -90,19 +89,18 @@ cFemonH264::~cFemonH264()
 {
 }

-bool cFemonH264::processVideo(const uint8_t *bufP, int lenP)
+bool cFemonH264::processVideo(const uint8_t *buf, int len)
 {
-  uint8_t nal_data[lenP];
+  uint8_t nal_data[len];
  bool aud_found = false, sps_found = false, sei_found = true; // SEI temporarily disabled!
-  const uint8_t *buf = bufP;
  const uint8_t *start = buf;
-  const uint8_t *end = start + lenP;
+  const uint8_t *end = start + len;

-  if (!videoHandlerM)
+  if (!m_VideoHandler)
     return false;

  // skip PES header
-  if (!PesLongEnough(lenP))
+  if (!PesLongEnough(len))
      return false;
  buf += PesPayloadOffset(buf);
  start = buf;
@ -121,7 +119,7 @@ bool cFemonH264::processVideo(const uint8_t *bufP, int lenP)
             if (!aud_found) {
                 switch (buf[4] >> 5) {
                   case 0: case 3: case 5: // I_FRAME
-                       debug2("%s Found NAL AUD at offset %d/%d", __PRETTY_FUNCTION__, int(buf - start), lenP);
+                       //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;
@ -134,7 +132,7 @@ bool cFemonH264::processVideo(const uint8_t *bufP, int lenP)

        case NAL_SPS:
             if (!sps_found) {
-               debug2("%s Found NAL SPS at offset %d/%d", __PRETTY_FUNCTION__, int(buf - start), lenP);
+               //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)
@ -144,7 +142,7 @@ bool cFemonH264::processVideo(const uint8_t *bufP, int lenP)

        case NAL_SEI:
             if (!sei_found) {
-               debug2("%s Found NAL SEI at offset %d/%d", __PRETTY_FUNCTION__, int(buf - start), lenP);
+               //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)
@ -163,18 +161,18 @@ bool cFemonH264::processVideo(const uint8_t *bufP, int lenP)
      }

  if (aud_found) {
-     videoHandlerM->SetVideoCodec(VIDEO_CODEC_H264);
+     m_VideoHandler->SetVideoCodec(VIDEO_CODEC_H264);
     if (sps_found) {
-        debug2("%s width=%d height=%d, aspect=%d format=%d bitrate=%.0f", __PRETTY_FUNCTION__, widthM, heightM, aspectRatioM, formatM, bitRateM);
-        videoHandlerM->SetVideoFormat(formatM);
-        videoHandlerM->SetVideoSize(widthM, heightM);
-        videoHandlerM->SetVideoAspectRatio(aspectRatioM);
-        videoHandlerM->SetVideoBitrate(bitRateM);
+        //debug("H.264: size %dx%d, aspect %d format %d bitrate %.0f\n", m_Width, m_Height, m_AspectRatio, m_Format, m_BitRate);
+        m_VideoHandler->SetVideoFormat(m_Format);
+        m_VideoHandler->SetVideoSize(m_Width, m_Height);
+        m_VideoHandler->SetVideoAspectRatio(m_AspectRatio);
+        m_VideoHandler->SetVideoBitrate(m_BitRate);
        }
     if (sps_found || sei_found) {
-        debug2("%s scan=%d framerate=%.2f", __PRETTY_FUNCTION__, scanM, (scanM == VIDEO_SCAN_PROGRESSIVE) ? (frameRateM / 2) : frameRateM);
-        videoHandlerM->SetVideoScan(scanM);
-        videoHandlerM->SetVideoFramerate((scanM == VIDEO_SCAN_PROGRESSIVE) ? (frameRateM / 2) : frameRateM);
+        //debug("H.264: scan %d framerate %.2f\n", m_Scan, (m_Scan == VIDEO_SCAN_PROGRESSIVE) ? (m_FrameRate / 2) : m_FrameRate);
+        m_VideoHandler->SetVideoScan(m_Scan);
+        m_VideoHandler->SetVideoFramerate((m_Scan == VIDEO_SCAN_PROGRESSIVE) ? (m_FrameRate / 2) : m_FrameRate);
        }
  }

@ -183,58 +181,60 @@ bool cFemonH264::processVideo(const uint8_t *bufP, int lenP)

 void cFemonH264::reset()
 {
-  cpbDpbDelaysPresentFlagM = false;
-  picStructPresentFlagM = false;
-  frameMbsOnlyFlagM = false;
-  mbAdaptiveFrameFieldFlagM = false;
-  timeOffsetLengthM = 0;
+  m_CpbDpbDelaysPresentFlag = false;
+  m_PicStructPresentFlag = false;
+  m_FrameMbsOnlyFlag = false;
+  m_MbAdaptiveFrameFieldFlag = false;
+  m_TimeOffsetLength = 0;
 }

-const uint8_t *cFemonH264::nextStartCode(const uint8_t *startP, const uint8_t *endP)
+const uint8_t *cFemonH264::nextStartCode(const uint8_t *start, const uint8_t *end)
 {
-  for (endP -= 3; startP < endP; ++startP) {
-      if ((startP[0] == 0x00) && (startP[1] == 0x00) && (startP[2] == 0x01))
-         return startP;
+  for (end -= 3; start < end; ++start) {
+      if ((start[0] == 0x00) && (start[1] == 0x00) && (start[2] == 0x01))
+         return start;
      }
-  return (endP + 3);
+  return (end + 3);
 }

-int cFemonH264::nalUnescape(uint8_t *dstP, const uint8_t *srcP, int lenP)
+int cFemonH264::nalUnescape(uint8_t *dst, const uint8_t *src, int len)
 {
  int s = 0, d = 0;

-  while (s < lenP - 3) {
-    if (!srcP[s] && !srcP[s + 1] && srcP[s + 2] == 3) {
-       dstP[d++] = srcP[s++];
-       dstP[d++] = srcP[s++];
-       s++; // skip emulation_prevention_three_byte
+  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;
+          }
       }
-    else
-       dstP[d++] = srcP[s++];
+    dst[d++] = src[s++];
    }

-  while (s < lenP)
-    dstP[d++] = srcP[s++];
-
  return d;
 }

-int cFemonH264::parseSPS(const uint8_t *bufP, int lenP)
+int cFemonH264::parseSPS(const uint8_t *buf, int len)
 {
  int profile_idc, level_idc, constraint_set3_flag, pic_order_cnt_type, i, j;
-  cFemonBitStream bs(bufP, lenP);
+  cFemonBitStream bs(buf, len);

-  uint32_t width = widthM;
-  uint32_t height = heightM;
-  eVideoAspectRatio aspect_ratio = aspectRatioM;
-  eVideoFormat format = formatM;
-  double frame_rate = frameRateM;
-  double bit_rate = bitRateM;
-  bool cpb_dpb_delays_present_flag = cpbDpbDelaysPresentFlagM;
-  bool pic_struct_present_flag = picStructPresentFlagM;
-  bool frame_mbs_only_flag = frameMbsOnlyFlagM;
-  bool mb_adaptive_frame_field_flag = mbAdaptiveFrameFieldFlagM;
-  uint32_t time_offset_length = timeOffsetLengthM;
+  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.GetBits(8);              // profile_idc
  bs.SkipBit();                             // constraint_set0_flag
@ -244,7 +244,7 @@ int cFemonH264::parseSPS(const uint8_t *bufP, int lenP)
  bs.SkipBits(4);                           // reserved_zero_4bits
  level_idc = bs.GetBits(8);                // level_idc
  bs.SkipUeGolomb();                        // seq_parameter_set_id
-  debug2("%s profile_idc=%d level_idc=%d", __PRETTY_FUNCTION__, profile_idc, level_idc);
+  //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
@ -492,9 +492,9 @@ int cFemonH264::parseSPS(const uint8_t *bufP, int lenP)
  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
-  debug2("%s pic_width=%u", __PRETTY_FUNCTION__, width);
-  debug2("%s pic_height=%u", __PRETTY_FUNCTION__, height);
-  debug2("%s frame_mbs_only_flag=%d", __PRETTY_FUNCTION__, 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)
@ -506,7 +506,7 @@ int cFemonH264::parseSPS(const uint8_t *bufP, int lenP)
     crop_right  = bs.GetUeGolomb();        // frame_crop_rigth_offset
     crop_top    = bs.GetUeGolomb();        // frame_crop_top_offset
     crop_bottom = bs.GetUeGolomb();        // frame_crop_bottom_offset
-     debug2("%s crop_left=%d crop_top=%d crop_right=%d crop_bottom=%d", __PRETTY_FUNCTION__, crop_left, crop_top, crop_right, crop_bottom);
+     //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);
@ -518,19 +518,19 @@ int cFemonH264::parseSPS(const uint8_t *bufP, int lenP)
     if (bs.GetBit()) {                     // aspect_ratio_info_present
        uint32_t aspect_ratio_idc, sar_width = 0, sar_height = 0;
        aspect_ratio_idc = bs.GetBits(8);   // aspect_ratio_idc
-        debug2("%s aspect_ratio_idc=%d", __PRETTY_FUNCTION__, 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.GetBits(16);     // sar_width
           sar_height = bs.GetBits(16);     // sar_height
           }
-        else if (aspect_ratio_idc < ELEMENTS(sarS)) {
-           sar_width  = sarS[aspect_ratio_idc].w;
-           sar_height = sarS[aspect_ratio_idc].h;
+        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(darS); ++i) {
-               if (darS[i].ratio == ratio) {
+           for (unsigned int i = 0; i < ELEMENTS(s_DAR); ++i) {
+               if (s_DAR[i].ratio == ratio) {
                  index = i;
                  break;
                  }
@ -542,8 +542,8 @@ int cFemonH264::parseSPS(const uint8_t *bufP, int lenP)
                 aspect_ratio = VIDEO_ASPECT_RATIO_INVALID;
              }
           else
-              aspect_ratio = darS[index].dar;
-           debug2("%s sar_width=%d sar_height=%d aspect_ratio=%d", __PRETTY_FUNCTION__, sar_width, sar_height, aspect_ratio);
+              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
@ -551,9 +551,9 @@ int cFemonH264::parseSPS(const uint8_t *bufP, int lenP)
     if (bs.GetBit()) {                     // video_signal_type_present_flag
        uint32_t video_format;
        video_format = bs.GetBits(3);       // video_format
-        if (video_format < ELEMENTS(videoFormatS)) {
-           format = videoFormatS[video_format];
-           debug2("%s video_format=%d", __PRETTY_FUNCTION__, 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
@ -621,30 +621,30 @@ int cFemonH264::parseSPS(const uint8_t *bufP, int lenP)
        }
     }

-  widthM = width;
-  heightM = height;
-  aspectRatioM = aspect_ratio;
-  formatM = format;
-  scanM = frame_mbs_only_flag ? VIDEO_SCAN_PROGRESSIVE : VIDEO_SCAN_INTERLACED;
-  frameRateM = frame_rate;
-  bitRateM = bit_rate;
-  cpbDpbDelaysPresentFlagM = cpb_dpb_delays_present_flag;
-  picStructPresentFlagM = pic_struct_present_flag;
-  frameMbsOnlyFlagM = frame_mbs_only_flag;
-  mbAdaptiveFrameFieldFlagM = mb_adaptive_frame_field_flag;
-  timeOffsetLengthM = time_offset_length;
+  m_Width = width;
+  m_Height = height;
+  m_AspectRatio = aspect_ratio;
+  m_Format = format;
+  m_Scan = frame_mbs_only_flag ? VIDEO_SCAN_PROGRESSIVE : VIDEO_SCAN_INTERLACED;
+  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.Index() / 8);
 }

-int cFemonH264::parseSEI(const uint8_t *bufP, int lenP)
+int cFemonH264::parseSEI(const uint8_t *buf, int len)
 {
  int num_referenced_subseqs, i;
-  cFemonBitStream bs(bufP, lenP);
+  cFemonBitStream bs(buf, len);

-  eVideoScan scan = scanM;
+  eVideoScan scan = m_Scan;

-  while ((bs.Index() * 8 + 16) < lenP) {                 // sei_message
+  while ((bs.Index() * 8 + 16) < len) {               // sei_message
    int lastByte, payloadSize = 0, payloadType = 0;

    do {
@ -659,16 +659,16 @@ int cFemonH264::parseSEI(const uint8_t *bufP, int lenP)

    switch (payloadType) {                               // sei_payload
      case 1:                                            // pic_timing
-           if (cpbDpbDelaysPresentFlagM) {               // cpb_dpb_delays_present_flag
+           if (m_CpbDpbDelaysPresentFlag) {              // cpb_dpb_delays_present_flag
              bs.SkipUeGolomb();                         // cpb_removal_delay
              bs.SkipUeGolomb();                         // dpb_output_delay
              }
-           if (picStructPresentFlagM) {                  // pic_struct_present_flag
+           if (m_PicStructPresentFlag) {                 // pic_struct_present_flag
              uint32_t pic_struct, ct_type = 0, i = 0;
              pic_struct = bs.GetBits(4);                // pic_struct
-              if (pic_struct >= ELEMENTS(seiNumClockTsTableS))
+              if (pic_struct >= (sizeof(s_SeiNumClockTsTable)) / sizeof(s_SeiNumClockTsTable[0]))
                 return 0;
-              if (frameMbsOnlyFlagM && !mbAdaptiveFrameFieldFlagM)
+              if (m_FrameMbsOnlyFlag && !m_MbAdaptiveFrameFieldFlag)
                 scan = VIDEO_SCAN_PROGRESSIVE;
              else {
                 switch (pic_struct) {
@ -690,12 +690,12 @@ int cFemonH264::parseSEI(const uint8_t *bufP, int lenP)
                        break;
                   }
                }
-              debug2("%s pic_struct=%d scan_type=%d", __PRETTY_FUNCTION__, pic_struct, scan);
-              for (i = 0; i < seiNumClockTsTableS[pic_struct]; ++i) {
+              //debug("H.264 SEI: pic struct %d scan type %d\n", pic_struct, scan);
+              for (i = 0; i < s_SeiNumClockTsTable[pic_struct]; ++i) {
                  if (bs.GetBit()) {                     // clock_timestamp_flag[i]
                     int full_timestamp_flag;
                     ct_type |= (1 << bs.GetBits(2));    // ct_type
-                     debug2("%s ct_type=%04X", __PRETTY_FUNCTION__, ct_type);
+                     //debug("H.264 SEI: ct type %04X\n", ct_type);
                     bs.SkipBit();                       // nuit_field_based_flag
                     bs.SkipBits(5);                     // counting_type
                     full_timestamp_flag = bs.GetBit();  // full_timestamp_flag
@ -717,8 +717,8 @@ int cFemonH264::parseSEI(const uint8_t *bufP, int lenP)
                              }
                           }
                        }
-                     if (timeOffsetLengthM > 0)
-                        bs.SkipBits(timeOffsetLengthM);  // time_offset
+                     if (m_TimeOffsetLength > 0)
+                        bs.SkipBits(m_TimeOffsetLength); // time_offset
                     }
                  }
              if (i > 0)
@ -753,7 +753,7 @@ int cFemonH264::parseSEI(const uint8_t *bufP, int lenP)
    bs.ByteAlign();
    }

-  scanM = scan;
+  m_Scan = scan;

  return (bs.Index() / 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
@ -1,27 +1,27 @@
 /*
- * latm.c: Frontend Status Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 */

-#include "tools.h"
-#include "latm.h"
+#include "femontools.h"
+#include "femonlatm.h"

-int cFemonLATM::bitrateS[3][16] =
+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
 };

-int cFemonLATM::sampleRateS[4] =
+int cFemonLATM::s_Samplerates[4] =
 {
  22050, 24000, 16000, -1
 };

-cFemonLATM::cFemonLATM(cFemonAudioIf *audioHandlerP)
-: audioHandlerM(audioHandlerP)
+cFemonLATM::cFemonLATM(cFemonAudioIf *audiohandler)
+: m_AudioHandler(audiohandler)
 {
 }

@ -29,23 +29,23 @@ cFemonLATM::~cFemonLATM()
 {
 }

-bool cFemonLATM::processAudio(const uint8_t *bufP, int lenP)
+bool cFemonLATM::processAudio(const uint8_t *buf, int len)
 {
-  cFemonBitStream bs(bufP, lenP * 8);
+  cFemonBitStream bs(buf, len * 8);

-  if (!audioHandlerM)
+  if (!m_AudioHandler)
     return false;

  // skip PES header
-  if (!PesLongEnough(lenP))
+  if (!PesLongEnough(len))
      return false;
-  bs.SkipBits(8 * PesPayloadOffset(bufP));
+  bs.SkipBits(8 * PesPayloadOffset(buf));

  // MPEG audio detection
  if (bs.GetBits(12) != 0x56E)              // syncword
     return false;

-  audioHandlerM->SetAudioCodec(AUDIO_CODEC_LATM);
+  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
@ -59,52 +59,52 @@ bool cFemonLATM::processAudio(const uint8_t *bufP, int lenP)

  switch (mode) {
    case 0:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
         break;

    case 1:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
         break;

    case 2:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
         break;

    case 3:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
         break;

    default:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
         break;
  }

  if (layer == 3) {
-      audioHandlerM->SetAudioBitrate(AUDIO_BITRATE_FREE);
+      m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
  }
  else {
     switch (bit_rate_index) {
       case 0:
-            audioHandlerM->SetAudioBitrate(AUDIO_BITRATE_FREE);
+            m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
            break;

       case 0xF:
-            audioHandlerM->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
+            m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
            break;

       default:
-            audioHandlerM->SetAudioBitrate(1000 * bitrateS[layer][bit_rate_index]);
+            m_AudioHandler->SetAudioBitrate(1000 * s_Bitrates[layer][bit_rate_index]);
            break;
     }
  }

  switch (sampling_frequency) {
    case 3:
-         audioHandlerM->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
+         m_AudioHandler->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
         break;

    default:
-         audioHandlerM->SetAudioSamplingFrequency(sampleRateS[sampling_frequency]);
+         m_AudioHandler->SetAudioSamplingFrequency(s_Samplerates[sampling_frequency]);
         break;
  }

--- 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 int s_Bitrates[3][16];
+  static 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
@ -1,16 +1,16 @@
 /*
- * mpeg.c: Frontend Status Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 */

-#include "tools.h"
-#include "mpeg.h"
+#include "femontools.h"
+#include "femonmpeg.h"

 #define IS_EXTENSION_START(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == 0xB5))

-int cFemonMPEG::bitrateS[2][3][16] =
+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
@ -24,21 +24,21 @@ int cFemonMPEG::bitrateS[2][3][16] =
  }
 };

-int cFemonMPEG::sampleRateS[2][4] =
+int cFemonMPEG::s_Samplerates[2][4] =
 {
  {22050, 24000, 16000, -1}, // MPEG-2
  {44100, 48000, 32000, -1}  // MPEG-1
 };

-eAudioCodec cFemonMPEG::formatS[2][4] =
+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 *videoHandlerP, cFemonAudioIf *audioHandlerP)
-: videoHandlerM(videoHandlerP),
-  audioHandlerM(audioHandlerP)
+cFemonMPEG::cFemonMPEG(cFemonVideoIf *videohandler, cFemonAudioIf *audiohandler)
+: m_VideoHandler(videohandler),
+  m_AudioHandler(audiohandler)
 {
 }

@ -46,17 +46,17 @@ cFemonMPEG::~cFemonMPEG()
 {
 }

-bool cFemonMPEG::processAudio(const uint8_t *bufP, int lenP)
+bool cFemonMPEG::processAudio(const uint8_t *buf, int len)
 {
-  cFemonBitStream bs(bufP, lenP * 8);
+  cFemonBitStream bs(buf, len * 8);

-  if (!audioHandlerM)
+  if (!m_AudioHandler)
     return false;

  // skip PES header
-  if (!PesLongEnough(lenP))
+  if (!PesLongEnough(len))
      return false;
-  bs.SkipBits(8 * PesPayloadOffset(bufP));
+  bs.SkipBits(8 * PesPayloadOffset(buf));

  // MPEG audio detection
  if (bs.GetBits(12) != 0xFFF)              // syncword
@ -71,68 +71,68 @@ bool cFemonMPEG::processAudio(const uint8_t *bufP, int lenP)
  bs.SkipBit();                             // private pid
  int mode = bs.GetBits(2);                 // mode

-  audioHandlerM->SetAudioCodec(formatS[id][layer]);
+  m_AudioHandler->SetAudioCodec(s_Formats[id][layer]);

  switch (mode) {
    case 0:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
         break;

    case 1:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
         break;

    case 2:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
         break;

    case 3:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
         break;

    default:
-         audioHandlerM->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
         break;
  }

  switch (bit_rate_index) {
    case 0:
-         audioHandlerM->SetAudioBitrate(AUDIO_BITRATE_FREE);
+         m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
         break;

    case 0xF:
-         audioHandlerM->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
+         m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
         break;

    default:
-         audioHandlerM->SetAudioBitrate(1000 * bitrateS[id][layer][bit_rate_index]);
+         m_AudioHandler->SetAudioBitrate(1000 * s_Bitrates[id][layer][bit_rate_index]);
         break;
  }

  switch (sampling_frequency) {
    case 3:
-         audioHandlerM->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
+         m_AudioHandler->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
         break;

    default:
-         audioHandlerM->SetAudioSamplingFrequency(sampleRateS[id][sampling_frequency]);
+         m_AudioHandler->SetAudioSamplingFrequency(s_Samplerates[id][sampling_frequency]);
         break;
  }

  return true;
 }

-bool cFemonMPEG::processVideo(const uint8_t *bufP, int lenP)
+bool cFemonMPEG::processVideo(const uint8_t *buf, int len)
 {
-  cFemonBitStream bs(bufP, lenP * 8);
+  cFemonBitStream bs(buf, len * 8);

-  if (!videoHandlerM)
+  if (!m_VideoHandler)
     return false;

  // skip PES header
-  if (!PesLongEnough(lenP))
+  if (!PesLongEnough(len))
      return false;
-  bs.SkipBits(8 * PesPayloadOffset(bufP));
+  bs.SkipBits(8 * PesPayloadOffset(buf));

  // MPEG-2 video detection, search for start code
  if (bs.GetBits(32) != 0x000001B3)         // sequence header
@ -274,13 +274,13 @@ bool cFemonMPEG::processVideo(const uint8_t *bufP, int lenP)
        }
     }

-  videoHandlerM->SetVideoCodec(VIDEO_CODEC_MPEG2);
-  videoHandlerM->SetVideoSize(horizontal_size, vertical_size);
-  videoHandlerM->SetVideoBitrate(400.0 * (double)(bit_rate));
-  videoHandlerM->SetVideoFramerate(frame_rate);
-  videoHandlerM->SetVideoScan(eVideoScan(scan));
-  videoHandlerM->SetVideoAspectRatio(eVideoAspectRatio(aspect));
-  videoHandlerM->SetVideoFormat(eVideoFormat(format));
+  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 int s_Bitrates[2][3][16];
+  static 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
@ -0,0 +1,100 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONOSD_H
+#define __FEMONOSD_H
+
+#include <linux/dvb/frontend.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <vdr/osd.h>
+#include <vdr/thread.h>
+#include <vdr/status.h>
+#include <vdr/plugin.h>
+#include <vdr/channels.h>
+#include <vdr/transfer.h>
+#include <vdr/tools.h>
+#include "svdrpservice.h"
+
+#define MAX_BM_NUMBER 8
+
+class cFemonOsd : public cOsdObject, public cThread, public cStatus {
+private:
+  enum eDeviceSourceType {
+    DEVICESOURCE_DVBAPI = 0,
+    DEVICESOURCE_IPTV,
+    DEVICESOURCE_PVRINPUT,
+    DEVICESOURCE_COUNT
+    };
+
+  static cFemonOsd *pInstance;
+
+  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;
+  int               m_Number;
+  int               m_OldNumber;
+  int               m_Quality;
+  bool              m_QualityValid;
+  int               m_Strength;
+  bool              m_StrengthValid;
+  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;
+  cString           m_FrontendName;
+  fe_status_t       m_FrontendStatus;
+  bool              m_FrontendStatusValid;
+  dvb_frontend_info m_FrontendInfo;
+  eDeviceSourceType m_DeviceSource;
+  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);
+  bool SvdrpTune(void);
+
+protected:
+  cFemonOsd();
+  cFemonOsd(const cFemonOsd&);
+  cFemonOsd& operator= (const cFemonOsd&);
+  virtual void Action(void);
+  virtual void ChannelSwitch(const cDevice *device, int channelNumber, bool liveView);
+  virtual void SetAudioTrack(int Index, const char * const *Tracks);
+
+public:
+  static cFemonOsd *Instance(bool create = false);
+  ~cFemonOsd();
+
+  virtual void Show(void);
+  virtual eOSState ProcessKey(eKeys Key);
+
+  bool    DeviceSwitch(int direction);
+  double  GetVideoBitrate(void);
+  double  GetAudioBitrate(void);
+  double  GetDolbyBitrate(void);
+};
+
+#endif //__FEMONOSD_H
+
--- a/femonreceiver.c
+++ b/femonreceiver.c
@ -0,0 +1,250 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include <unistd.h>
+#include "femontools.h"
+#include "femoncfg.h"
+#include "femonreceiver.h"
+
+cFemonReceiver::cFemonReceiver(const cChannel *Channel, int ATrack, int DTrack)
+: cReceiver(Channel),
+  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(Channel ? Channel->Vtype(): 0),
+  m_VideoPid(Channel ? Channel->Vpid() : 0),
+  m_VideoPacketCount(0),
+  m_VideoBitrate(0.0),
+  m_VideoValid(false),
+  m_AudioBuffer(KILOBYTE(256), TS_SIZE, false, "Femon audio"),
+  m_AudioPid(Channel ? Channel->Apid(ATrack) : 0),
+  m_AudioPacketCount(0),
+  m_AudioBitrate(0.0),
+  m_AudioValid(false),
+  m_AC3Buffer(KILOBYTE(256), TS_SIZE, false, "Femon AC3"),
+  m_AC3Pid(Channel ? Channel->Dpid(DTrack) : 0),
+  m_AC3PacketCount(0),
+  m_AC3Bitrate(0),
+  m_AC3Valid(false)
+{
+  debug("%s()\n", __PRETTY_FUNCTION__);
+
+  SetPids(NULL);
+  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)
+{
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  Deactivate();
+}
+
+void cFemonReceiver::Deactivate(void)
+{
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  Detach();
+  if (m_Active) {
+     m_Active = false;
+     m_Sleep.Signal();
+     if (Running())
+        Cancel(3);
+     }
+}
+
+void cFemonReceiver::Activate(bool On)
+{
+  debug("%s(%d)\n", __PRETTY_FUNCTION__, On);
+  if (On)
+     Start();
+  else
+     Deactivate();
+}
+
+void cFemonReceiver::Receive(uchar *Data, int Length)
+{
+  // TS packet length: TS_SIZE
+  if (Running() && (*Data == TS_SYNC_BYTE) && (Length == TS_SIZE)) {
+     int len, pid = TsPid(Data);
+     if (pid == m_VideoPid) {
+        ++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();
+           }
+        }
+     }
+}
+
+void cFemonReceiver::Action(void)
+{
+  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
@ -0,0 +1,178 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONRECEIVER_H
+#define __FEMONRECEIVER_H
+
+#include <vdr/thread.h>
+#include <vdr/receiver.h>
+
+#include "femonh264.h"
+#include "femonmpeg.h"
+#include "femonaac.h"
+#include "femonlatm.h"
+#include "femonac3.h"
+#include "femonaudio.h"
+#include "femonvideo.h"
+#include "femontools.h"
+
+class cFemonReceiver : public cReceiver, public cThread, public cFemonVideoIf, public cFemonAudioIf, public cFemonAC3If {
+private:
+  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);
+  virtual void Receive(uchar *Data, int Length);
+  virtual void Action(void);
+
+public:
+  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(const cChannel* Channel, int ATrack, int DTrack);
+  virtual ~cFemonReceiver();
+  void Deactivate(void);
+
+  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)           { 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)             { 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
@ -8,13 +8,15 @@
 #ifndef __FEMONSERVICE_H
 #define __FEMONSERVICE_H

-struct FemonService_v1_1 {
+#include <linux/dvb/frontend.h>
+
+struct FemonService_v1_0 {
  cString fe_name;
  cString fe_status;
-  double fe_cnr;
-  double fe_signal;
-  double fe_ber;
-  double fe_per;
+  uint16_t fe_snr;
+  uint16_t fe_signal;
+  uint32_t fe_ber;
+  uint32_t fe_unc;
  double video_bitrate;
  double audio_bitrate;
  double dolby_bitrate;
--- a/femonsymbol.c
+++ b/femonsymbol.c
@ -1,15 +1,13 @@
 /*
- * symbol.c: Frontend Status Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 */

 #include <vdr/device.h>
-
-#include "log.h"
-#include "tools.h"
-#include "symbol.h"
+#include "femontools.h"
+#include "femonsymbol.h"

 #include "symbols/stereo.xpm"
 #include "symbols/monoleft.xpm"
@ -19,7 +17,6 @@
 #include "symbols/dolbydigital51.xpm"
 #include "symbols/mpeg2.xpm"
 #include "symbols/h264.xpm"
-#include "symbols/h265.xpm"
 #include "symbols/ntsc.xpm"
 #include "symbols/pal.xpm"
 #include "symbols/encrypted.xpm"
@ -43,9 +40,6 @@
 #include "symbols/six.xpm"
 #include "symbols/seven.xpm"
 #include "symbols/eight.xpm"
-#include "symbols/format2160.xpm"
-#include "symbols/format2160i.xpm"
-#include "symbols/format2160p.xpm"
 #include "symbols/format1080.xpm"
 #include "symbols/format1080i.xpm"
 #include "symbols/format1080p.xpm"
@ -59,7 +53,6 @@
 #include "symbols/format480i.xpm"
 #include "symbols/format480p.xpm"

-static cBitmap bmOnePixel(1, 1, 1);
 static cBitmap bmStereo(stereo_xpm);
 static cBitmap bmMonoLeft(monoleft_xpm);
 static cBitmap bmMonoRight(monoright_xpm);
@ -68,7 +61,6 @@ static cBitmap bmDolbyDigital20(dolbydigital20_xpm);
 static cBitmap bmDolbyDigital51(dolbydigital51_xpm);
 static cBitmap bmMpeg2(mpeg2_xpm);
 static cBitmap bmH264(h264_xpm);
-static cBitmap bmH265(h265_xpm);
 static cBitmap bmPal(pal_xpm);
 static cBitmap bmNtsc(ntsc_xpm);
 static cBitmap bmEncrypted(encrypted_xpm);
@ -92,9 +84,6 @@ static cBitmap bmFive(five_xpm);
 static cBitmap bmSix(six_xpm);
 static cBitmap bmSeven(seven_xpm);
 static cBitmap bmEight(eight_xpm);
-static cBitmap bmFormat2160(format2160_xpm);
-static cBitmap bmFormat2160i(format2160i_xpm);
-static cBitmap bmFormat2160p(format2160p_xpm);
 static cBitmap bmFormat1080(format1080_xpm);
 static cBitmap bmFormat1080i(format1080i_xpm);
 static cBitmap bmFormat1080p(format1080p_xpm);
@ -128,7 +117,7 @@ void cFemonSymbolCache::Refresh()
  int width, height;
  double aspect, xfactor, yfactor;
  cDevice::PrimaryDevice()->GetOsdSize(width, height, aspect);
-  debug1("%s width=%d height=%d", __PRETTY_FUNCTION__, width, height);
+  debug("%s(): %dx%d\n", __PRETTY_FUNCTION__, width, height);
  xfactor = (double)width / DEFAULT_WIDTH;
  yfactor = (double)height / DEFAULT_HEIGHT;
  if (!DoubleEqual(xfactor, xFactorM) || !DoubleEqual(yfactor, yFactorM)) {
@ -140,59 +129,54 @@ void cFemonSymbolCache::Refresh()

 bool cFemonSymbolCache::Populate(void)
 {
-  debug1("%s xFactor=%.02f yFactor=%.02f", __PRETTY_FUNCTION__, xFactorM, yFactorM);
+  debug("%s(): %.02fx%.02f\n", __PRETTY_FUNCTION__, xFactorM, yFactorM);
  if (!DoubleEqual(0.0, xFactorM) || !DoubleEqual(0.0, yFactorM)) {
     Flush();

     // pushing order must follow the enumeration - keep original proportions except for frontend status ones
-     cacheM.Append(bmOnePixel.Scaled(yFactorM, yFactorM, antiAliasM));        // SYMBOL_ONEPIXEL
-     cacheM.Append(bmStereo.Scaled(yFactorM, yFactorM, antiAliasM));          // SYMBOL_STEREO
-     cacheM.Append(bmMonoLeft.Scaled(yFactorM, yFactorM, antiAliasM));        // SYMBOL_MONO_LEFT
-     cacheM.Append(bmMonoRight.Scaled(yFactorM, yFactorM, antiAliasM));       // SYMBOL_MONO_RIGHT
-     cacheM.Append(bmDolbyDigital.Scaled(yFactorM, yFactorM, antiAliasM));    // SYMBOL_DD
-     cacheM.Append(bmDolbyDigital20.Scaled(yFactorM, yFactorM, antiAliasM));  // SYMBOL_DD20
-     cacheM.Append(bmDolbyDigital51.Scaled(yFactorM, yFactorM, antiAliasM));  // SYMBOL_DD51
-     cacheM.Append(bmMpeg2.Scaled(yFactorM, yFactorM, antiAliasM));           // SYMBOL_MPEG2
-     cacheM.Append(bmH264.Scaled(yFactorM, yFactorM, antiAliasM));            // SYMBOL_H264
-     cacheM.Append(bmH265.Scaled(yFactorM, yFactorM, antiAliasM));            // SYMBOL_H265
-     cacheM.Append(bmPal.Scaled(yFactorM, yFactorM, antiAliasM));             // SYMBOL_PAL
-     cacheM.Append(bmNtsc.Scaled(yFactorM, yFactorM, antiAliasM));            // SYMBOL_NTSC
-     cacheM.Append(bmEncrypted.Scaled(yFactorM, yFactorM, antiAliasM));       // SYMBOL_ENCRYPTED
-     cacheM.Append(bmSvdrp.Scaled(yFactorM, yFactorM, antiAliasM));           // SYMBOL_SVDRP
-     cacheM.Append(bmLock.Scaled(xFactorM, yFactorM, antiAliasM));            // SYMBOL_LOCK
-     cacheM.Append(bmSignal.Scaled(xFactorM, yFactorM, antiAliasM));          // SYMBOL_SIGNAL
-     cacheM.Append(bmCarrier.Scaled(xFactorM, yFactorM, antiAliasM));         // SYMBOL_CARRIER
-     cacheM.Append(bmViterbi.Scaled(xFactorM, yFactorM, antiAliasM));         // SYMBOL_VITERBI
-     cacheM.Append(bmSync.Scaled(xFactorM, yFactorM, antiAliasM));            // SYMBOL_SYNC
-     cacheM.Append(bmAspectRatio11.Scaled(yFactorM, yFactorM, antiAliasM));   // SYMBOL_AR_1_1
-     cacheM.Append(bmAspectRatio169.Scaled(yFactorM, yFactorM, antiAliasM));  // SYMBOL_AR_16_9
+     cacheM.Append(bmStereo.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_STEREO
+     cacheM.Append(bmMonoLeft.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_MONO_LEFT
+     cacheM.Append(bmMonoRight.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_MONO_RIGHT
+     cacheM.Append(bmDolbyDigital.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_DD
+     cacheM.Append(bmDolbyDigital20.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_DD20
+     cacheM.Append(bmDolbyDigital51.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_DD51
+     cacheM.Append(bmMpeg2.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_MPEG2
+     cacheM.Append(bmH264.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_H264
+     cacheM.Append(bmPal.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_PAL
+     cacheM.Append(bmNtsc.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_NTSC
+     cacheM.Append(bmEncrypted.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_ENCRYPTED
+     cacheM.Append(bmSvdrp.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_SVDRP
+     cacheM.Append(bmLock.Scaled(xFactorM, yFactorM, antiAliasM)); // SYMBOL_LOCK
+     cacheM.Append(bmSignal.Scaled(xFactorM, yFactorM, antiAliasM)); // SYMBOL_SIGNAL
+     cacheM.Append(bmCarrier.Scaled(xFactorM, yFactorM, antiAliasM)); // SYMBOL_CARRIER
+     cacheM.Append(bmViterbi.Scaled(xFactorM, yFactorM, antiAliasM)); // SYMBOL_VITERBI
+     cacheM.Append(bmSync.Scaled(xFactorM, yFactorM, antiAliasM)); // SYMBOL_SYNC
+     cacheM.Append(bmAspectRatio11.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AR_1_1
+     cacheM.Append(bmAspectRatio169.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AR_16_9
     cacheM.Append(bmAspectRatio2211.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AR_2_21_1
-     cacheM.Append(bmAspectRatio43.Scaled(yFactorM, yFactorM, antiAliasM));   // SYMBOL_AR_4_3
-     cacheM.Append(bmDevice.Scaled(yFactorM, yFactorM, antiAliasM));          // SYMBOL_DEVICE
-     cacheM.Append(bmZero.Scaled(yFactorM, yFactorM, antiAliasM));            // SYMBOL_ZERO
-     cacheM.Append(bmOne.Scaled(yFactorM, yFactorM, antiAliasM));             // SYMBOL_ONE
-     cacheM.Append(bmTwo.Scaled(yFactorM, yFactorM, antiAliasM));             // SYMBOL_TWO
-     cacheM.Append(bmThree.Scaled(yFactorM, yFactorM, antiAliasM));           // SYMBOL_THREE
-     cacheM.Append(bmFour.Scaled(yFactorM, yFactorM, antiAliasM));            // SYMBOL_FOUR
-     cacheM.Append(bmFive.Scaled(yFactorM, yFactorM, antiAliasM));            // SYMBOL_FIVE
-     cacheM.Append(bmSix.Scaled(yFactorM, yFactorM, antiAliasM));             // SYMBOL_SIX
-     cacheM.Append(bmSeven.Scaled(yFactorM, yFactorM, antiAliasM));           // SYMBOL_SEVEN
-     cacheM.Append(bmEight.Scaled(yFactorM, yFactorM, antiAliasM));           // SYMBOL_EIGHT
-     cacheM.Append(bmFormat2160.Scaled(yFactorM, yFactorM, antiAliasM));      // SYMBOL_FORMAT_2160
-     cacheM.Append(bmFormat2160i.Scaled(yFactorM, yFactorM, antiAliasM));     // SYMBOL_FORMAT_2160i
-     cacheM.Append(bmFormat2160p.Scaled(yFactorM, yFactorM, antiAliasM));     // SYMBOL_FORMAT_2160p
-     cacheM.Append(bmFormat1080.Scaled(yFactorM, yFactorM, antiAliasM));      // SYMBOL_FORMAT_1080
-     cacheM.Append(bmFormat1080i.Scaled(yFactorM, yFactorM, antiAliasM));     // SYMBOL_FORMAT_1080i
-     cacheM.Append(bmFormat1080p.Scaled(yFactorM, yFactorM, antiAliasM));     // SYMBOL_FORMAT_1080p
-     cacheM.Append(bmFormat720.Scaled(yFactorM, yFactorM, antiAliasM));       // SYMBOL_FORMAT_720
-     cacheM.Append(bmFormat720i.Scaled(yFactorM, yFactorM, antiAliasM));      // SYMBOL_FORMAT_720i
-     cacheM.Append(bmFormat720p.Scaled(yFactorM, yFactorM, antiAliasM));      // SYMBOL_FORMAT_720p
-     cacheM.Append(bmFormat576.Scaled(yFactorM, yFactorM, antiAliasM));       // SYMBOL_FORMAT_576
-     cacheM.Append(bmFormat576i.Scaled(yFactorM, yFactorM, antiAliasM));      // SYMBOL_FORMAT_576i
-     cacheM.Append(bmFormat576p.Scaled(yFactorM, yFactorM, antiAliasM));      // SYMBOL_FORMAT_576p
-     cacheM.Append(bmFormat480.Scaled(yFactorM, yFactorM, antiAliasM));       // SYMBOL_FORMAT_480
-     cacheM.Append(bmFormat480i.Scaled(yFactorM, yFactorM, antiAliasM));      // SYMBOL_FORMAT_480i
-     cacheM.Append(bmFormat480p.Scaled(yFactorM, yFactorM, antiAliasM));      // SYMBOL_FORMAT_480p
+     cacheM.Append(bmAspectRatio43.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_AR_4_3
+     cacheM.Append(bmDevice.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_DEVICE
+     cacheM.Append(bmZero.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_ZERO
+     cacheM.Append(bmOne.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_ONE
+     cacheM.Append(bmTwo.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_TWO
+     cacheM.Append(bmThree.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_THREE
+     cacheM.Append(bmFour.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FOUR
+     cacheM.Append(bmFive.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FIVE
+     cacheM.Append(bmSix.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_SIX
+     cacheM.Append(bmSeven.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_SEVEN
+     cacheM.Append(bmEight.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_EIGHT
+     cacheM.Append(bmFormat1080.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_1080
+     cacheM.Append(bmFormat1080i.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_1080i
+     cacheM.Append(bmFormat1080p.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_1080p
+     cacheM.Append(bmFormat720.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_720
+     cacheM.Append(bmFormat720i.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_720i
+     cacheM.Append(bmFormat720p.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_720p
+     cacheM.Append(bmFormat576.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_576
+     cacheM.Append(bmFormat576i.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_576i
+     cacheM.Append(bmFormat576p.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_576p
+     cacheM.Append(bmFormat480.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_480
+     cacheM.Append(bmFormat480i.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_480i
+     cacheM.Append(bmFormat480p.Scaled(yFactorM, yFactorM, antiAliasM)); // SYMBOL_FORMAT_480p

     return true;
     }
@ -202,7 +186,7 @@ bool cFemonSymbolCache::Populate(void)

 bool cFemonSymbolCache::Flush(void)
 {
-  debug1("%s", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
  for (int i = 0; i < cacheM.Size(); ++i) {
      cBitmap *bmp = cacheM[i];
      DELETENULL(bmp);
@ -213,12 +197,12 @@ bool cFemonSymbolCache::Flush(void)

 cBitmap& cFemonSymbolCache::Get(eSymbols symbolP)
 {
-  cBitmap *bitmapM = &bmOnePixel;
+  cBitmap *bitmapM = NULL;

  if (symbolP < cacheM.Size())
     bitmapM = cacheM[symbolP];
  else
-    error("%s (%d) Invalid symbol", __PRETTY_FUNCTION__, symbolP);
+    error("%s(): Invalid symbol %d\n", __PRETTY_FUNCTION__, symbolP);

  return *bitmapM;
 }
--- a/femonsymbol.h
+++ b/femonsymbol.h
@ -1,18 +1,17 @@
 /*
- * symbol.h: Frontend Status Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 */

-#ifndef __FEMON_SYMBOL_H
-#define __FEMON_SYMBOL_H
+#ifndef __FEMONSYMBOL_H
+#define __FEMONSYMBOL_H

 #include <vdr/tools.h>
 #include <vdr/osd.h>

 enum eSymbols {
-  SYMBOL_ONEPIXEL,
  SYMBOL_STEREO,
  SYMBOL_MONO_LEFT,
  SYMBOL_MONO_RIGHT,
@ -21,7 +20,6 @@ enum eSymbols {
  SYMBOL_DD51,
  SYMBOL_MPEG2,
  SYMBOL_H264,
-  SYMBOL_H265,
  SYMBOL_PAL,
  SYMBOL_NTSC,
  SYMBOL_ENCRYPTED,
@ -45,9 +43,6 @@ enum eSymbols {
  SYMBOL_SIX,
  SYMBOL_SEVEN,
  SYMBOL_EIGHT,
-  SYMBOL_FORMAT_2160,
-  SYMBOL_FORMAT_2160i,
-  SYMBOL_FORMAT_2160p,
  SYMBOL_FORMAT_1080,
  SYMBOL_FORMAT_1080i,
  SYMBOL_FORMAT_1080p,
@ -82,10 +77,10 @@ public:
  ~cFemonSymbolCache();
  void Refresh();
  cBitmap& Get(eSymbols symbolP);
-  int GetSpacing()  { return int(yFactorM * cFemonSymbolCache::DEFAULT_SPACING);  }
-  int GetRounding() { return int(yFactorM * cFemonSymbolCache::DEFAULT_ROUNDING); }
+  int GetSpacing()  { return int(yFactorM * DEFAULT_SPACING);  }
+  int GetRounding() { return int(yFactorM * DEFAULT_ROUNDING); }
 };

 extern cFemonSymbolCache femonSymbols;

-#endif // __FEMON_SYMBOL_H
+#endif // __FEMONSYMBOL_H
--- a/femontools.c
+++ b/femontools.c
@ -0,0 +1,592 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <linux/dvb/frontend.h>
+#include "femonreceiver.h"
+#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("SECA Mediaguard (%X)",  value); // Canal Plus
+    case 0x0464:            return cString::sprintf("EuroDec (%X)",          value); // EuroDec
+    case 0x0500 ... 0x05FF: return cString::sprintf("Viaccess (%X)",         value); // France Telecom
+    case 0x0600 ... 0x06FF: return cString::sprintf("Irdeto (%X)",           value); // Irdeto
+    case 0x0900 ... 0x09FF: return cString::sprintf("NDS Videoguard (%X)",   value); // News Datacom
+    case 0x0B00 ... 0x0BFF: return cString::sprintf("Conax (%X)",            value); // Norwegian Telekom
+    case 0x0D00 ... 0x0DFF: return cString::sprintf("CryptoWorks (%X)",      value); // Philips
+    case 0x0E00 ... 0x0EFF: return cString::sprintf("PowerVu (%X)",          value); // Scientific Atlanta
+    case 0x1000:            return cString::sprintf("RAS (%X)",              value); // Tandberg Television
+    case 0x1200 ... 0x12FF: return cString::sprintf("NagraVision (%X)",      value); // BellVu Express
+    case 0x1700 ... 0x17FF: return cString::sprintf("BetaCrypt (%X)",        value); // BetaTechnik
+    case 0x1800 ... 0x18FF: return cString::sprintf("NagraVision (%X)",      value); // Kudelski SA
+    case 0x22F0:            return cString::sprintf("Codicrypt (%X)",        value); // Scopus Network Technologies
+    case 0x2600:            return cString::sprintf("BISS (%X)",             value); // European Broadcasting Union
+    case 0x4347:            return cString::sprintf("CryptOn (%X)",          value); // CryptOn
+    case 0x4800:            return cString::sprintf("Accessgate (%X)",       value); // Telemann
+    case 0x4900:            return cString::sprintf("China Crypt (%X)",      value); // CryptoWorks
+    case 0x4A10:            return cString::sprintf("EasyCas (%X)",          value); // EasyCas
+    case 0x4A20:            return cString::sprintf("AlphaCrypt (%X)",       value); // AlphaCrypt
+    case 0x4A70:            return cString::sprintf("DreamCrypt (%X)",       value); // Dream Multimedia
+    case 0x4A60:            return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
+    case 0x4A61:            return cString::sprintf("Neotioncrypt (%X)",     value); // Neotion
+    case 0x4A62:            return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
+    case 0x4A63:            return cString::sprintf("Neotion SHL (%X)",      value); // Neotion
+    case 0x4A64 ... 0x4A6F: return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
+    case 0x4A80:            return cString::sprintf("ThalesCrypt (%X)",      value); // TPS
+    case 0x4AA1:            return cString::sprintf("KeyFly (%X)",           value); // SIDSA
+    case 0x4ABF:            return cString::sprintf("DG-Crypt (%X)",         value); // Beijing Compunicate Technology Inc.
+    case 0x4AD0 ... 0x4AD1: return cString::sprintf("X-Crypt (%X)",          value); // XCrypt Inc.
+    case 0x4AD4:            return cString::sprintf("OmniCrypt (%X)",        value); // Widevine Technologies, Inc.
+    case 0x4AE0:            return cString::sprintf("RossCrypt (%X)",        value); // Digi Raum Electronics Co. Ltd.
+    case 0x5500:            return cString::sprintf("Z-Crypt (%X)",          value); // Digi Raum Electronics Co. Ltd.
+    case 0x5501:            return cString::sprintf("Griffin (%X)",          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 "---";
+}
+
+cDvbDevice *getDvbDevice(cDevice* device)
+{
+  cDvbDevice *dev = dynamic_cast<cDvbDevice*>(device);
+#ifdef __DYNAMIC_DEVICE_PROBE
+  if (!dev && device && device->HasSubDevice())
+     dev = dynamic_cast<cDvbDevice*>(device->SubDevice());
+#endif
+  return dev;
+}
+
+cString getFrontendInfo(cDvbDevice *device)
+{
+  struct dvb_frontend_info value;
+  fe_status_t status;
+  cString info = "";
+  uint16_t signal = 0;
+  uint16_t snr = 0;
+  uint32_t ber = 0;
+  uint32_t unc = 0;
+  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+
+  if (!device)
+     return info;
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
+  if (fe < 0)
+     return info;
+
+  info = cString::sprintf("CARD:%d\nSTRG:%d\nQUAL:%d", device->CardIndex(), device->SignalStrength(), device->SignalQuality());
+
+  if (ioctl(fe, FE_GET_INFO, &value) >= 0)
+     info = cString::sprintf("%s\nTYPE:%d\nNAME:%s", *info, value.type, *device->DeviceName());
+  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());
+
+  return info;
+}
+
+cString getFrontendName(cDvbDevice *device)
+{
+  if (!device)
+     return NULL;
+
+  return (cString::sprintf("%s on device #%d", *device->DeviceName(), device->CardIndex()));
+}
+
+cString getFrontendStatus(cDvbDevice *device)
+{
+  fe_status_t value;
+
+  if (!device)
+     return NULL;
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
+  if (fe < 0)
+     return NULL;
+  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" : "-", device->CardIndex()));
+}
+
+uint16_t getSignal(cDvbDevice *device)
+{
+  uint16_t value = 0;
+
+  if (!device)
+     return (value);
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
+  if (fe < 0)
+     return (value);
+  ioctl(fe, FE_READ_SIGNAL_STRENGTH, &value);
+  close(fe);
+
+  return (value);
+}
+
+uint16_t getSNR(cDvbDevice *device)
+{
+  uint16_t value = 0;
+
+  if (!device)
+     return (value);
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
+  if (fe < 0)
+     return (value);
+  ioctl(fe, FE_READ_SNR, &value);
+  close(fe);
+
+  return (value);
+}
+
+uint32_t getBER(cDvbDevice *device)
+{
+  uint32_t value = 0;
+
+  if (!device)
+     return (value);
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
+  if (fe < 0)
+     return (value);
+  ioctl(fe, FE_READ_BER, &value);
+  close(fe);
+
+  return (value);
+}
+
+uint32_t getUNC(cDvbDevice *device)
+{
+  uint32_t value = 0;
+
+  if (!device)
+     return (value);
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
+  if (fe < 0)
+     return (value);
+  ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &value);
+  close(fe);
+
+  return (value);
+}
+
+cString getApids(const cChannel *channel)
+{
+  int value = 0;
+  cString apids = cString::sprintf("%d", channel->Apid(value));
+  while (channel->Apid(++value) && (value < MAXAPIDS))
+    apids = cString::sprintf("%s, %d", *apids, channel->Apid(value));
+  return apids;
+}
+
+cString getDpids(const cChannel *channel)
+{
+  int value = 0;
+  cString dpids = cString::sprintf("%d", channel->Dpid(value));
+  while (channel->Dpid(++value) && (value < MAXDPIDS))
+    dpids = cString::sprintf("%s, %d", *dpids, channel->Dpid(value));
+  return dpids;
+}
+
+cString getSpids(const cChannel *channel)
+{
+  int value = 0;
+  cString spids = cString::sprintf("%d", channel->Spid(value));
+  while (channel->Spid(++value) && (value < MAXSPIDS))
+    spids = cString::sprintf("%s, %d", *spids, channel->Spid(value));
+  return spids;
+}
+
+cString getCAids(const cChannel *channel)
+{
+  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 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)
+{
+  switch (value) {
+    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("---");
+}
+
+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)
+{
+  return cString::sprintf("%s", getUserString(value, CoderateValues));
+}
+
+cString getTransmission(int value)
+{
+  return cString::sprintf("%s", getUserString(value, TransmissionValues));
+}
+
+cString getBandwidth(int value)
+{
+  return cString::sprintf("%s", getUserString(value, BandwidthValues));
+}
+
+cString getInversion(int value)
+{
+  return cString::sprintf("%s", getUserString(value, InversionValues));
+}
+
+cString getHierarchy(int value)
+{
+  return cString::sprintf("%s", getUserString(value, HierarchyValues));
+}
+
+cString getGuard(int value)
+{
+  return cString::sprintf("%s", getUserString(value, GuardValues));
+}
+
+cString getModulation(int value)
+{
+  return cString::sprintf("%s", getUserString(value, ModulationValues));
+}
+
+cString getTerrestrialSystem(int value)
+{
+  return cString::sprintf("%s", getUserString(value, SystemValuesTerr));
+}
+
+cString getSatelliteSystem(int value)
+{
+  return cString::sprintf("%s", getUserString(value, SystemValuesSat));
+}
+
+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 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("---");
+}
+
+cString getVideoFormat(int value)
+{
+  switch (value) {
+    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 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("---");
+}
+
+cString getAC3AudioCodingMode(int value, int stream)
+{
+  if (stream != 7) {
+     switch (value) {
+       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("---");
+}
+
+cString getAC3CenterMixLevel(int value)
+{
+  switch (value) {
+    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("---");
+}
+
+cString getAC3SurroundMixLevel(int value)
+{
+  switch (value) {
+    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("---");
+}
+
+cString getAC3DolbySurroundMode(int value)
+{
+  switch (value) {
+    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("---");
+}
+
+cString getAC3DialogLevel(int value)
+{
+  if (value > 0)
+     return cString::sprintf("-%d %s", value, tr("dB"));
+  return cString::sprintf("---");
+}
+
+cString getFrequencyMHz(int value)
+{
+   while (value > 20000) value /= 1000;
+   return cString::sprintf("%d %s", value, tr("MHz"));
+}
+
+cString getAudioSamplingFreq(int value)
+{
+  switch (value) {
+    case AUDIO_SAMPLING_FREQUENCY_INVALID:  return cString::sprintf("---");
+    case AUDIO_SAMPLING_FREQUENCY_RESERVED: return cString::sprintf("%s", tr("reserved"));
+    default:                                break;
+    }
+  return cString::sprintf("%d %s", value, tr("Hz"));
+}
+
+cString getAudioBitrate(double value, double stream)
+{
+  switch ((int)stream) {
+    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)
+     return cString::sprintf("%.2f %s", value / 1000000.0, tr("Mbit/s"));
+  return cString::sprintf("---");
+}
+
+cString getBitrateKbits(double value)
+{
+  if (value > 0)
+     return cString::sprintf("%.0f %s", value / 1000.0, tr("kbit/s"));
+  return cString::sprintf("---");
+}
+
+// --- cFemonBitStream -------------------------------------------------------
+
+uint32_t cFemonBitStream::GetUeGolomb()
+{
+  int n = 0;
+
+  while (!GetBit() && (n < 32))
+    n++;
+
+  return (n ? ((1 << n) - 1) + GetBits(n) : 0);
+}
+
+int32_t cFemonBitStream::GetSeGolomb()
+{
+  uint32_t r = GetUeGolomb() + 1;
+
+  return ((r & 1) ? -(r >> 1) : (r >> 1));
+}
+
+void cFemonBitStream::SkipGolomb()
+{
+  int n = 0;
+
+  while (!GetBit() && (n < 32))
+    n++;
+
+  SkipBits(n);
+}
--- a/femontools.h
+++ b/femontools.h
@ -0,0 +1,88 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __FEMONTOOLS_H
+#define __FEMONTOOLS_H
+
+#include <stdint.h>
+#include <vdr/channels.h>
+#include <vdr/dvbdevice.h>
+#include <vdr/remux.h>
+#include <vdr/tools.h>
+
+#ifdef DEBUG
+#define debug(x...) dsyslog("FEMON: " x);
+#define error(x...) esyslog("ERROR: " x);
+#else
+#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"
+
+cDvbDevice *getDvbDevice(cDevice* device);
+
+cString getFrontendInfo(cDvbDevice *device);
+cString getFrontendName(cDvbDevice *device);
+cString getFrontendStatus(cDvbDevice *device);
+
+uint16_t getSNR(cDvbDevice *device);
+uint16_t getSignal(cDvbDevice *device);
+
+uint32_t getBER(cDvbDevice *device);
+uint32_t getUNC(cDvbDevice *device);
+
+cString getApids(const cChannel *channel);
+cString getDpids(const cChannel *channel);
+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);
+cString getInversion(int value);
+cString getHierarchy(int value);
+cString getGuard(int value);
+cString getModulation(int value);
+cString getTerrestrialSystem(int value);
+cString getSatelliteSystem(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);
+cString getAC3SurroundMixLevel(int value);
+cString getAC3DolbySurroundMode(int value);
+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 cFemonBitStream : public cBitStream {
+public:
+  cFemonBitStream(const uint8_t *Data, const int Length) : cBitStream(Data, Length) {}
+  uint32_t       GetUeGolomb();
+  int32_t        GetSeGolomb();
+  void           SkipGolomb();
+  void           SkipUeGolomb() { SkipGolomb(); }
+  void           SkipSeGolomb() { SkipGolomb(); }
+  };
+
+#endif // __FEMONTOOLS_H
--- a/femonvideo.h
+++ b/femonvideo.h
@ -1,19 +1,18 @@
 /*
- * video.h: Frontend Status Monitor plugin for the Video Disk Recorder
+ * Frontend Status Monitor plugin for the Video Disk Recorder
 *
 * See the README file for copyright information and how to reach the author.
 *
 */

-#ifndef __FEMON_VIDEO_H
-#define __FEMON_VIDEO_H
+#ifndef __FEMONVIDEO_H
+#define __FEMONVIDEO_H

 enum eVideoCodec {
  VIDEO_CODEC_INVALID = -1,
  VIDEO_CODEC_UNKNOWN,
  VIDEO_CODEC_MPEG2,
-  VIDEO_CODEC_H264,
-  VIDEO_CODEC_H265
+  VIDEO_CODEC_H264
  };

 enum eVideoFormat {
@ -76,19 +75,19 @@ public:
  virtual ~cFemonVideoIf() {}

  // eVideoCodec
-  virtual void SetVideoCodec(eVideoCodec codecP) = 0;
+  virtual void SetVideoCodec(eVideoCodec codec) = 0;
  // eVideoFormat
-  virtual void SetVideoFormat(eVideoFormat formatP) = 0;
+  virtual void SetVideoFormat(eVideoFormat format) = 0;
  // eVideoScan
-  virtual void SetVideoScan(eVideoScan scanP) = 0;
+  virtual void SetVideoScan(eVideoScan scan) = 0;
  // eVideoAspectRatio
-  virtual void SetVideoAspectRatio(eVideoAspectRatio aspectRatioP) = 0;
+  virtual void SetVideoAspectRatio(eVideoAspectRatio aspectratio) = 0;
  // pixels
-  virtual void SetVideoSize(int widthP, int heightP) = 0;
+  virtual void SetVideoSize(int width, int height) = 0;
  // Hz
-  virtual void SetVideoFramerate(double frameRateP) = 0;
+  virtual void SetVideoFramerate(double framerate) = 0;
  // Mbit/s
-  virtual void SetVideoBitrate(double bitRateP) = 0;
+  virtual void SetVideoBitrate(double bitrate) = 0;
  };

-#endif //__FEMON_VIDEO_H
+#endif //__FEMONVIDEO_H
--- a/h264.h
+++ b/h264.h
@ -1,64 +0,0 @@
-/*
- * h264.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_H264_H
-#define __FEMON_H264_H
-
-#include "video.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    *videoHandlerM;
-  uint32_t          widthM;
-  uint32_t          heightM;
-  eVideoAspectRatio aspectRatioM;
-  eVideoFormat      formatM;
-  double            frameRateM;
-  double            bitRateM;
-  eVideoScan        scanM;
-  bool              cpbDpbDelaysPresentFlagM;
-  bool              picStructPresentFlagM;
-  bool              frameMbsOnlyFlagM;
-  bool              mbAdaptiveFrameFieldFlagM;
-  uint32_t          timeOffsetLengthM;
-
-  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        sarS[];
-  static const t_DAR        darS[];
-  static const eVideoFormat videoFormatS[];
-  static const uint8_t      seiNumClockTsTableS[9];
-
-public:
-  cFemonH264(cFemonVideoIf *videoHandlerP);
-  virtual ~cFemonH264();
-
-  bool processVideo(const uint8_t *bufP, int lenP);
-  };
-
-#endif //__FEMON_H264_H
--- a/h265.c
+++ b/h265.c
@ -1,715 +0,0 @@
-/*
- * h265.c: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#include <math.h>
-
-#include "log.h"
-#include "tools.h"
-#include "h265.h"
-
-const cFemonH265::t_DAR cFemonH265::darS[] =
-{
-  {  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 cFemonH265::t_SAR cFemonH265::sarS[] =
-{
-  { 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 cFemonH265::videoFormatS[] =
-{
-  VIDEO_FORMAT_COMPONENT,
-  VIDEO_FORMAT_PAL,
-  VIDEO_FORMAT_NTSC,
-  VIDEO_FORMAT_SECAM,
-  VIDEO_FORMAT_MAC,
-  VIDEO_FORMAT_UNKNOWN,
-  VIDEO_FORMAT_RESERVED,
-  VIDEO_FORMAT_RESERVED
-};
-
-cFemonH265::cFemonH265(cFemonVideoIf *videoHandlerP)
-: videoHandlerM(videoHandlerP),
-  widthM(0),
-  heightM(0),
-  aspectRatioM(VIDEO_ASPECT_RATIO_INVALID),
-  formatM(VIDEO_FORMAT_INVALID),
-  frameRateM(0),
-  bitRateM(0),
-  scanM(VIDEO_SCAN_INVALID),
-  frameFieldInfoPresentFlagM(false)
-{
-  reset();
-}
-
-cFemonH265::~cFemonH265()
-{
-}
-
-bool cFemonH265::processVideo(const uint8_t *bufP, int lenP)
-{
-  uint8_t nal_data[lenP];
-  bool aud_found = false, sps_found = false, sei_found = true; // SEI temporarily disabled!
-  const uint8_t *buf = bufP;
-  const uint8_t *start = buf;
-  const uint8_t *end = start + lenP;
-
-  if (!videoHandlerM)
-     return false;
-
-  // skip PES header
-  if (!PesLongEnough(lenP))
-      return false;
-  buf += PesPayloadOffset(buf);
-  start = buf;
-
-  reset();
-
-  for (;;) {
-      int consumed = 0;
-
-      buf = nextStartCode(buf, end);
-      if (buf >= end)
-         break;
-
-      switch ((buf[3] >> 1) & 0x3F) {
-        case NAL_AUD:
-             if (!aud_found) {
-                debug2("%s Found NAL AUD at offset %d/%d", __PRETTY_FUNCTION__, int(buf - start), lenP);
-                aud_found = true;
-                }
-             break;
-
-        case NAL_SPS:
-             if (!sps_found) {
-                debug2("%s Found NAL SPS at offset %d/%d", __PRETTY_FUNCTION__, int(buf - start), lenP);
-                int nal_len = nalUnescape(nal_data, buf + 5, int(end - buf - 5));
-                consumed = parseSPS(nal_data, nal_len);
-                if (consumed > 0)
-                   sps_found = true;
-                }
-             break;
-
-        case NAL_SEI:
-             if (!sei_found) {
-               debug2("%s Found NAL SEI at offset %d/%d", __PRETTY_FUNCTION__, int(buf - start), lenP);
-               int nal_len = nalUnescape(nal_data, buf + 5, int(end - buf - 5));
-               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) {
-        videoHandlerM->SetVideoCodec(VIDEO_CODEC_H265);
-        if (sps_found) {
-           debug2("%s width=%d height=%d, aspect=%d format=%d bitrate=%.0f", __PRETTY_FUNCTION__, widthM, heightM, aspectRatioM, formatM, bitRateM);
-           videoHandlerM->SetVideoSize(widthM, heightM);
-           videoHandlerM->SetVideoFormat(formatM);
-           videoHandlerM->SetVideoAspectRatio(aspectRatioM);
-           videoHandlerM->SetVideoBitrate(bitRateM);
-           }
-        if (sps_found || sei_found) {
-           debug2("%s scan=%d framerate=%.2f", __PRETTY_FUNCTION__, scanM, frameRateM);
-           videoHandlerM->SetVideoScan(scanM);
-           videoHandlerM->SetVideoFramerate(frameRateM);
-           }
-        }
-
-  return sps_found;
-}
-
-void cFemonH265::reset()
-{
-  frameFieldInfoPresentFlagM = false;
-}
-
-const uint8_t *cFemonH265::nextStartCode(const uint8_t *startP, const uint8_t *endP)
-{
-  for (endP -= 3; startP < endP; ++startP) {
-      if ((startP[0] == 0x00) && (startP[1] == 0x00) && (startP[2] == 0x01))
-         return startP;
-      }
-  return (endP + 3);
-}
-
-int cFemonH265::nalUnescape(uint8_t *dstP, const uint8_t *srcP, int lenP)
-{
-  int s = 0, d = 0;
-
-  while (s < lenP - 3) {
-    if (!srcP[s] && !srcP[s + 1] && srcP[s + 2] == 3) {
-       dstP[d++] = srcP[s++];
-       dstP[d++] = srcP[s++];
-       s++; // skip emulation_prevention_three_byte
-       }
-    else
-       dstP[d++] = srcP[s++];
-    }
-
-  while (s < lenP)
-    dstP[d++] = srcP[s++];
-
-  return d;
-}
-
-int cFemonH265::parseSPS(const uint8_t *bufP, int lenP)
-{
-  cFemonBitStream bs(bufP, lenP);
-
-  uint32_t width = widthM;
-  uint32_t height = heightM;
-  eVideoFormat format = formatM;
-  eVideoAspectRatio aspect_ratio = aspectRatioM;
-  eVideoScan scan = scanM;
-  double frame_rate = frameRateM;
-  double bit_rate = bitRateM;
-  bool frame_field_info_present_flag = frameFieldInfoPresentFlagM;
-
-  const char *profile_name = NULL;
-  bool general_tier_flag, conformance_window_flag, sps_sub_layer_ordering_info_present_flag, profilePresentFlag = true;
-  bool general_max_12bit_constraint_flag = false, general_max_10bit_constraint_flag = false, general_max_8bit_constraint_flag = false;
-  bool general_max_422chroma_constraint_flag = false, general_max_420chroma_constraint_flag = false, general_max_monochrome_constraint_flag = false;
-  bool general_intra_constraint_flag = false, general_one_picture_only_constraint_flag = false, general_lower_bit_rate_constraint_flag = false;
-  bool general_progressive_source_flag, general_interlaced_source_flag, general_profile_compatibility_flag[32];
-  uint32_t chroma_format_idc, log2_max_pic_order_cnt_lsb_minus4, num_short_term_ref_pic_sets, num_long_term_ref_pics_sps;
-  uint8_t sps_max_sub_layers_minus1, sub_layer_profile_present_flag[8], sub_layer_level_present_flag[8], general_profile_idc, general_level_idc;
-
-  bs.SkipBits(4);                                                    // sps_video_parameter_set_id
-  sps_max_sub_layers_minus1 = bs.GetBits(3);                         // sps_max_sub_layers_minus1
-  bs.SkipBit();                                                      // sps_temporal_id_nesting_flag
-  // start of profile_tier_level(1, sps_max_sub_layers_minus1)
-  if (profilePresentFlag) {
-     bs.SkipBits(2);                                                 // general_profile_space
-     general_tier_flag = bs.GetBit();                                // general_tier_flag
-     general_profile_idc = bs.GetBits(5);                            // general_profile_idc
-     for (int i = 0; i < 32; ++i) {
-         general_profile_compatibility_flag[i] = bs.GetBit();        // general_profile_compatibility_flag[i]
-         }
-     general_progressive_source_flag = bs.GetBit();                  // general_progressive_source_flag
-     general_interlaced_source_flag = bs.GetBit();                   // general_interlaced_source_flag
-     if (general_progressive_source_flag && !general_interlaced_source_flag)
-        scan = VIDEO_SCAN_PROGRESSIVE;
-     else if (!general_progressive_source_flag && general_interlaced_source_flag)
-        scan = VIDEO_SCAN_INTERLACED;
-     else if (!general_progressive_source_flag && !general_interlaced_source_flag)
-        scan = VIDEO_SCAN_UNKNOWN;
-     else
-        scan = VIDEO_SCAN_INVALID;
-     debug2("%s general_progressive_source_flag=%d general_interlaced_source_flag=%d scan_type=%d", __PRETTY_FUNCTION__, general_progressive_source_flag, general_interlaced_source_flag, scan);
-     bs.SkipBit();                                                   // general_non_packed_constraint_flag
-     bs.SkipBit();                                                   // general_frame_only_constraint_flag
-     if (general_profile_idc == 4 || general_profile_compatibility_flag[4] ||
-         general_profile_idc == 5 || general_profile_compatibility_flag[5] ||
-         general_profile_idc == 6 || general_profile_compatibility_flag[6] ||
-         general_profile_idc == 7 || general_profile_compatibility_flag[7]) {
-        // the number of bits in this syntax structure is not affected by this condition
-        general_max_12bit_constraint_flag = bs.GetBit();             // general_max_12bit_constraint_flag
-        general_max_10bit_constraint_flag = bs.GetBit();             // general_max_10bit_constraint_flag
-        general_max_8bit_constraint_flag = bs.GetBit();              // general_max_8bit_constraint_flag
-        debug2("%s  general_max_12bit_constraint_flag=%d general_max_10bit_constraint_flag=%d general_max_8bit_constraint_flag=%d", __PRETTY_FUNCTION__, general_max_12bit_constraint_flag, general_max_10bit_constraint_flag, general_max_8bit_constraint_flag);
-        general_max_422chroma_constraint_flag = bs.GetBit();         // general_max_422chroma_constraint_flag
-        general_max_420chroma_constraint_flag = bs.GetBit();         // general_max_420chroma_constraint_flag
-        general_max_monochrome_constraint_flag = bs.GetBit();        // general_max_monochrome_constraint_flag
-        debug2("%s general_max_422chroma_constraint_flag=%d general_max_420chroma_constraint_flag=%d general_max_monochrome_constraint_flag=%d", __PRETTY_FUNCTION__, general_max_422chroma_constraint_flag, general_max_420chroma_constraint_flag, general_max_monochrome_constraint_flag);
-        general_intra_constraint_flag = bs.GetBit();                 // general_intra_constraint_flag
-        general_one_picture_only_constraint_flag = bs.GetBit();      // general_one_picture_only_constraint_flag
-        general_lower_bit_rate_constraint_flag = bs.GetBit();        // general_lower_bit_rate_constraint_flag
-        debug2("%s general_intra_constraint_flag=%d general_one_picture_only_constraint_flag=%d general_lower_bit_rate_constraint_flag=%d", __PRETTY_FUNCTION__, general_intra_constraint_flag, general_one_picture_only_constraint_flag, general_lower_bit_rate_constraint_flag);
-        bs.SkipBits(34);                                             // general_reserved_zero_34bits
-        }
-     else
-        bs.SkipBits(43);                                             // general_reserved_zero_43bits
-     // the number of bits in this syntax structure is not affected by this condition
-     bs.SkipBit();                                                   // general_reserved_zero_bit
-     }
-  general_level_idc = bs.GetBits(8);                                 // general_level_idc
-  debug2("%s general_profile_idc=%d general_tier_flag=%d general_level_idc=%d", __PRETTY_FUNCTION__, general_profile_idc, general_tier_flag, general_level_idc);
-  switch (general_profile_idc) {
-    default:
-    case 0:
-        profile_name = "None";
-        break;
-    case 1:
-        profile_name = "Main";
-        break;
-    case 2:
-        profile_name = "Main 10";
-        break;
-    case 3:
-        profile_name = "Main Still Picture";
-        break;
-    case 4:
-        profile_name = "Format Range Extensions";
-        break;
-    case 5:
-        profile_name = "Format Range Extensions High Throughput";
-        break;
-    }
-  if (general_profile_idc == 1 || general_profile_idc == 2)
-     switch (general_level_idc) {
-       case 30:  // level 1
-            bit_rate = general_tier_flag ? 0 : 128000;
-            break;
-       case 60:  // level 2
-            bit_rate = general_tier_flag ? 0 : 1500000;
-            break;
-       case 63:  // level 2.1
-            bit_rate = general_tier_flag ? 0 : 3000000;
-            break;
-       case 90:  // level 3
-            bit_rate = general_tier_flag ? 0 : 6000000;
-            break;
-       case 93:  // level 3
-            bit_rate = general_tier_flag ? 0 : 10000000;
-            break;
-       case 120: // level 4
-            bit_rate = general_tier_flag ? 30000000 : 12000000;
-            break;
-       case 123: // level 4.1
-            bit_rate = general_tier_flag ? 50000000 : 20000000;
-            break;
-       case 150: // level 5
-            bit_rate = general_tier_flag ? 100000000 : 25000000;
-            break;
-       case 153: // level 5.1
-            bit_rate = general_tier_flag ? 160000000 : 40000000;
-            break;
-       case 156: // level 5.2
-            bit_rate = general_tier_flag ? 240000000 : 60000000;
-            break;
-       case 180: // level 6
-            bit_rate = general_tier_flag ? 240000000 : 60000000;
-            break;
-       case 183: // level 6.1
-            bit_rate = general_tier_flag ? 480000000 : 120000000;
-            break;
-       case 186: // level 6.2
-            bit_rate = general_tier_flag ? 800000000 : 240000000;
-            break;
-       default:
-            bit_rate = 0;
-            break;
-       }
-  else
-     bit_rate = 0;
-  debug2("%s profile=\"%s@L%.1f@%s\" bit_rate=%.f", __PRETTY_FUNCTION__, profile_name, (double)general_level_idc / 30, general_tier_flag ? "High" : "Main", bit_rate);
-  for (int i = 0; i < sps_max_sub_layers_minus1; ++i) {
-      sub_layer_profile_present_flag[i] = bs.GetBit();               // sub_layer_profile_present_flag[i]
-      sub_layer_level_present_flag[i] = bs.GetBit();                 // sub_layer_level_present_flag[i]
-      }
-  if (sps_max_sub_layers_minus1 > 0) {
-     for (int i = sps_max_sub_layers_minus1; i < 8; ++i)
-         bs.SkipBits(2);                                             // reserved_zero_2bits[i]
-     }
-  for (int i = 0; i < sps_max_sub_layers_minus1; ++i) {
-      if (sub_layer_profile_present_flag[i]) {
-         bs.SkipBits(2);                                             // sub_layer_profile_space[i]
-         bs.SkipBit();                                               // sub_layer_tier_flag[i]
-         bs.SkipBits(5);                                             // sub_layer_profile_idc[i]
-         bs.SkipBits(32);                                            // sub_layer_profile_compatibility_flag[i][0-31]
-         bs.SkipBit();                                               // sub_layer_progressive_source_flag[i]
-         bs.SkipBit();                                               // sub_layer_interlaced_source_flag[i]
-         bs.SkipBit();                                               // sub_layer_non_packed_constraint_flag[i]
-         bs.SkipBit();                                               // sub_layer_frame_only_constraint_flag[i]
-         // the number of bits in this syntax structure is not affected by this condition
-         bs.SkipBits(43);                                            // sub_layer_reserved_zero_43bits[i]
-         // the number of bits in this syntax structure is not affected by this condition
-         bs.SkipBit();                                               // sub_layer_reserved_zero_bit[i]
-         }
-      if (sub_layer_level_present_flag[i])
-         bs.SkipBits(8);                                             // sub_layer_level_idc[i]
-      }
-  // end of profile_tier_level
-  bs.SkipUeGolomb();                                                 // sps_seq_parameter_set_id
-  chroma_format_idc = bs.GetUeGolomb();                              // chroma_format_idc
-  if (chroma_format_idc == 3)
-     bs.SkipBit();                                                   // separate_colour_plane_flag
-  width = bs.GetUeGolomb();                                          // pic_width_in_luma_samples
-  height = bs.GetUeGolomb();                                         // pic_height_in_luma_samples
-
-  conformance_window_flag = bs.GetBit();                             // conformance_window_flag
-  if (conformance_window_flag) {
-     bs.SkipUeGolomb();                                              // conf_win_left_offset
-     bs.SkipUeGolomb();                                              // conf_win_right_offset
-     bs.SkipUeGolomb();                                              // conf_win_top_offset
-     bs.SkipUeGolomb();                                              // conf_win_bottom_offset
-     }
-  bs.SkipUeGolomb();                                                 // bit_depth_luma_minus8
-  bs.SkipUeGolomb();                                                 // bit_depth_chroma_minus8
-  log2_max_pic_order_cnt_lsb_minus4 = bs.GetUeGolomb();              // log2_max_pic_order_cnt_lsb_minus4
-  sps_sub_layer_ordering_info_present_flag = bs.GetBit();            // sps_sub_layer_ordering_info_present_flag
-  for (int i = (sps_sub_layer_ordering_info_present_flag ? 0 : sps_max_sub_layers_minus1); i <= sps_max_sub_layers_minus1; ++i) {
-      bs.SkipUeGolomb();                                             // sps_max_dec_pic_buffering_minus1[i]
-      bs.SkipUeGolomb();                                             // sps_max_num_reorder_pics[i]
-      bs.SkipUeGolomb();                                             // sps_max_latency_increase_plus1[i]
-      }
-  bs.SkipUeGolomb();                                                 // log2_min_luma_coding_block_size_minus3
-  bs.SkipUeGolomb();                                                 // log2_diff_max_min_luma_coding_block_size
-  bs.SkipUeGolomb();                                                 // log2_min_luma_transform_block_size_minus2
-  bs.SkipUeGolomb();                                                 // log2_diff_max_min_luma_transform_block_size
-  bs.SkipUeGolomb();                                                 // max_transform_hierarchy_depth_inter
-  bs.SkipUeGolomb();                                                 // max_transform_hierarchy_depth_intra
-  if (bs.GetBit()) {                                                 // scaling_list_enabled_flag
-     if (bs.GetBit()) {                                              // sps_scaling_list_data_present_flag
-        // start of scaling_list_data()
-        for (int sizeId = 0; sizeId < 4; ++sizeId) {
-            for (int matrixId = 0; matrixId < 6; matrixId += (sizeId == 3) ? 3 : 1) {
-                if (!bs.GetBit())                                    // scaling_list_pred_mode_flag[sizeId][matrixId]
-                   bs.SkipUeGolomb();                                // scaling_list_pred_matrix_id_delta[sizeId][matrixId]
-                else {
-                   int coefNum = min(64, (1 << (4 + (sizeId << 1))));
-                   if (sizeId > 1)
-                      bs.SkipSeGolomb();                             // scaling_list_dc_coef_minus8[sizeId−2][matrixId]
-                   for (int i = 0; i < coefNum; ++i)
-                       bs.SkipSeGolomb();                            // scaling_list_delta_coef
-                   }
-                }
-            }
-        // end of scaling_list_data()
-        }
-     }
-  bs.SkipBit();                                                      // amp_enabled_flag
-  bs.SkipBit();                                                      // sample_adaptive_offset_enabled_flag
-  if (bs.GetBit()) {                                                 // pcm_enabled_flag
-     bs.SkipBits(4);                                                 // pcm_sample_bit_depth_luma_minus1
-     bs.SkipBits(4);                                                 // pcm_sample_bit_depth_chroma_minus1
-     bs.SkipUeGolomb();                                              // log2_min_pcm_luma_coding_block_size_minus3
-     bs.SkipUeGolomb();                                              // log2_diff_max_min_pcm_luma_coding_block_size
-     bs.SkipBit();                                                   // pcm_loop_filter_disabled_flag
-     }
-  num_short_term_ref_pic_sets = bs.GetUeGolomb();                    // num_short_term_ref_pic_sets
-  uint32_t NumDeltaPocs[num_short_term_ref_pic_sets];
-  for (uint32_t stRpsIdx = 0; stRpsIdx < num_short_term_ref_pic_sets; ++stRpsIdx) {
-      // start of st_ref_pic_set(stRpsIdx)
-      bool inter_ref_pic_set_prediction_flag = false;
-      if (stRpsIdx != 0)
-         inter_ref_pic_set_prediction_flag = bs.GetBit();            // inter_ref_pic_set_prediction_flag
-      if (inter_ref_pic_set_prediction_flag) {
-         uint32_t RefRpsIdx, delta_idx_minus1 = 0;
-         if (stRpsIdx == num_short_term_ref_pic_sets)
-            delta_idx_minus1 = bs.GetUeGolomb();                     // delta_idx_minus1
-         bs.SkipBit();                                               // delta_rps_sign
-         bs.SkipUeGolomb();                                          // abs_delta_rps_minus1
-         RefRpsIdx = stRpsIdx - (delta_idx_minus1 + 1);
-         NumDeltaPocs[stRpsIdx] = 0;
-         for (uint32_t j = 0; j <= NumDeltaPocs[RefRpsIdx]; ++j) {
-             if (!bs.GetBit()) {                                     // used_by_curr_pic_flag[j]
-                if (bs.GetBit())                                     // use_delta_flag[j]
-                   NumDeltaPocs[stRpsIdx]++;
-                }
-             else
-                NumDeltaPocs[stRpsIdx]++;
-             }
-         }
-      else {
-         uint32_t num_negative_pics = bs.GetUeGolomb();              // num_negative_pics
-         uint32_t num_positive_pics = bs.GetUeGolomb();              // num_positive_pics
-         for (uint32_t j = 0; j < num_negative_pics; ++j) {
-             bs.SkipUeGolomb();                                      // delta_poc_s0_minus1[i]
-             bs.SkipBit();                                           // used_by_curr_pic_s0_flag[i]
-             }
-         for (uint32_t j = 0; j < num_positive_pics; ++j) {
-             bs.SkipUeGolomb();                                      // delta_poc_s1_minus1[i]
-             bs.SkipBit();                                           // delta_poc_s1_minus1[i]
-             }
-         NumDeltaPocs[stRpsIdx] = num_negative_pics + num_positive_pics;
-         }
-      // end of st_ref_pic_set(stRpsIdx)
-      }
-  if (bs.GetBit()) {                                                 // long_term_ref_pics_present_flag
-     num_long_term_ref_pics_sps = bs.GetUeGolomb();                  // num_long_term_ref_pics_sps
-     for (uint32_t i = 0; i < num_long_term_ref_pics_sps; ++i) {
-         bs.SkipBits(log2_max_pic_order_cnt_lsb_minus4 + 4);         // lt_ref_pic_poc_lsb_sps[i]
-         bs.SkipBit();                                               // used_by_curr_pic_lt_sps_flag[i]
-         }
-     }
-  bs.SkipBit();                                                      // sps_temporal_mvp_enabled_flag
-  bs.SkipBit();                                                      // strong_intra_smoothing_enabled_flag
-  if (bs.GetBit()) {                                                 // vui_parameters_present_flag
-     // start of vui_parameters()
-     if (bs.GetBit()) {                                              // aspect_ratio_info_present_flag
-        uint32_t sar_width = 0, sar_height = 0;
-        uint8_t aspect_ratio_idc = bs.GetBits(8);                    // aspect_ratio_idc
-        debug2("%s aspect_ratio_idc=%d", __PRETTY_FUNCTION__, aspect_ratio_idc);
-        if (aspect_ratio_idc == 255) {                               // EXTENDED_SAR
-           sar_width  = bs.GetBits(16);                              // sar_width
-           sar_height = bs.GetBits(16);                              // sar_height
-           }
-        else if (aspect_ratio_idc < ELEMENTS(sarS)) {
-           sar_width  = sarS[aspect_ratio_idc].w;
-           sar_height = sarS[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(darS); ++i) {
-               if (darS[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 = darS[index].dar;
-           debug2("%s sar_width=%d sar_height=%d aspect_ratio=%d", __PRETTY_FUNCTION__, sar_width, sar_height, aspect_ratio);
-           }
-        }
-     if (bs.GetBit())                                                // overscan_info_present_flag
-        bs.SkipBit();                                                // overscan_appropriate_flag
-     if (bs.GetBit()) {                                              // video_signal_type_present_flag
-        uint32_t video_format = bs.GetBits(3);                       // video_format
-        if (video_format < ELEMENTS(videoFormatS)) {
-           format = videoFormatS[video_format];
-           debug2("%s video_format=%d format=%d", __PRETTY_FUNCTION__, video_format, 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_coeffs
-           }
-        }
-     if (bs.GetBit()) {                                              // chroma_loc_info_present_flag
-        bs.SkipUeGolomb();                                           // chroma_sample_loc_type_top_field
-        bs.SkipUeGolomb();                                           // chroma_sample_loc_type_bottom_field
-        }
-     bs.SkipBit();                                                   // neutral_chroma_indication_flag
-     bs.SkipBit();                                                   // field_seq_flag
-     frame_field_info_present_flag = bs.GetBit();                    // frame_field_info_present_flag
-     debug2("%s frame_field_info_present_flag=%d", __PRETTY_FUNCTION__, frame_field_info_present_flag);
-     if (bs.GetBit()) {                                              // default_display_window_flag
-        bs.SkipUeGolomb();                                           // def_disp_win_left_offset
-        bs.SkipUeGolomb();                                           // def_disp_win_right_offset
-        bs.SkipUeGolomb();                                           // def_disp_win_top_offset
-        bs.SkipUeGolomb();                                           // def_disp_win_bottom_offset
-        }
-     if (bs.GetBit()) {                                              // vui_timing_info_present_flag
-        uint32_t vui_num_units_in_tick = bs.GetBits(32);             // vui_num_units_in_tick
-        uint32_t vui_time_scale = bs.GetBits(32);                    // vui_time_scale
-        if (vui_num_units_in_tick > 0) {
-           frame_rate = (double)vui_time_scale / vui_num_units_in_tick;
-           debug2("%s frame_rate = vui_time_scale(%d) / vui_num_units_in_tick(%d) = %.f", __PRETTY_FUNCTION__, vui_time_scale, vui_num_units_in_tick, frame_rate);
-           }
-        if (bs.GetBit())                                             // vui_poc_proportional_to_timing_flag
-           bs.SkipUeGolomb();                                        // vui_num_ticks_poc_diff_one_minus1
-        if (bs.GetBit()) {                                           // vui_hrd_parameters_present_flag
-           // start of hrd_parameters(1, sps_max_sub_layers_minus1)
-           uint32_t bit_rate_scale = 0;
-           bool commonInfPresentFlag = true, nal_hrd_parameters_present_flag = false, vcl_hrd_parameters_present_flag = false, sub_pic_hrd_params_present_flag = false;
-           if (commonInfPresentFlag) {
-              nal_hrd_parameters_present_flag = bs.GetBit();         // nal_hrd_parameters_present_flag
-              vcl_hrd_parameters_present_flag = bs.GetBit();         // vcl_hrd_parameters_present_flag
-              if (nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag) {
-                 sub_pic_hrd_params_present_flag = bs.GetBit();      // sub_pic_hrd_params_present_flag
-                 if (sub_pic_hrd_params_present_flag) {
-                    bs.SkipBits(8);                                  // tick_divisor_minus2
-                    bs.SkipBits(5);                                  // du_cpb_removal_delay_increment_length_minus1
-                    bs.SkipBit();                                    // sub_pic_cpb_params_in_pic_timing_sei_flag
-                    bs.SkipBits(5);                                  // dpb_output_delay_du_length_minus1
-                    }
-                 bit_rate_scale = bs.GetBits(4);                     // bit_rate_scale
-                 bs.SkipBits(4);                                     // cpb_size_scale
-                 if (sub_pic_hrd_params_present_flag)
-                    bs.SkipBits(4);                                  // cpb_size_du_scale
-                 bs.SkipBits(5);                                     // initial_cpb_removal_delay_length_minus1
-                 bs.SkipBits(5);                                     // au_cpb_removal_delay_length_minus1
-                 bs.SkipBits(5);                                     // dpb_output_delay_length_minus1
-                 }
-              }
-           for (uint32_t i = 0; i <= sps_max_sub_layers_minus1; ++i) {
-               bool fixed_pic_rate_within_cvs_flag = false, low_delay_hrd_flag = false;
-               uint32_t cpb_cnt_minus1 = 0;
-               if (!bs.GetBit())                                     // fixed_pic_rate_general_flag[i]
-                  fixed_pic_rate_within_cvs_flag = bs.GetBit();      // fixed_pic_rate_within_cvs_flag[i]
-               if (fixed_pic_rate_within_cvs_flag)
-                  bs.SkipUeGolomb();                                 // elemental_duration_in_tc_minus1[i]
-               else
-                  low_delay_hrd_flag = bs.GetBit();                  // low_delay_hrd_flag[i]
-               if (!low_delay_hrd_flag)
-                  cpb_cnt_minus1 = bs.GetUeGolomb();                 // cpb_cnt_minus1[i]
-               if (nal_hrd_parameters_present_flag) {
-                  // start of sub_layer_hrd_parameters(i)
-                  for (uint32_t i = 0; i <= cpb_cnt_minus1; ++i) {
-                      uint32_t bit_rate_value_minus1;
-                      bit_rate_value_minus1 = bs.GetUeGolomb();      // bit_rate_value_minus1[i]
-                      bs.SkipUeGolomb();                             // cpb_size_value_minus1[i]
-                      if (sub_pic_hrd_params_present_flag) {
-                          bs.SkipUeGolomb();                         // cpb_size_du_value_minus1[i]
-                          bs.SkipUeGolomb();                         // bit_rate_du_value_minus1[i]
-                         }
-                      else {
-                         double bitrate = (double)((bit_rate_value_minus1 + 1) * pow(2.0, 6 + bit_rate_scale));
-                         debug2("%s bit_rate_value_minus1(%u) + 1 * 2 ^ (6 + bit_rate_scale(%u)) = %.f",  __PRETTY_FUNCTION__, bit_rate_value_minus1, bit_rate_scale, bitrate);
-                         }
-                      bs.SkipBit();                                  // cbr_flag[i]
-                      }
-                  // end of sub_layer_hrd_parameters(i)
-                  }
-               if (vcl_hrd_parameters_present_flag) {
-                  // start of sub_layer_hrd_parameters(i)
-                  for (uint32_t i = 0; i <= cpb_cnt_minus1; ++i) {
-                      bs.SkipUeGolomb();                             // bit_rate_value_minus1[i]
-                      bs.SkipUeGolomb();                             // cpb_size_value_minus1[i]
-                      if (sub_pic_hrd_params_present_flag) {
-                          bs.SkipUeGolomb();                         // cpb_size_du_value_minus1[i]
-                          bs.SkipUeGolomb();                         // bit_rate_du_value_minus1[i]
-                         }
-                      bs.SkipBit();                                  // cbr_flag[i]
-                      }
-                  // end of sub_layer_hrd_parameters(i)
-                  }
-               }
-           // end of hrd_parameters(1, sps_max_sub_layers_minus1)
-           }
-        }
-     if (bs.GetBit()) {                                              // bitstream_restriction_flag
-        bs.SkipBit();                                                // tiles_fixed_structure_flag
-        bs.SkipBit();                                                // motion_vectors_over_pic_boundaries_flag
-        bs.SkipBit();                                                // restricted_ref_pic_lists_flag
-        bs.SkipUeGolomb();                                           // min_spatial_segmentation_idc
-        bs.SkipUeGolomb();                                           // max_bytes_per_pic_denom
-        bs.SkipUeGolomb();                                           // max_bits_per_min_cu_denom
-        bs.SkipUeGolomb();                                           // log2_max_mv_length_horizontal
-        bs.SkipUeGolomb();                                           // log2_max_mv_length_vertical
-        }
-     // end of vui_parameters()
-     }
-  if (bs.GetBit()) {                                                 // sps_extension_present_flag
-     bs.SkipBit();                                                   // sps_range_extension_flag
-     bs.SkipBit();                                                   // sps_multilayer_extension_flag
-     bs.SkipBit();                                                   // sps_3d_extension_flag
-     bs.SkipBits(5);                                                 // sps_extension_5bits
-     }
-
-  widthM = width;
-  heightM = height;
-  formatM = format;
-  aspectRatioM = aspect_ratio;
-  scanM = scan;
-  frameRateM = frame_rate;
-  bitRateM = bit_rate;
-  frameFieldInfoPresentFlagM = frame_field_info_present_flag;
-
-  return (bs.Index() / 8);
-}
-
-int cFemonH265::parseSEI(const uint8_t *bufP, int lenP)
-{
-  cFemonBitStream bs(bufP, lenP);
-
-  eVideoScan scan = scanM;
-
-  while ((bs.Index() * 8 + 16) < lenP) {                             // sei_message
-    int len, lastByte, payloadSize = 0, payloadType = 0;
-
-    do {
-       lastByte = bs.GetBits(8) & 0xFF;
-       payloadType += lastByte;
-    } while (lastByte == 0xFF);                                      // last_payload_type_byte
-
-    do {
-       lastByte = bs.GetBits(8) & 0xFF;
-       payloadSize += lastByte;
-    } while (lastByte == 0xFF);                                      // last_payload_size_byte
-
-    switch (payloadType) {                                           // sei_payload
-      case 1:                                                        // pic_timing
-           len = payloadSize * 8;
-           if (frameFieldInfoPresentFlagM) {
-              uint8_t pic_struct = bs.GetBits(4);                    // pic_struct
-              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
-                 case 9:                                             // top paired with previous bottom
-                 case 10:                                            // bottom paired with previous top
-                 case 11:                                            // top paired with next bottom
-                 case 12:                                            // bottom paired with next top
-                      scan = VIDEO_SCAN_INTERLACED;
-                      break;
-                 default:
-                      scan = VIDEO_SCAN_RESERVED;
-                      break;
-                 }
-              debug2("%s pic_struct=%d scan_type=%d", __PRETTY_FUNCTION__, pic_struct, scan);
-              bs.SkipBits(2);                                        // source_scan_type
-              bs.SkipBit();                                          // duplicate_flag
-              len -= 7;
-              }
-           bs.SkipBits(len);
-           break;
-
-      default:
-           bs.SkipBits(payloadSize * 8);
-           break;
-      }
-
-    // force byte align
-    bs.ByteAlign();
-    }
-
-  scanM = scan;
-
-  return (bs.Index() / 8);
-}
--- a/h265.h
+++ b/h265.h
@ -1,62 +0,0 @@
-/*
- * h265.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_H265_H
-#define __FEMON_H265_H
-
-#include "video.h"
-
-class cFemonH265 {
-private:
-  enum {
-    NAL_VPS = 32, // Video Parameter Set
-    NAL_SPS = 33, // Sequence Parameter Set
-    NAL_PPS = 34, // Picture Parameter Set
-    NAL_AUD = 35, // Access Unit Delimiter
-    NAL_EOS = 36, // End of Sequence
-    NAL_EOB = 37, // End of Bitstream
-    NAL_SEI = 39, // Prefix Supplemental Enchancement Information
-  };
-
-  typedef struct DAR {
-    eVideoAspectRatio dar;
-    int               ratio;
-  } t_DAR;
-
-  typedef struct SAR {
-    int               w;
-    int               h;
-  } t_SAR;
-
-  cFemonVideoIf    *videoHandlerM;
-  uint32_t          widthM;
-  uint32_t          heightM;
-  eVideoAspectRatio aspectRatioM;
-  eVideoFormat      formatM;
-  double            frameRateM;
-  double            bitRateM;
-  eVideoScan        scanM;
-  bool              frameFieldInfoPresentFlagM;
-
-  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        sarS[];
-  static const t_DAR        darS[];
-  static const eVideoFormat videoFormatS[];
-
-public:
-  cFemonH265(cFemonVideoIf *videoHandlerP);
-  virtual ~cFemonH265();
-
-  bool processVideo(const uint8_t *bufP, int lenP);
-  };
-
-#endif //__FEMON_H265_H
--- a/latm.h
+++ b/latm.h
@ -1,27 +0,0 @@
-/*
- * latm.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_LATM_H
-#define __FEMON_LATM_H
-
-#include "audio.h"
-
-class cFemonLATM {
-private:
-  cFemonAudioIf *audioHandlerM;
-
-  static int bitrateS[3][16];
-  static int sampleRateS[4];
-
-public:
-  cFemonLATM(cFemonAudioIf *audioHandlerP);
-  virtual ~cFemonLATM();
-
-  bool processAudio(const uint8_t *bufP, int lenP);
-  };
-
-#endif //__FEMON_LATM_H
--- a/log.h
+++ b/log.h
@ -1,48 +0,0 @@
-/*
- * log.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_LOG_H
-#define __FEMON_LOG_H
-
-#include "config.h"
-
-#define error(x...)   esyslog("FEMON-ERROR: " x)
-#define info(x...)    isyslog("FEMON: " x)
-// 0x0001: Generic call stack
-#define debug1(x...)  void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug1)  ? dsyslog("FEMON1: " x)  : void() )
-// 0x0002: H.264
-#define debug2(x...)  void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug2)  ? dsyslog("FEMON2: " x)  : void() )
-// 0x0004: TBD
-#define debug3(x...)  void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug3)  ? dsyslog("FEMON3: " x)  : void() )
-// 0x0008: TBD
-#define debug4(x...)  void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug4)  ? dsyslog("FEMON4: " x)  : void() )
-// 0x0010: TBD
-#define debug5(x...)  void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug5)  ? dsyslog("FEMON5: " x)  : void() )
-// 0x0020: TBD
-#define debug6(x...)  void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug6)  ? dsyslog("FEMON6: " x)  : void() )
-// 0x0040: TBD
-#define debug7(x...)  void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug7)  ? dsyslog("FEMON7: " x)  : void() )
-// 0x0080: TBD
-#define debug8(x...)  void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug8)  ? dsyslog("FEMON8: " x)  : void() )
-// 0x0100: TBD
-#define debug9(x...)  void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug9)  ? dsyslog("FEMON9: " x)  : void() )
-// 0x0200: TBD
-#define debug10(x...) void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug10) ? dsyslog("FEMON10: " x) : void() )
-// 0x0400: TBD
-#define debug11(x...) void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug11) ? dsyslog("FEMON11: " x) : void() )
-// 0x0800: TBD
-#define debug12(x...) void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug12) ? dsyslog("FEMON12: " x) : void() )
-// 0x1000: TBD
-#define debug13(x...) void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug13) ? dsyslog("FEMON13: " x) : void() )
-// 0x2000: TBD
-#define debug14(x...) void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug14) ? dsyslog("FEMON14: " x) : void() )
-// 0x4000: TBD
-#define debug15(x...) void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug15) ? dsyslog("FEMON15: " x) : void() )
-// 0x8000; Extra call stack
-#define debug16(x...) void( FemonConfig.IsTraceMode(cFemonConfig::eTraceModeDebug16) ? dsyslog("FEMON16: " x) : void() )
-
-#endif // __FEMON_LOG_H
--- a/mpeg.h
+++ b/mpeg.h
@ -1,31 +0,0 @@
-/*
- * mpeg.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_MPEG_H
-#define __FEMON_MPEG_H
-
-#include "video.h"
-#include "audio.h"
-
-class cFemonMPEG {
-private:
-  cFemonVideoIf *videoHandlerM;
-  cFemonAudioIf *audioHandlerM;
-
-  static int bitrateS[2][3][16];
-  static int sampleRateS[2][4];
-  static eAudioCodec formatS[2][4];
-
-public:
-  cFemonMPEG(cFemonVideoIf *videoHandlerP, cFemonAudioIf *audioHandlerP);
-  virtual ~cFemonMPEG();
-
-  bool processVideo(const uint8_t *bufP, int lenP);
-  bool processAudio(const uint8_t *bufP, int lenP);
-  };
-
-#endif //__FEMON_MPEG_H
--- a/osd.c
+++ b/osd.c
--- a/osd.h
+++ b/osd.h
@ -1,101 +0,0 @@
-/*
- * osd.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_OSD_H
-#define __FEMON_OSD_H
-
-#include <sys/time.h>
-#include <vdr/osd.h>
-#include <vdr/thread.h>
-#include <vdr/status.h>
-#include <vdr/plugin.h>
-#include <vdr/channels.h>
-#include <vdr/transfer.h>
-#include <vdr/tools.h>
-
-#include "receiver.h"
-#include "svdrpservice.h"
-
-#define MAX_BM_NUMBER 8
-
-class cFemonOsd : public cOsdObject, public cThread, public cStatus {
-private:
-  enum eDeviceSourceType {
-    DEVICESOURCE_DVBAPI = 0,
-    DEVICESOURCE_IPTV,
-    DEVICESOURCE_PVRINPUT,
-    DEVICESOURCE_COUNT
-    };
-
-  static cFemonOsd *pInstanceS;
-
-  cOsd             *osdM;
-  cFemonReceiver   *receiverM;
-  int               svdrpFrontendM;
-  double            svdrpVideoBitRateM;
-  double            svdrpAudioBitRateM;
-  SvdrpConnection_v1_0 svdrpConnectionM;
-  cPlugin          *svdrpPluginM;
-  int               numberM;
-  int               oldNumberM;
-  int               qualityM;
-  bool              qualityValidM;
-  int               strengthM;
-  bool              strengthValidM;
-  double            cnrM;
-  bool              cnrValidM;
-  double            signalM;
-  bool              signalValidM;
-  double            berM;
-  bool              berValidM;
-  double            perM;
-  bool              perValidM;
-  cString           frontendNameM;
-  cString           frontendTypeM;
-  int               frontendStatusM;
-  bool              frontendStatusValidM;
-  dvb_frontend_info frontendInfoM;
-  eDeviceSourceType deviceSourceM;
-  int               displayModeM;
-  int               osdWidthM;
-  int               osdHeightM;
-  int               osdLeftM;
-  int               osdTopM;
-  cFont            *fontM;
-  cTimeMs           inputTimeM;
-  cCondWait         sleepM;
-  cMutex            mutexM;
-
-  bool AttachFrontend(void);
-  void DrawStatusWindow(void);
-  void DrawInfoWindow(void);
-  bool SvdrpConnect(void);
-  bool SvdrpTune(void);
-
-protected:
-  cFemonOsd();
-  cFemonOsd(const cFemonOsd&);
-  cFemonOsd& operator= (const cFemonOsd&);
-  virtual void Action(void);
-  virtual void ChannelSwitch(const cDevice *deviceP, int channelNumberP, bool liveViewP);
-  virtual void SetAudioTrack(int indexP, const char * const *tracksP);
-
-public:
-  static cFemonOsd *Instance(bool createP = false);
-  ~cFemonOsd();
-
-  virtual void Show(void);
-  virtual eOSState ProcessKey(eKeys keyP);
-
-  bool    DeviceSwitch(int directionP);
-  double  GetVideoBitrate(void);
-  double  GetAudioBitrate(void);
-  double  GetDolbyBitrate(void);
-};
-
-#endif //__FEMON_OSD_H
-
--- a/po/de_DE.po
+++ b/po/de_DE.po
@ -1,22 +1,21 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# Copyright (C) 2007 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Peter Marquardt
 # Andreas Brachold
-# Christian Wieninger
-# Winfried
+# Christian Wieninger 
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\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: German <vdr@linuxtv.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"

 msgid "DVB Signal Information Monitor (OSD)"
@ -26,100 +25,7 @@ msgid "Signal Information"
 msgstr "Signalinformationen"

 msgid "Femon not available"
-msgstr "Femon nicht verfügbar"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "AC-3"
-msgstr "AC-3"
-
-msgid "Audio"
-msgstr "Audio"
-
-msgid "Transponder Information"
-msgstr "Transponderinformation"
-
-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 "Coderate"
-
-msgid "Protocol"
-msgstr "Protokoll"
-
-msgid "Bitrate"
-msgstr "Bitrate"
-
-msgid "Stream Information"
-msgstr "Streaminformation"
-
-msgid "Video Stream"
-msgstr "Videostream"
-
-msgid "Codec"
-msgstr "Codec"
-
-msgid "Aspect Ratio"
-msgstr "Seitenverhältnis"
-
-msgid "Frame Rate"
-msgstr "Bildrate"
-
-msgid "Video Format"
-msgstr "Videoformat"
-
-msgid "Resolution"
-msgstr "Auflösung"
-
-msgid "Audio Stream"
-msgstr "Audiostream"
-
-msgid "Channel Mode"
-msgstr "Kanalmodus"
-
-msgid "Sampling Frequency"
-msgstr "Abtastrate"
-
-msgid "AC-3 Stream"
-msgstr "AC-3 Stream"
-
-msgid "Bit Stream Mode"
-msgstr "Bitstream Modus"
-
-msgid "Audio Coding Mode"
-msgstr "Audiokodierung"
-
-msgid "Center Mix Level"
-msgstr "Center Mix Pegel"
-
-msgid "Surround Mix Level"
-msgstr "Surround Mix Pegel"
-
-msgid "Dolby Surround Mode"
-msgstr "Dolby Surround Modus"
-
-msgid "Low Frequency Effects"
-msgstr "Tieftöner Effekte"
-
-msgid "Dialogue Normalization"
-msgstr "Dialog Normalisierung"
+msgstr "Femon nicht verfügbar"

 msgid "basic"
 msgstr "Standard"
@ -130,14 +36,8 @@ msgstr "Transponder"
 msgid "stream"
 msgstr "Stream"

-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
+msgid "AC-3"
+msgstr "AC-3"

 msgid "Classic"
 msgstr "Klassischer"
@ -170,92 +70,176 @@ msgid "PearlHD"
 msgstr "PearlHD"

 msgid "Hide main menu entry"
-msgstr "Hauptmenüeintrag verstecken"
+msgstr "Hauptmenüeintrag verstecken"

 msgid "Define whether the main menu entry is hidden."
-msgstr "Legt fest, ob der Hauptmenüeintrag ausgeblendet ist."
+msgstr ""

 msgid "Default display mode"
 msgstr "Standard Anzeigemodus"

 msgid "Define the default display mode at startup."
-msgstr "Definiert den Standard-Anzeigemodus beim Start."
+msgstr ""

 msgid "Define the used OSD skin."
-msgstr "Definiert die verwendete OSD-Oberfläche."
+msgstr ""

 msgid "Define the used OSD theme."
-msgstr "Definiert das verwendete OSD-Theme."
+msgstr ""

 msgid "Position"
 msgstr "Position"

 msgid "Define the position of OSD."
-msgstr "Definiert die Position des OSD."
+msgstr ""

 msgid "Downscale OSD size [%]"
-msgstr "OSD Größe verkleinern [%]"
+msgstr ""

 msgid "Define the downscale ratio for OSD size."
-msgstr "Definiert den Verkleinerungsfaktor der OSD-Größe."
-
-msgid "Signal level unit"
-msgstr "Signalpegel Einheiten"
-
-msgid "Define the used signal level unit."
-msgstr "Definiert der Einheit für Signalpegel."
+msgstr ""

 msgid "Red limit [%]"
 msgstr "Grenze Rot [%]"

 msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr "Definiert einen Grenzwert für den roten Balken, um ein schlechtes Signal zu kennzeichnen."
+msgstr ""

 msgid "Green limit [%]"
-msgstr "Grenze Grün [%]"
+msgstr "Grenze Grün [%]"

 msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr "Definiert einen Grenzwert für den grünen Balken, um ein gutes Signal zu kennzeichnen."
+msgstr ""

 msgid "OSD update interval [0.1s]"
 msgstr "OSD Updateintervall [0.1s]"

 msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "Definiert den Intervall für OSD-Updates. Ein kleineres Intervall erzeugt eine höhere CPU-Last."
+msgstr ""

 msgid "Analyze stream"
 msgstr "Stream analysieren"

 msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "Definiert ob der DVB-Stream analysiert und die Bitraten berechnet werden."
+msgstr ""

 msgid "Calculation interval [0.1s]"
 msgstr "Berechnungsintervall [0.1s]"

 msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "Definiert den Intervall für die Berechnung. Ein größerer Intervall erzeugt stabilere Werte."
+msgstr ""

 msgid "Use SVDRP service"
-msgstr "SVDRP-Service verwenden"
+msgstr "SVDRP Service verwenden"

 msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "Legt fest, ob der SVDRP-Service in Client/Server-Setups verwendet wird."
+msgstr ""

 msgid "SVDRP service port"
-msgstr "SVDRP-Service Port"
+msgstr "SVDRP Service Port"

 msgid "Define the port number of SVDRP service."
-msgstr "Definiert die Portnummer des SVDRP-Service."
+msgstr ""

 msgid "SVDRP service IP"
-msgstr "SVDRP-Service IP"
+msgstr "SVDRP Service IP"

 msgid "Define the IP address of SVDRP service."
-msgstr "Definiert die IP-Adresse des SVDRP-Service."
+msgstr ""

 msgid "Help"
 msgstr "Hilfe"

+msgid "Video"
+msgstr "Video"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Transponder Information"
+msgstr "Transponderinformation"
+
+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 "Coderate"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Stream Information"
+msgstr "Streaminformation"
+
+msgid "Video Stream"
+msgstr "Video Stream"
+
+msgid "Codec"
+msgstr ""
+
+msgid "Aspect Ratio"
+msgstr "Seitenverhältnis"
+
+msgid "Frame Rate"
+msgstr "Bildrate"
+
+msgid "Video Format"
+msgstr "Bildformat"
+
+msgid "Resolution"
+msgstr "Auflösung"
+
+msgid "Audio Stream"
+msgstr "Audio Stream"
+
+msgid "Channel Mode"
+msgstr ""
+
+msgid "Sampling Frequency"
+msgstr "Abtastrate"
+
+msgid "AC-3 Stream"
+msgstr "AC-3 Stream"
+
+msgid "Bit Stream Mode"
+msgstr "Bitstream Modus"
+
+msgid "Audio Coding Mode"
+msgstr "Audiokodierung"
+
+msgid "Center Mix Level"
+msgstr "Center Mix Pegel"
+
+msgid "Surround Mix Level"
+msgstr "Surround Mix Pegel"
+
+msgid "Dolby Surround Mode"
+msgstr "Dolby Surround Modus"
+
+msgid "Low Frequency Effects"
+msgstr "Tieftöner Effekte"
+
+msgid "Dialogue Normalization"
+msgstr "Dialog Normalisierung"
+
 msgid "Fixed"
 msgstr "Fest"

@ -263,67 +247,64 @@ msgid "Analog"
 msgstr "Analog"

 msgid "MPEG-2"
-msgstr "MPEG-2"
+msgstr ""

 msgid "H.264"
-msgstr "H.264"
-
-msgid "H.265"
-msgstr "H.265"
+msgstr ""

 msgid "MPEG-1 Layer I"
-msgstr "MPEG-1 Layer I"
+msgstr ""

 msgid "MPEG-1 Layer II"
-msgstr "MPEG-1 Layer II"
+msgstr ""

 msgid "MPEG-1 Layer III"
-msgstr "MPEG-1 Layer III"
+msgstr ""

 msgid "MPEG-2 Layer I"
-msgstr "MPEG-2 Layer I"
+msgstr ""

 msgid "MPEG-2 Layer II"
-msgstr "MPEG-2 Layer II"
+msgstr ""

 msgid "MPEG-2 Layer III"
-msgstr "MPEG-2 Layer III"
+msgstr ""

 msgid "HE-AAC"
-msgstr "HE-AAC"
+msgstr ""

 msgid "LATM"
-msgstr "LATM"
+msgstr ""

 msgid "stereo"
-msgstr "Stereo"
+msgstr ""

 msgid "joint Stereo"
-msgstr "Joint-Stereo"
+msgstr ""

 msgid "dual"
-msgstr "Dual"
+msgstr ""

 msgid "mono"
-msgstr "Mono"
+msgstr ""

 msgid "interlaced"
-msgstr "Interlaced"
+msgstr ""

 msgid "progressive"
-msgstr "Progressiv"
+msgstr ""

 msgid "reserved"
 msgstr "belegt"

 msgid "extended"
-msgstr "erweitert"
+msgstr ""

 msgid "unknown"
 msgstr "unbekannt"

 msgid "component"
-msgstr "Komponentenvideo"
+msgstr ""

 msgid "PAL"
 msgstr "PAL"
@ -332,10 +313,10 @@ msgid "NTSC"
 msgstr "NTSC"

 msgid "SECAM"
-msgstr "SECAM"
+msgstr ""

 msgid "MAC"
-msgstr "MAC"
+msgstr ""

 msgid "Hz"
 msgstr "Hz"
@ -350,7 +331,7 @@ msgid "Visually Impaired (VI)"
 msgstr "Sehbehindert (VI)"

 msgid "Hearing Impaired (HI)"
-msgstr "Hörbehindert (HI)"
+msgstr "Hörbehindert (HI)"

 msgid "Dialogue (D)"
 msgstr "Dialog (D)"
@ -362,7 +343,7 @@ msgid "Emergency (E)"
 msgstr "Notfall (E)"

 msgid "Voice Over (VO)"
-msgstr "Überlagerte Stimme (VO)"
+msgstr "Überlagerte Stimme (VO)"

 msgid "Karaoke"
 msgstr "Karaoke"
--- a/po/es_ES.po
+++ b/po/es_ES.po
@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# 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-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\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: Spanish <vdr@linuxtv.org>\n"
 "Language: es\n"
@ -25,12 +25,132 @@ msgstr "Monitorizaci
 msgid "Femon not available"
 msgstr ""

-msgid "Video"
-msgstr "Video"
+msgid "basic"
+msgstr "Básico"
+
+msgid "transponder"
+msgstr "Transpondedor"
+
+msgid "stream"
+msgstr "Flujo"

 msgid "AC-3"
 msgstr "AC-3"

+msgid "Classic"
+msgstr "Clásico"
+
+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 "PearlHD"
+msgstr "PearlHD"
+
+msgid "Hide main menu entry"
+msgstr "Ocultar en el menú principal"
+
+msgid "Define whether the main menu entry is hidden."
+msgstr ""
+
+msgid "Default display mode"
+msgstr "Modo de visualización estandar"
+
+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 "Posición"
+
+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 "Límite de rojo [%s]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
+msgid "Green limit [%]"
+msgstr "Límite verde [%]"
+
+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ón (0,1)"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
+msgid "Analyze stream"
+msgstr "Analizar el flujo"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
+msgid "Calculation interval [0.1s]"
+msgstr "Intervalo de cálculo (0,1s)"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
+msgid "Use SVDRP service"
+msgstr ""
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
+msgid "SVDRP service port"
+msgstr ""
+
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
+msgid "SVDRP service IP"
+msgstr ""
+
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr "Ayuda"
+
+msgid "Video"
+msgstr "Video"
+
 msgid "Audio"
 msgstr "Audio"

@ -118,141 +238,6 @@ msgstr "Efectos de baja frecuencia"
 msgid "Dialogue Normalization"
 msgstr "Normalización del diálogo"

-msgid "basic"
-msgstr "Básico"
-
-msgid "transponder"
-msgstr "Transpondedor"
-
-msgid "stream"
-msgstr "Flujo"
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-msgid "Classic"
-msgstr "Clásico"
-
-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 "PearlHD"
-msgstr "PearlHD"
-
-msgid "Hide main menu entry"
-msgstr "Ocultar en el menú principal"
-
-msgid "Define whether the main menu entry is hidden."
-msgstr ""
-
-msgid "Default display mode"
-msgstr "Modo de visualización estandar"
-
-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 "Posición"
-
-msgid "Define the position of OSD."
-msgstr ""
-
-msgid "Downscale OSD size [%]"
-msgstr ""
-
-msgid "Define the downscale ratio for OSD size."
-msgstr ""
-
-msgid "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-msgstr ""
-
-msgid "Red limit [%]"
-msgstr "Límite de rojo [%s]"
-
-msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr ""
-
-msgid "Green limit [%]"
-msgstr "Límite verde [%]"
-
-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ón (0,1)"
-
-msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr ""
-
-msgid "Analyze stream"
-msgstr "Analizar el flujo"
-
-msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr ""
-
-msgid "Calculation interval [0.1s]"
-msgstr "Intervalo de cálculo (0,1s)"
-
-msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr ""
-
-msgid "Use SVDRP service"
-msgstr ""
-
-msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr ""
-
-msgid "SVDRP service port"
-msgstr ""
-
-msgid "Define the port number of SVDRP service."
-msgstr ""
-
-msgid "SVDRP service IP"
-msgstr ""
-
-msgid "Define the IP address of SVDRP service."
-msgstr ""
-
-msgid "Help"
-msgstr "Ayuda"
-
 msgid "Fixed"
 msgstr "Fijo"

@ -265,9 +250,6 @@ msgstr ""
 msgid "H.264"
 msgstr ""

-msgid "H.265"
-msgstr ""
-
 msgid "MPEG-1 Layer I"
 msgstr ""

--- a/po/et_EE.po
+++ b/po/et_EE.po
@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# 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-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\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: Estonian <vdr@linuxtv.org>\n"
 "Language: et\n"
@ -25,12 +25,132 @@ msgstr "Signaaliinfo"
 msgid "Femon not available"
 msgstr "Femon ei ole kättesaadav"

-msgid "Video"
-msgstr "Video"
+msgid "basic"
+msgstr "standard"
+
+msgid "transponder"
+msgstr "transponder"
+
+msgid "stream"
+msgstr "voog"

 msgid "AC-3"
 msgstr "AC-3"

+msgid "Classic"
+msgstr "Classic"
+
+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 "PearlHD"
+msgstr "PearlHD"
+
+msgid "Hide main menu entry"
+msgstr "Peita valik peamenüüs"
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "Valiku peamenüüs peitmise määritlemine."
+
+msgid "Default display mode"
+msgstr "Vaikemoodus"
+
+msgid "Define the default display mode at startup."
+msgstr "Käivitamisel vaikemooduse määritlemine."
+
+msgid "Define the used OSD skin."
+msgstr "Kasutatava ekraanikesta määritlemine."
+
+msgid "Define the used OSD theme."
+msgstr "Kasutatava teema määritlemine."
+
+msgid "Position"
+msgstr "Positsioon"
+
+msgid "Define the position of OSD."
+msgstr "Ekraaniinfo positsiooni määritlemine."
+
+msgid "Downscale OSD size [%]"
+msgstr "Ekraanimenüü vähendamine [%]"
+
+msgid "Define the downscale ratio for OSD size."
+msgstr "Ekraanimenüü suuruse vähendamise määritlemine"
+
+msgid "Red limit [%]"
+msgstr "Punase limiit [%]"
+
+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 [%]"
+
+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]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "Ekraaniinfo uuendamise intervalli määritlemine. Väiksem intervall- suurem CPU koormus."
+
+msgid "Analyze stream"
+msgstr "Voo analüüs"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "DVB voo bitikiiruse rehkendamise määritlemine."
+
+msgid "Calculation interval [0.1s]"
+msgstr "Arvutamise intervall [0,1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "Arvutamise intervalli määritlemine. Suurem intervall annab stabiilsemaid tulemusi."
+
+msgid "Use SVDRP service"
+msgstr "SVDRP teenus"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "SVDRP teenuse klient/server seadete määritlemine."
+
+msgid "SVDRP service port"
+msgstr "SVDRP port"
+
+msgid "Define the port number of SVDRP service."
+msgstr "SVDRP teenuse pordi määritlemine."
+
+msgid "SVDRP service IP"
+msgstr "SVDRP IP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "SVDRP teenuse IP aadressi määritlemine."
+
+msgid "Help"
+msgstr "Abi"
+
+msgid "Video"
+msgstr "Video"
+
 msgid "Audio"
 msgstr "Audio"

@ -118,141 +238,6 @@ msgstr "LFE kanal"
 msgid "Dialogue Normalization"
 msgstr "Dialoogi normalisatsioon"

-msgid "basic"
-msgstr "standard"
-
-msgid "transponder"
-msgstr "transponder"
-
-msgid "stream"
-msgstr "voog"
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-msgid "Classic"
-msgstr "Classic"
-
-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 "PearlHD"
-msgstr "PearlHD"
-
-msgid "Hide main menu entry"
-msgstr "Peita valik peamenüüs"
-
-msgid "Define whether the main menu entry is hidden."
-msgstr "Valiku peamenüüs peitmise määritlemine."
-
-msgid "Default display mode"
-msgstr "Vaikemoodus"
-
-msgid "Define the default display mode at startup."
-msgstr "Käivitamisel vaikemooduse määritlemine."
-
-msgid "Define the used OSD skin."
-msgstr "Kasutatava ekraanikesta määritlemine."
-
-msgid "Define the used OSD theme."
-msgstr "Kasutatava teema määritlemine."
-
-msgid "Position"
-msgstr "Positsioon"
-
-msgid "Define the position of OSD."
-msgstr "Ekraaniinfo positsiooni määritlemine."
-
-msgid "Downscale OSD size [%]"
-msgstr "Ekraanimenüü vähendamine [%]"
-
-msgid "Define the downscale ratio for OSD size."
-msgstr "Ekraanimenüü suuruse vähendamise määritlemine"
-
-msgid "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-msgstr ""
-
-msgid "Red limit [%]"
-msgstr "Punase limiit [%]"
-
-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 [%]"
-
-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]"
-
-msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "Ekraaniinfo uuendamise intervalli määritlemine. Väiksem intervall- suurem CPU koormus."
-
-msgid "Analyze stream"
-msgstr "Voo analüüs"
-
-msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "DVB voo bitikiiruse rehkendamise määritlemine."
-
-msgid "Calculation interval [0.1s]"
-msgstr "Arvutamise intervall [0,1s]"
-
-msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "Arvutamise intervalli määritlemine. Suurem intervall annab stabiilsemaid tulemusi."
-
-msgid "Use SVDRP service"
-msgstr "SVDRP teenus"
-
-msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "SVDRP teenuse klient/server seadete määritlemine."
-
-msgid "SVDRP service port"
-msgstr "SVDRP port"
-
-msgid "Define the port number of SVDRP service."
-msgstr "SVDRP teenuse pordi määritlemine."
-
-msgid "SVDRP service IP"
-msgstr "SVDRP IP"
-
-msgid "Define the IP address of SVDRP service."
-msgstr "SVDRP teenuse IP aadressi määritlemine."
-
-msgid "Help"
-msgstr "Abi"
-
 msgid "Fixed"
 msgstr "Fikseeritud"

@ -265,9 +250,6 @@ msgstr "MPEG-2"
 msgid "H.264"
 msgstr "H.264"

-msgid "H.265"
-msgstr "H.265"
-
 msgid "MPEG-1 Layer I"
 msgstr "MPEG-1 Layet I"

--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# 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-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2019-10-27 16:29+0200\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\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: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
@ -25,12 +25,132 @@ msgstr "Signaalimittari"
 msgid "Femon not available"
 msgstr "Signaalimittari ei ole käytettävissä"

-msgid "Video"
-msgstr "Kuva"
+msgid "basic"
+msgstr "perus"
+
+msgid "transponder"
+msgstr "transponderi"
+
+msgid "stream"
+msgstr "lähete"

 msgid "AC-3"
 msgstr "AC-3"

+msgid "Classic"
+msgstr "Klassinen"
+
+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 "PearlHD"
+msgstr "PearlHD"
+
+msgid "Hide main menu entry"
+msgstr "Piilota valinta päävalikosta"
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "Määrittele, näytetäänkö laajennoksen valinta päävalikossa."
+
+msgid "Default display mode"
+msgstr "Oletusnäyttötila"
+
+msgid "Define the default display mode at startup."
+msgstr "Määrittele käytettävä näyttötila käynnistettäessä."
+
+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."
+
+msgid "Position"
+msgstr "Sijainti"
+
+msgid "Define the position of OSD."
+msgstr "Määrittele näytön sijainti."
+
+msgid "Downscale OSD size [%]"
+msgstr "Pienennä näytön kokoa [%]"
+
+msgid "Define the downscale ratio for OSD size."
+msgstr "Määrittele näytön pienennyssuhde."
+
+msgid "Red limit [%]"
+msgstr "Punaisen taso [%]"
+
+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ä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."
+
+msgid "OSD update interval [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."
+
+msgid "Analyze stream"
+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."
+
+msgid "Calculation interval [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."
+
+msgid "Use SVDRP service"
+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."
+
+msgid "SVDRP service port"
+msgstr "SVDRP-palvelun portti"
+
+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"
+
+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"
+
 msgid "Audio"
 msgstr "Ääni"

@ -118,141 +238,6 @@ msgstr "LFE-kanava"
 msgid "Dialogue Normalization"
 msgstr "Dialogin normalisointi"

-msgid "basic"
-msgstr "perus"
-
-msgid "transponder"
-msgstr "transponderi"
-
-msgid "stream"
-msgstr "lähete"
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-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 "Duotone"
-
-msgid "SilverGreen"
-msgstr "SilverGreen"
-
-msgid "PearlHD"
-msgstr "PearlHD"
-
-msgid "Hide main menu entry"
-msgstr "Piilota valinta päävalikosta"
-
-msgid "Define whether the main menu entry is hidden."
-msgstr "Määrittele, näytetäänkö laajennoksen valinta päävalikossa."
-
-msgid "Default display mode"
-msgstr "Oletusnäyttötila"
-
-msgid "Define the default display mode at startup."
-msgstr "Määrittele käytettävä näyttötila käynnistettäessä."
-
-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."
-
-msgid "Position"
-msgstr "Sijainti"
-
-msgid "Define the position of OSD."
-msgstr "Määrittele näytön sijainti."
-
-msgid "Downscale OSD size [%]"
-msgstr "Pienennä näytön kokoa [%]"
-
-msgid "Define the downscale ratio for OSD size."
-msgstr "Määrittele näytön pienennyssuhde."
-
-msgid "Signal level unit"
-msgstr "Signaalitason yksikkö"
-
-msgid "Define the used signal level unit."
-msgstr "Määrittele yksikkö signaalin tasolle."
-
-msgid "Red limit [%]"
-msgstr "Punaisen taso [%]"
-
-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ä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."
-
-msgid "OSD update interval [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."
-
-msgid "Analyze stream"
-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."
-
-msgid "Calculation interval [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."
-
-msgid "Use SVDRP service"
-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."
-
-msgid "SVDRP service port"
-msgstr "SVDRP-palvelun portti"
-
-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"
-
-msgid "Define the IP address of SVDRP service."
-msgstr "Määrittele SVDRP-palvelun käyttämä IP-osoite."
-
-msgid "Help"
-msgstr "Opaste"
-
 msgid "Fixed"
 msgstr "kiinteä"

@ -265,9 +250,6 @@ msgstr "MPEG-2"
 msgid "H.264"
 msgstr "H.264"

-msgid "H.265"
-msgstr "H.265"
-
 msgid "MPEG-1 Layer I"
 msgstr "MPEG-1 kerros I"

@ -405,6 +387,3 @@ msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
-#~ msgid "Clasxsic"
-#~ msgstr "Klassinen"
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# Copyright (C) 2007 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Nicolas Huillard
 # Michaël Nival <mnival@club-internet.fr>, 2010
@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
@ -19,107 +19,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"

 msgid "DVB Signal Information Monitor (OSD)"
-msgstr "Moniteur sur le signal DVB"
+msgstr "Affiche les informations du signal DVB"

 msgid "Signal Information"
-msgstr "Infos sur le signal DVB"
+msgstr "Infos sur le signal"

 msgid "Femon not available"
 msgstr "Femon n'est pas disponible"

-msgid "Video"
-msgstr "Vidéo"
-
-msgid "AC-3"
-msgstr "AC-3"
-
-msgid "Audio"
-msgstr "Audio"
-
-msgid "Transponder Information"
-msgstr "Information du transpondeur"
-
-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 "Coderate"
-
-msgid "Protocol"
-msgstr "Protocole"
-
-msgid "Bitrate"
-msgstr "Taux d'échantillonnage fixe"
-
-msgid "Stream Information"
-msgstr "Information sur le flux"
-
-msgid "Video Stream"
-msgstr "Flux vidéo"
-
-msgid "Codec"
-msgstr "Codec"
-
-msgid "Aspect Ratio"
-msgstr "Format de l'image"
-
-msgid "Frame Rate"
-msgstr "Rafraîchissement"
-
-msgid "Video Format"
-msgstr "Standard vidéo"
-
-msgid "Resolution"
-msgstr "Résolution"
-
-msgid "Audio Stream"
-msgstr "Flux audio"
-
-msgid "Channel Mode"
-msgstr "Mode chaîne"
-
-msgid "Sampling Frequency"
-msgstr "Fréquence d'échantillonage"
-
-msgid "AC-3 Stream"
-msgstr "Flux AC-3"
-
-msgid "Bit Stream Mode"
-msgstr "Mode bitstream"
-
-msgid "Audio Coding Mode"
-msgstr "Mode de codage audio"
-
-msgid "Center Mix Level"
-msgstr "Niveau sonore milieu"
-
-msgid "Surround Mix Level"
-msgstr "Niveau sonore surround"
-
-msgid "Dolby Surround Mode"
-msgstr "Mode Dolby Surround"
-
-msgid "Low Frequency Effects"
-msgstr "Effets de basses"
-
-msgid "Dialogue Normalization"
-msgstr "Normalisation des dialogues"
-
 msgid "basic"
 msgstr "basique"

@ -129,14 +36,8 @@ msgstr "transpondeur"
 msgid "stream"
 msgstr "flux"

-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
+msgid "AC-3"
+msgstr "AC-3"

 msgid "Classic"
 msgstr "Classique"
@ -198,12 +99,6 @@ msgstr "Réduit la taille de l'OSD (%)"
 msgid "Define the downscale ratio for OSD size."
 msgstr "Définit le ration de réduction de l'OSD."

-msgid "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-msgstr ""
-
 msgid "Red limit [%]"
 msgstr "Limite du rouge (%)"

@ -255,6 +150,96 @@ msgstr "Définit l'adresse IP du service SVDRP."
 msgid "Help"
 msgstr "Aide"

+msgid "Video"
+msgstr "Vidéo"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Transponder Information"
+msgstr "Information du transpondeur"
+
+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 "Coderate"
+
+msgid "Protocol"
+msgstr "Protocole"
+
+msgid "Bitrate"
+msgstr "Taux d'échantillonnage fixe"
+
+msgid "Stream Information"
+msgstr "Information du flux"
+
+msgid "Video Stream"
+msgstr "Flux vidéo"
+
+msgid "Codec"
+msgstr "Codec"
+
+msgid "Aspect Ratio"
+msgstr "Format de l'image"
+
+msgid "Frame Rate"
+msgstr "Rafraîchissement"
+
+msgid "Video Format"
+msgstr "Standard vidéo"
+
+msgid "Resolution"
+msgstr "Résolution"
+
+msgid "Audio Stream"
+msgstr "Flux audio"
+
+msgid "Channel Mode"
+msgstr "Mode chaîne"
+
+msgid "Sampling Frequency"
+msgstr "Fréquence d'échantillonage"
+
+msgid "AC-3 Stream"
+msgstr "Flux AC-3"
+
+msgid "Bit Stream Mode"
+msgstr "Mode bitstream"
+
+msgid "Audio Coding Mode"
+msgstr "Mode de codage audio"
+
+msgid "Center Mix Level"
+msgstr "Niveau sonore milieu"
+
+msgid "Surround Mix Level"
+msgstr "Niveau sonore surround"
+
+msgid "Dolby Surround Mode"
+msgstr "Mode Dolby Surround"
+
+msgid "Low Frequency Effects"
+msgstr "Effets de basses"
+
+msgid "Dialogue Normalization"
+msgstr "Normalisation des dialogues"
+
 msgid "Fixed"
 msgstr "Fixe"

@ -267,9 +252,6 @@ msgstr "MPEG-2"
 msgid "H.264"
 msgstr "H.264"

-msgid "H.265"
-msgstr "H.265"
-
 msgid "MPEG-1 Layer I"
 msgstr "MPEG-1 Layer I"

--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# Copyright (C) 2007 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Füley István <ifuley at tigercomp dot ro>, 2011
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0200\n"
 "Last-Translator: Füley István <ifuley at tigercomp dot ro>\n"
 "Language-Team: Hungarian <ifuley at tigercomp dot ro>\n"
 "Language: hu\n"
@ -28,12 +28,132 @@ msgstr "Jel inform
 msgid "Femon not available"
 msgstr "Femon nem elérhetõ"

-msgid "Video"
-msgstr "Video"
+msgid "basic"
+msgstr "alap"
+
+msgid "transponder"
+msgstr "transponder"
+
+msgid "stream"
+msgstr "adatfolyam (stream)"

 msgid "AC-3"
 msgstr "AC-3"

+msgid "Classic"
+msgstr "Klasszikus"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
+msgid "DeepBlue"
+msgstr "Sötétkék"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Kétszínû (duotone)"
+
+msgid "SilverGreen"
+msgstr "Ezüst-zöld"
+
+msgid "PearlHD"
+msgstr "PearlHD"
+
+msgid "Hide main menu entry"
+msgstr "Menübejegyzés elrejtése"
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "Meghatározza, hogy megjelenjen-e a fõmenüben."
+
+msgid "Default display mode"
+msgstr "Alapértelmezett megjelenítési mód"
+
+msgid "Define the default display mode at startup."
+msgstr "Bekapcsoláskor melyik megjelenítési móddal induljon."
+
+msgid "Define the used OSD skin."
+msgstr "Az OSD bõr kiválasztása."
+
+msgid "Define the used OSD theme."
+msgstr "Az OSD téma kiválasztása."
+
+msgid "Position"
+msgstr "Elhelyezés"
+
+msgid "Define the position of OSD."
+msgstr "A képernyõelhelyezés kiválasztása"
+
+msgid "Downscale OSD size [%]"
+msgstr "Az OSD leméretezése [%]"
+
+msgid "Define the downscale ratio for OSD size."
+msgstr "Az OSD méretének leméretezése százalékban."
+
+msgid "Red limit [%]"
+msgstr "Piros színt határa [%]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "A piros sáv határának beállítása, ezt használjuk a nem elégséges jelszint kijelzéséhez."
+
+msgid "Green limit [%]"
+msgstr "Zöld színt határa [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "A zöld sáv határának beállítása, ezt használjuk az elégséges jelszint kijelzéséhez."
+
+msgid "OSD update interval [0.1s]"
+msgstr "OSD frissítésének gyakorisága [0.1mp]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "Meghatározza, hogy milyen gyakran legyen frissítve az OSD. Kisebb intervallum nagyobb CPU terhelést eredményez."
+
+msgid "Analyze stream"
+msgstr "Adatfolyam (stream) elemzése."
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "Meghatározza, hogy a DVB adatfolyam elemzésre kerüljön-e, és számolódjon-e bitráta."
+
+msgid "Calculation interval [0.1s]"
+msgstr "Számítás gyakorisága [0.1mp]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "Meghatározza, hogy milyen gyakran történjen számítás. Nagyobb intervallum pontosabb értékeket eredményez."
+
+msgid "Use SVDRP service"
+msgstr "SVDRP szolgáltatás használata."
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "Ki-bekapcsolja az SVDRP szolgáltatást, amely kliens-szerver környezetben használatos."
+
+msgid "SVDRP service port"
+msgstr "Az SVDRP szolgáltatás portja"
+
+msgid "Define the port number of SVDRP service."
+msgstr "Meghatározza, hogy melyik porton fut az SVDRP."
+
+msgid "SVDRP service IP"
+msgstr "Az SVDRP szolgáltatás IP-je"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "Meghatározza, hogy milyen IP címen fut az SVDRP szolgáltatás."
+
+msgid "Help"
+msgstr "Segítség"
+
+msgid "Video"
+msgstr "Video"
+
 msgid "Audio"
 msgstr "Audio"

@ -121,141 +241,6 @@ msgstr "LFE - alacsony frekvenci
 msgid "Dialogue Normalization"
 msgstr "Párbeszéd jelszint normalizálása"

-msgid "basic"
-msgstr "alap"
-
-msgid "transponder"
-msgstr "transponder"
-
-msgid "stream"
-msgstr "adatfolyam (stream)"
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-msgid "Classic"
-msgstr "Klasszikus"
-
-msgid "Elchi"
-msgstr "Elchi"
-
-msgid "ST:TNG"
-msgstr "ST:TNG"
-
-msgid "DeepBlue"
-msgstr "Sötétkék"
-
-msgid "Moronimo"
-msgstr "Moronimo"
-
-msgid "Enigma"
-msgstr "Enigma"
-
-msgid "EgalsTry"
-msgstr "EgalsTry"
-
-msgid "Duotone"
-msgstr "Kétszínû (duotone)"
-
-msgid "SilverGreen"
-msgstr "Ezüst-zöld"
-
-msgid "PearlHD"
-msgstr "PearlHD"
-
-msgid "Hide main menu entry"
-msgstr "Menübejegyzés elrejtése"
-
-msgid "Define whether the main menu entry is hidden."
-msgstr "Meghatározza, hogy megjelenjen-e a fõmenüben."
-
-msgid "Default display mode"
-msgstr "Alapértelmezett megjelenítési mód"
-
-msgid "Define the default display mode at startup."
-msgstr "Bekapcsoláskor melyik megjelenítési móddal induljon."
-
-msgid "Define the used OSD skin."
-msgstr "Az OSD bõr kiválasztása."
-
-msgid "Define the used OSD theme."
-msgstr "Az OSD téma kiválasztása."
-
-msgid "Position"
-msgstr "Elhelyezés"
-
-msgid "Define the position of OSD."
-msgstr "A képernyõelhelyezés kiválasztása"
-
-msgid "Downscale OSD size [%]"
-msgstr "Az OSD leméretezése [%]"
-
-msgid "Define the downscale ratio for OSD size."
-msgstr "Az OSD méretének leméretezése százalékban."
-
-msgid "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-msgstr ""
-
-msgid "Red limit [%]"
-msgstr "Piros színt határa [%]"
-
-msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr "A piros sáv határának beállítása, ezt használjuk a nem elégséges jelszint kijelzéséhez."
-
-msgid "Green limit [%]"
-msgstr "Zöld színt határa [%]"
-
-msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr "A zöld sáv határának beállítása, ezt használjuk az elégséges jelszint kijelzéséhez."
-
-msgid "OSD update interval [0.1s]"
-msgstr "OSD frissítésének gyakorisága [0.1mp]"
-
-msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "Meghatározza, hogy milyen gyakran legyen frissítve az OSD. Kisebb intervallum nagyobb CPU terhelést eredményez."
-
-msgid "Analyze stream"
-msgstr "Adatfolyam (stream) elemzése."
-
-msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "Meghatározza, hogy a DVB adatfolyam elemzésre kerüljön-e, és számolódjon-e bitráta."
-
-msgid "Calculation interval [0.1s]"
-msgstr "Számítás gyakorisága [0.1mp]"
-
-msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "Meghatározza, hogy milyen gyakran történjen számítás. Nagyobb intervallum pontosabb értékeket eredményez."
-
-msgid "Use SVDRP service"
-msgstr "SVDRP szolgáltatás használata."
-
-msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "Ki-bekapcsolja az SVDRP szolgáltatást, amely kliens-szerver környezetben használatos."
-
-msgid "SVDRP service port"
-msgstr "Az SVDRP szolgáltatás portja"
-
-msgid "Define the port number of SVDRP service."
-msgstr "Meghatározza, hogy melyik porton fut az SVDRP."
-
-msgid "SVDRP service IP"
-msgstr "Az SVDRP szolgáltatás IP-je"
-
-msgid "Define the IP address of SVDRP service."
-msgstr "Meghatározza, hogy milyen IP címen fut az SVDRP szolgáltatás."
-
-msgid "Help"
-msgstr "Segítség"
-
 msgid "Fixed"
 msgstr "Állandó"

@ -268,9 +253,6 @@ msgstr "MPEG-2"
 msgid "H.264"
 msgstr "H.264"

-msgid "H.265"
-msgstr "H.265"
-
 msgid "MPEG-1 Layer I"
 msgstr "MPEG-1 Layer I"

--- a/po/it_IT.po
+++ b/po/it_IT.po
@ -1,15 +1,15 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# 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-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\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"
@ -29,12 +29,132 @@ msgstr "Info segnale"
 msgid "Femon not available"
 msgstr "Femon non disponibile"

-msgid "Video"
-msgstr "Video"
+msgid "basic"
+msgstr "base"
+
+msgid "transponder"
+msgstr "transponder"
+
+msgid "stream"
+msgstr "flusso"

 msgid "AC-3"
 msgstr "AC-3"

+msgid "Classic"
+msgstr "Classico"
+
+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 "PearlHD"
+msgstr "PearlHD"
+
+msgid "Hide main menu entry"
+msgstr "Nascondi voce menu principale"
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "Definisci se la voce del menu principale è nascosta."
+
+msgid "Default display mode"
+msgstr "Modalità visualizz. predefinita"
+
+msgid "Define the default display mode at startup."
+msgstr "Definisci la modalità di visualizz. predefinita all'avvio."
+
+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."
+
+msgid "Position"
+msgstr "Posizione"
+
+msgid "Define the position of OSD."
+msgstr "Definisci la posizione dell'OSD."
+
+msgid "Downscale OSD size [%]"
+msgstr "Riduci dimensione OSD [%]"
+
+msgid "Define the downscale ratio for OSD size."
+msgstr "Definisci il rapporto di riduzione della dimensione OSD."
+
+msgid "Red limit [%]"
+msgstr "Limite rosso [%]"
+
+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 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."
+
+msgid "OSD update interval [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."
+
+msgid "Analyze stream"
+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."
+
+msgid "Calculation interval [0.1s]"
+msgstr "Intervallo di calcolo [0.1s]"
+
+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 "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."
+
+msgid "SVDRP service port"
+msgstr "Porta servizio SVDRP"
+
+msgid "Define the port number of SVDRP service."
+msgstr "Definisci il numero di porta del servizio SVDRP."
+
+msgid "SVDRP service IP"
+msgstr "IP servizio SVDRP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "Definisci l'indirizzo IP del servizio SVDRP."
+
+msgid "Help"
+msgstr "Aiuto"
+
+msgid "Video"
+msgstr "Video"
+
 msgid "Audio"
 msgstr "Audio"

@ -122,141 +242,6 @@ msgstr "Effetti bassa frequenza"
 msgid "Dialogue Normalization"
 msgstr "Normalizzazione dialoghi"

-msgid "basic"
-msgstr "base"
-
-msgid "transponder"
-msgstr "transponder"
-
-msgid "stream"
-msgstr "flusso"
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-msgid "Classic"
-msgstr "Classico"
-
-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 "PearlHD"
-msgstr "PearlHD"
-
-msgid "Hide main menu entry"
-msgstr "Nascondi voce menu principale"
-
-msgid "Define whether the main menu entry is hidden."
-msgstr "Definisci se la voce del menu principale è nascosta."
-
-msgid "Default display mode"
-msgstr "Modalità visualizz. predefinita"
-
-msgid "Define the default display mode at startup."
-msgstr "Definisci la modalità di visualizz. predefinita all'avvio."
-
-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."
-
-msgid "Position"
-msgstr "Posizione"
-
-msgid "Define the position of OSD."
-msgstr "Definisci la posizione dell'OSD."
-
-msgid "Downscale OSD size [%]"
-msgstr "Riduci dimensione OSD [%]"
-
-msgid "Define the downscale ratio for OSD size."
-msgstr "Definisci il rapporto di riduzione della dimensione OSD."
-
-msgid "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-msgstr ""
-
-msgid "Red limit [%]"
-msgstr "Limite rosso [%]"
-
-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 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."
-
-msgid "OSD update interval [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."
-
-msgid "Analyze stream"
-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."
-
-msgid "Calculation interval [0.1s]"
-msgstr "Intervallo di calcolo [0.1s]"
-
-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 "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."
-
-msgid "SVDRP service port"
-msgstr "Porta servizio SVDRP"
-
-msgid "Define the port number of SVDRP service."
-msgstr "Definisci il numero di porta del servizio SVDRP."
-
-msgid "SVDRP service IP"
-msgstr "IP servizio SVDRP"
-
-msgid "Define the IP address of SVDRP service."
-msgstr "Definisci l'indirizzo IP del servizio SVDRP."
-
-msgid "Help"
-msgstr "Aiuto"
-
 msgid "Fixed"
 msgstr "Fisso"

@ -269,9 +254,6 @@ msgstr "MPEG-2"
 msgid "H.264"
 msgstr "H.264"

-msgid "H.265"
-msgstr "H.265"
-
 msgid "MPEG-1 Layer I"
 msgstr "MPEG-1 Layer I"

--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# Copyright (C) 2007 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Valdemaras Pipiras
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\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"
@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"

 msgid "DVB Signal Information Monitor (OSD)"
-msgstr "DVB signalo stebėjimas (OSD)"
+msgstr "DVB signalo informacijos stebėjimas (OSD)"

 msgid "Signal Information"
 msgstr "Signalo informacija"
@ -25,99 +25,6 @@ msgstr "Signalo informacija"
 msgid "Femon not available"
 msgstr "Femon įskiepas nepasiekiamas"

-msgid "Video"
-msgstr "Video"
-
-msgid "AC-3"
-msgstr "AC-3"
-
-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 "Protocol"
-msgstr "Protokolas"
-
-msgid "Bitrate"
-msgstr "Kokybė"
-
-msgid "Stream Information"
-msgstr "Srauto informacija"
-
-msgid "Video Stream"
-msgstr "Video srautas"
-
-msgid "Codec"
-msgstr "Kodekas"
-
-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 "Srauto būsena"
-
-msgid "Audio Coding Mode"
-msgstr "Audio kodavimas"
-
-msgid "Center Mix Level"
-msgstr "Centrinis mikserio 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 "basic"
 msgstr "Standartinis"

@ -127,14 +34,8 @@ msgstr "Siųstuvas"
 msgid "stream"
 msgstr "Srautas"

-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
+msgid "AC-3"
+msgstr "AC-3"

 msgid "Classic"
 msgstr "Klasikinis"
@ -146,7 +47,7 @@ msgid "ST:TNG"
 msgstr "ST:TNG"

 msgid "DeepBlue"
-msgstr "Tamsiai mėlyna"
+msgstr "DeepBlue"

 msgid "Moronimo"
 msgstr "Moronimo"
@ -161,7 +62,7 @@ msgid "Duotone"
 msgstr "Duotone"

 msgid "SilverGreen"
-msgstr "Sidabro žalia"
+msgstr "SilverGreen"

 msgid "PearlHD"
 msgstr "PearlHD"
@ -191,15 +92,9 @@ msgid "Define the position of OSD."
 msgstr "Nustatyti ekrano užsklandos poziciją."

 msgid "Downscale OSD size [%]"
-msgstr "Sumažinti ekrano užsklandos (OSD) dydį [%]"
-
-msgid "Define the downscale ratio for OSD size."
-msgstr "Nustatyti ekrano užsklandos (OSD) mažinimo santykį."
-
-msgid "Signal level unit"
 msgstr ""

-msgid "Define the used signal level unit."
+msgid "Define the downscale ratio for OSD size."
 msgstr ""

 msgid "Red limit [%]"
@ -253,11 +148,101 @@ 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 "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Kokybė"
+
+msgid "Stream Information"
+msgstr "Srauto informacija"
+
+msgid "Video Stream"
+msgstr "Video srautas"
+
+msgid "Codec"
+msgstr "Kodekas"
+
+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 "Sutvarkyta"
+msgstr "Fest"

 msgid "Analog"
-msgstr "Analoginis"
+msgstr "Analog"

 msgid "MPEG-2"
 msgstr "MPEG-2"
@ -265,9 +250,6 @@ msgstr "MPEG-2"
 msgid "H.264"
 msgstr "H.264"

-msgid "H.265"
-msgstr "H.265"
-
 msgid "MPEG-1 Layer I"
 msgstr "MPEG-1 Layer I"

@ -311,7 +293,7 @@ msgid "progressive"
 msgstr "progresyvinis"

 msgid "reserved"
-msgstr "rezervuota"
+msgstr "belegt"

 msgid "extended"
 msgstr "išplėstas"
@ -344,22 +326,22 @@ msgid "Music and Effects (ME)"
 msgstr "Muzika ir efektai (ME)"

 msgid "Visually Impaired (VI)"
-msgstr "Skirta silpnaregiams (VI)"
+msgstr " (VI)"

 msgid "Hearing Impaired (HI)"
-msgstr "Skirta žmoniems su klausos negalia (HI)"
+msgstr " (HI)"

 msgid "Dialogue (D)"
 msgstr "Dialogas (D)"

 msgid "Commentary (C)"
-msgstr "Komentarai (C)"
+msgstr "Komentavimas (C)"

 msgid "Emergency (E)"
 msgstr "Avarinis (E)"

 msgid "Voice Over (VO)"
-msgstr "Įgarsinta (VO)"
+msgstr "Voice over (VO)"

 msgid "Karaoke"
 msgstr "Karaoke"
@ -374,10 +356,10 @@ msgid "C"
 msgstr "C"

 msgid "L"
-msgstr "K"
+msgstr "L"

 msgid "R"
-msgstr "D"
+msgstr "R"

 msgid "S"
 msgstr "S"
@ -398,7 +380,7 @@ msgid "MHz"
 msgstr "MHz"

 msgid "free"
-msgstr "nekoduota"
+msgstr "frei"

 msgid "Mbit/s"
 msgstr "Mbit/s"
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@ -1,408 +0,0 @@
-# VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
-# This file is distributed under the same license as the vdr-femon package.
-# Tomasz Maciej Nowak, 2017.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: vdr-femon 2.4.0\n"
-"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\n"
-"Last-Translator: Tomasz Maciej Nowak <tomek_n@o2.pl>\n"
-"Language-Team: Polish <vdr@linuxtv.org>\n"
-"Language: pl_PL\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
-
-msgid "DVB Signal Information Monitor (OSD)"
-msgstr "Monitor sygnału DVB (OSD)"
-
-msgid "Signal Information"
-msgstr "Informacja o sygnale"
-
-msgid "Femon not available"
-msgstr "Femon niedostępny"
-
-msgid "Video"
-msgstr "Obraz"
-
-msgid "AC-3"
-msgstr "AC-3"
-
-msgid "Audio"
-msgstr "Dźwięk"
-
-msgid "Transponder Information"
-msgstr "Informacje o transponderze"
-
-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 "Sprawność kodowania"
-
-msgid "Protocol"
-msgstr "Protokół"
-
-msgid "Bitrate"
-msgstr "Przepływność"
-
-msgid "Stream Information"
-msgstr "Informacje o strumieniu"
-
-msgid "Video Stream"
-msgstr "Strumień obrazu"
-
-msgid "Codec"
-msgstr "Kodek"
-
-msgid "Aspect Ratio"
-msgstr "Proporcje obrazu"
-
-msgid "Frame Rate"
-msgstr "Tempo wyświetlania klatek"
-
-msgid "Video Format"
-msgstr "Format obrazu"
-
-msgid "Resolution"
-msgstr "Rozdzielczość"
-
-msgid "Audio Stream"
-msgstr "Strumień dźwięku"
-
-msgid "Channel Mode"
-msgstr "Tryb kanału"
-
-msgid "Sampling Frequency"
-msgstr "Częstotliwość próbkowania"
-
-msgid "AC-3 Stream"
-msgstr "Strumień AC-3"
-
-msgid "Bit Stream Mode"
-msgstr "Tryb strumienia bitów"
-
-msgid "Audio Coding Mode"
-msgstr "Tryb kodowania dźwięku"
-
-msgid "Center Mix Level"
-msgstr "Poziom Center Mix"
-
-msgid "Surround Mix Level"
-msgstr "Poziom Surround Mix"
-
-msgid "Dolby Surround Mode"
-msgstr "Tryb Dolby Surround"
-
-msgid "Low Frequency Effects"
-msgstr "Efekty niskich frekwencji"
-
-msgid "Dialogue Normalization"
-msgstr "Normalizacja dialogów"
-
-msgid "basic"
-msgstr "podstawowy"
-
-msgid "transponder"
-msgstr "transponder"
-
-msgid "stream"
-msgstr "strumień"
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-msgid "Classic"
-msgstr "Klasyczna"
-
-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 "PearlHD"
-msgstr "PearlHD"
-
-msgid "Hide main menu entry"
-msgstr "Ukryj pozycję w głównym menu"
-
-msgid "Define whether the main menu entry is hidden."
-msgstr "Określa czy pozycja w głównym menu jest ukryta."
-
-msgid "Default display mode"
-msgstr "Domyślny tryb wyświetlania"
-
-msgid "Define the default display mode at startup."
-msgstr "Określa domyślny tryb wyświetlania przy uruchamianiu."
-
-msgid "Define the used OSD skin."
-msgstr "Określa używaną skórkę OSD."
-
-msgid "Define the used OSD theme."
-msgstr "Określa używany motyw OSD."
-
-msgid "Position"
-msgstr "Pozycja"
-
-msgid "Define the position of OSD."
-msgstr "Określa pozycję OSD."
-
-msgid "Downscale OSD size [%]"
-msgstr "Zmniejsz rozmiar OSD [%]"
-
-msgid "Define the downscale ratio for OSD size."
-msgstr "Określa procent zmniejszenia OSD."
-
-msgid "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-msgstr ""
-
-msgid "Red limit [%]"
-msgstr "Czerwony - zakres [%]"
-
-msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr "Określa zakres czerwonego paska, pokazującego zły sygnał."
-
-msgid "Green limit [%]"
-msgstr "Zielony - zakres [%]"
-
-msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr "Określa zakres zielonego paska, pokazującego dobry sygnał."
-
-msgid "OSD update interval [0.1s]"
-msgstr "Interwał aktualizacji OSD [0,1s]"
-
-msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "Określa interwał aktualizacji danych w OSD. Mniejszy interwał generuje większe obciążenie CPU."
-
-msgid "Analyze stream"
-msgstr "Analiza strumienia"
-
-msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "Określa czy strumień DVB jest analizowany a przepływność obliczana."
-
-msgid "Calculation interval [0.1s]"
-msgstr "Interwał obliczeń [0,1s]"
-
-msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "Określa interwał obliczeń. Większy interwał generuje stabilniejsze wartości."
-
-msgid "Use SVDRP service"
-msgstr "Używaj usługi SVDRP"
-
-msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "Określa czy używać usługi SVDRP w kownfiguracjach serwer/klient."
-
-msgid "SVDRP service port"
-msgstr "Port usługi SVDRP"
-
-msgid "Define the port number of SVDRP service."
-msgstr "Określa numer portu usługi SVDRP."
-
-msgid "SVDRP service IP"
-msgstr "IP usługi SVDRP"
-
-msgid "Define the IP address of SVDRP service."
-msgstr "Określa adres IP usługi SVDRP."
-
-msgid "Help"
-msgstr "Pomoc"
-
-msgid "Fixed"
-msgstr "Stały"
-
-msgid "Analog"
-msgstr "Analog"
-
-msgid "MPEG-2"
-msgstr "MPEG-2"
-
-msgid "H.264"
-msgstr "H.264"
-
-msgid "H.265"
-msgstr "H.265"
-
-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 "połączone stereo"
-
-msgid "dual"
-msgstr "podwójne"
-
-msgid "mono"
-msgstr "mono"
-
-msgid "interlaced"
-msgstr "z przeplotem"
-
-msgid "progressive"
-msgstr "progresywne"
-
-msgid "reserved"
-msgstr "zamknięte"
-
-msgid "extended"
-msgstr "rozszerzone"
-
-msgid "unknown"
-msgstr "nieznane"
-
-msgid "component"
-msgstr "komponent"
-
-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 "Complete Main (CM)"
-
-msgid "Music and Effects (ME)"
-msgstr "Muzyka i efekty (ME)"
-
-msgid "Visually Impaired (VI)"
-msgstr "Upośledzone wzrokowo (VI)"
-
-msgid "Hearing Impaired (HI)"
-msgstr "Upośledzone słuchowo (HI)"
-
-msgid "Dialogue (D)"
-msgstr "Dialog (D)"
-
-msgid "Commentary (C)"
-msgstr "Komentarz (C)"
-
-msgid "Emergency (E)"
-msgstr "Nagły wypadek (E)"
-
-msgid "Voice Over (VO)"
-msgstr "Naniesiony głos (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 "nie podano"
-
-msgid "MHz"
-msgstr "MHz"
-
-msgid "free"
-msgstr "wolne"
-
-msgid "Mbit/s"
-msgstr "Mbit/s"
-
-msgid "kbit/s"
-msgstr "kbit/s"
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# 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-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\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: Russian <vdr@linuxtv.org>\n"
 "Language: ru\n"
@ -25,12 +25,132 @@ msgstr "
 msgid "Femon not available"
 msgstr ""

-msgid "Video"
-msgstr "²ØÔÕÞ"
+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 "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "PearlHD"
+msgstr "PearlHD"
+
+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,1 áÕÚ)"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
+msgid "Analyze stream"
+msgstr "ÀÐáçñâ áÚÞàÞáâØ ßÞâÞÚÐ ÔÐÝÝëå"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
+msgid "Calculation interval [0.1s]"
+msgstr "ÇÐáâÞâÐ ßÕàÕáçñâÐ (0,1 áÕÚ)"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
+msgid "Use SVDRP service"
+msgstr ""
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
+msgid "SVDRP service port"
+msgstr ""
+
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
+msgid "SVDRP service IP"
+msgstr ""
+
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
+msgid "Video"
+msgstr "²ØÔÕÞ"
+
 msgid "Audio"
 msgstr "°ãÔØÞ"

@ -118,141 +238,6 @@ msgstr ""
 msgid "Dialogue Normalization"
 msgstr ""

-msgid "basic"
-msgstr ""
-
-msgid "transponder"
-msgstr ""
-
-msgid "stream"
-msgstr ""
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-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 "Duotone"
-
-msgid "SilverGreen"
-msgstr "SilverGreen"
-
-msgid "PearlHD"
-msgstr "PearlHD"
-
-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 "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-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,1 áÕÚ)"
-
-msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr ""
-
-msgid "Analyze stream"
-msgstr "ÀÐáçñâ áÚÞàÞáâØ ßÞâÞÚÐ ÔÐÝÝëå"
-
-msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr ""
-
-msgid "Calculation interval [0.1s]"
-msgstr "ÇÐáâÞâÐ ßÕàÕáçñâÐ (0,1 áÕÚ)"
-
-msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr ""
-
-msgid "Use SVDRP service"
-msgstr ""
-
-msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr ""
-
-msgid "SVDRP service port"
-msgstr ""
-
-msgid "Define the port number of SVDRP service."
-msgstr ""
-
-msgid "SVDRP service IP"
-msgstr ""
-
-msgid "Define the IP address of SVDRP service."
-msgstr ""
-
-msgid "Help"
-msgstr ""
-
 msgid "Fixed"
 msgstr ""

@ -265,9 +250,6 @@ msgstr ""
 msgid "H.264"
 msgstr ""

-msgid "H.265"
-msgstr ""
-
 msgid "MPEG-1 Layer I"
 msgstr ""

--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@ -1,407 +0,0 @@
-# VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
-# This file is distributed under the same license as the femon package.
-# Milan Hrala
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: vdr-femon 2.4.0\n"
-"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\n"
-"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
-"Language-Team: Slovak <vdr@linuxtv.org>\n"
-"Language: sk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "DVB Signal Information Monitor (OSD)"
-msgstr "DVB Informácie o signále (OSD)"
-
-msgid "Signal Information"
-msgstr "Informácie o signále"
-
-msgid "Femon not available"
-msgstr "Femon nie je k dispozícii"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "AC-3"
-msgstr "AC-3"
-
-msgid "Audio"
-msgstr "Zvuk"
-
-msgid "Transponder Information"
-msgstr "Informácie transpondéra"
-
-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 "rýchlos» kódovania"
-
-msgid "Protocol"
-msgstr "Protokol"
-
-msgid "Bitrate"
-msgstr "Dátový tok"
-
-msgid "Stream Information"
-msgstr "Informácie o dátovom toku"
-
-msgid "Video Stream"
-msgstr "Video stopa"
-
-msgid "Codec"
-msgstr "kodek"
-
-msgid "Aspect Ratio"
-msgstr "Pomer strán"
-
-msgid "Frame Rate"
-msgstr "Poèet snímkov"
-
-msgid "Video Format"
-msgstr "Video formát"
-
-msgid "Resolution"
-msgstr "Rozlí¹enie"
-
-msgid "Audio Stream"
-msgstr "Zvuková stopa"
-
-msgid "Channel Mode"
-msgstr "re¾im kanála"
-
-msgid "Sampling Frequency"
-msgstr "Vzorkovacia frekvencia"
-
-msgid "AC-3 Stream"
-msgstr "AC-3 dátový tok"
-
-msgid "Bit Stream Mode"
-msgstr "re¾im bitového toku"
-
-msgid "Audio Coding Mode"
-msgstr "Re¾ím kódovania zvuku"
-
-msgid "Center Mix Level"
-msgstr "Úroveò Center mix"
-
-msgid "Surround Mix Level"
-msgstr "Úroveò Surround mix"
-
-msgid "Dolby Surround Mode"
-msgstr "Dolby Surround re¾ím"
-
-msgid "Low Frequency Effects"
-msgstr "Basové efekty"
-
-msgid "Dialogue Normalization"
-msgstr "©tandartný dialóg"
-
-msgid "basic"
-msgstr "©tandardtný"
-
-msgid "transponder"
-msgstr "Transpondér"
-
-msgid "stream"
-msgstr "dátový tok"
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-msgid "Classic"
-msgstr "Klasický"
-
-msgid "Elchi"
-msgstr "Elchi"
-
-msgid "ST:TNG"
-msgstr "ST:TNG"
-
-msgid "DeepBlue"
-msgstr "tmavo modrá"
-
-msgid "Moronimo"
-msgstr "Moronimo"
-
-msgid "Enigma"
-msgstr "Enigma"
-
-msgid "EgalsTry"
-msgstr "EgalsTry"
-
-msgid "Duotone"
-msgstr "Duotone"
-
-msgid "SilverGreen"
-msgstr "strieborno zelená"
-
-msgid "PearlHD"
-msgstr "PearlHD"
-
-msgid "Hide main menu entry"
-msgstr "Schova» polo¾ku v hlavnom menu"
-
-msgid "Define whether the main menu entry is hidden."
-msgstr "Urèite, èi v hlavnom menu bude polo¾ka skrytá."
-
-msgid "Default display mode"
-msgstr "©tandardný re¾im zobrazenia"
-
-msgid "Define the default display mode at startup."
-msgstr "Zadajte predvolený re¾im zobrazenia pri spustení."
-
-msgid "Define the used OSD skin."
-msgstr "Zadajte pou¾itý OSD vzhµad."
-
-msgid "Define the used OSD theme."
-msgstr "Definujte pou¾itú OSD tému."
-
-msgid "Position"
-msgstr "Pozícia"
-
-msgid "Define the position of OSD."
-msgstr "Definujte pozíciu OSD."
-
-msgid "Downscale OSD size [%]"
-msgstr "Zmen¹i» veµkos» OSD [%]"
-
-msgid "Define the downscale ratio for OSD size."
-msgstr "Zadajte zmen¹enie pomeru pre OSD veµkosti."
-
-msgid "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-msgstr ""
-
-msgid "Red limit [%]"
-msgstr "Èervený limit [%]"
-
-msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr "Zadajte limit pre èervený pruh , ktorý sa pou¾íva na oznaèenie zlého signálu."
-
-msgid "Green limit [%]"
-msgstr "Zelený limit [%]"
-
-msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr "Zadajte limit pre zeleného pruhu, ktorý sa pou¾ije na oznaèenie dobrého signálu."
-
-msgid "OSD update interval [0.1s]"
-msgstr "OSD aktualizaèný interval [0.1s]"
-
-msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "Zadajte interval pre aktualizácie OSD. Men¹í interval vytvára vy¹¹ie za»a¾enie CPU."
-
-msgid "Analyze stream"
-msgstr "Analýza dátového toku"
-
-msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "Zadajte èi sa DVB prúd analyzuje a dátový tok vypoèíta."
-
-msgid "Calculation interval [0.1s]"
-msgstr "Výpoètový interval [0.1s]"
-
-msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "Zadajte interval pre výpoèet. Väè¹í interval vytvára stabilnej¹ie hodnoty."
-
-msgid "Use SVDRP service"
-msgstr "Pou¾i» SVDRP slu¾bu"
-
-msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "Zadajte èi sa pou¾ije slu¾ba SVDRP v klient / server nastaveniach."
-
-msgid "SVDRP service port"
-msgstr "Port SVDRP slu¾by"
-
-msgid "Define the port number of SVDRP service."
-msgstr "Zadajte èíslo portu slu¾by SVDRP."
-
-msgid "SVDRP service IP"
-msgstr "IP SVDRP slu¾by"
-
-msgid "Define the IP address of SVDRP service."
-msgstr "zadajte IP adresu slu¾by SVDRP."
-
-msgid "Help"
-msgstr "Pomoc"
-
-msgid "Fixed"
-msgstr "Pevné"
-
-msgid "Analog"
-msgstr "Analóg"
-
-msgid "MPEG-2"
-msgstr "MPEG-2"
-
-msgid "H.264"
-msgstr "H.264"
-
-msgid "H.265"
-msgstr "H.265"
-
-msgid "MPEG-1 Layer I"
-msgstr "MPEG-1 vrstva I"
-
-msgid "MPEG-1 Layer II"
-msgstr "MPEG-1 vrstva II"
-
-msgid "MPEG-1 Layer III"
-msgstr "MPEG-1 vrstva III"
-
-msgid "MPEG-2 Layer I"
-msgstr "MPEG-2 vrstva I"
-
-msgid "MPEG-2 Layer II"
-msgstr "MPEG-2 vrstva II"
-
-msgid "MPEG-2 Layer III"
-msgstr "MPEG-2 vrstva III"
-
-msgid "HE-AAC"
-msgstr "HE-AAC"
-
-msgid "LATM"
-msgstr "LATM"
-
-msgid "stereo"
-msgstr "stereo"
-
-msgid "joint Stereo"
-msgstr "spojené stereo"
-
-msgid "dual"
-msgstr "dvojitý"
-
-msgid "mono"
-msgstr "mono"
-
-msgid "interlaced"
-msgstr "prekladaný"
-
-msgid "progressive"
-msgstr "progresívny"
-
-msgid "reserved"
-msgstr "obsadený"
-
-msgid "extended"
-msgstr "roz¹írený"
-
-msgid "unknown"
-msgstr "neznámy"
-
-msgid "component"
-msgstr "súèas»"
-
-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 "Kompletne hlavné (CM)"
-
-msgid "Music and Effects (ME)"
-msgstr "Hudba a efekty (ME)"
-
-msgid "Visually Impaired (VI)"
-msgstr "zrakovo postihnutí (VI)"
-
-msgid "Hearing Impaired (HI)"
-msgstr "sluchovo postihnutí (HI)"
-
-msgid "Dialogue (D)"
-msgstr "Dialóg (D)"
-
-msgid "Commentary (C)"
-msgstr "Komentár (C)"
-
-msgid "Emergency (E)"
-msgstr "Pohotovostný (E)"
-
-msgid "Voice Over (VO)"
-msgstr "Viacvrstvový hlas (VO)"
-
-msgid "Karaoke"
-msgstr "Karaoke"
-
-msgid "Ch1"
-msgstr "kanál1"
-
-msgid "Ch2"
-msgstr "kanál2"
-
-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 "nie je uvedené"
-
-msgid "MHz"
-msgstr "MHz"
-
-msgid "free"
-msgstr "voµný"
-
-msgid "Mbit/s"
-msgstr "Mbit/s"
-
-msgid "kbit/s"
-msgstr "kbit/s"
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@ -4,17 +4,18 @@
 # Yarema aka Knedlyk <yupadmin@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
+"PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\\n\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\\n\n"

 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Монітор інформації про DVB сигнал"
@ -25,12 +26,141 @@ msgstr "Інформація про сигнал"
 msgid "Femon not available"
 msgstr "Femon не доступний"

-msgid "Video"
-msgstr "Відео"
+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 "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "PearlHD"
+msgstr "PearlHD"
+
+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.1с]"
+
+msgid ""
+"Define an interval for OSD updates. The smaller interval generates higher "
+"CPU load."
+msgstr ""
+"Визначення інтервалу оновлення повідомлень. Малий інтервал спричинює більше "
+"завантаження процесора."
+
+msgid "Analyze stream"
+msgstr "Аналіз потоку"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "Визначення, чи проводити аналіз DVB потоку і обчислення бітрейту"
+
+msgid "Calculation interval [0.1s]"
+msgstr "Інтервал обчислення [0.1с]"
+
+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 "IP сервісу SVDRP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "Визначення IP адреси сервісу SVDRP."
+
+msgid "Help"
+msgstr "Допомога"
+
+msgid "Video"
+msgstr "Відео"
+
 msgid "Audio"
 msgstr "Аудіо"

@ -118,141 +248,6 @@ msgstr "Ефекти низької частоти"
 msgid "Dialogue Normalization"
 msgstr "Нормалізація гучності"

-msgid "basic"
-msgstr "основне"
-
-msgid "transponder"
-msgstr "транспондер"
-
-msgid "stream"
-msgstr "потік"
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-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 "Duotone"
-
-msgid "SilverGreen"
-msgstr "SilverGreen"
-
-msgid "PearlHD"
-msgstr "PearlHD"
-
-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 "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-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.1с]"
-
-msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "Визначення інтервалу оновлення повідомлень. Малий інтервал спричинює більше завантаження процесора."
-
-msgid "Analyze stream"
-msgstr "Аналіз потоку"
-
-msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "Визначення, чи проводити аналіз DVB потоку і обчислення бітрейту"
-
-msgid "Calculation interval [0.1s]"
-msgstr "Інтервал обчислення [0.1с]"
-
-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 "IP сервісу SVDRP"
-
-msgid "Define the IP address of SVDRP service."
-msgstr "Визначення IP адреси сервісу SVDRP."
-
-msgid "Help"
-msgstr "Допомога"
-
 msgid "Fixed"
 msgstr "Фіксовано"

@ -265,9 +260,6 @@ msgstr "MPEG-2"
 msgid "H.264"
 msgstr "H.264"

-msgid "H.265"
-msgstr "H.265"
-
 msgid "MPEG-1 Layer I"
 msgstr "MPEG-1 Layer I"

--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# 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: vdr-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\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"
@ -25,12 +25,132 @@ msgstr "频道信息浏览"
 msgid "Femon not available"
 msgstr "Femon插件无法使用"

-msgid "Video"
-msgstr "视频"
+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 "PearlHD"
+msgstr "PearlHD"
+
+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 "音频"

@ -118,141 +238,6 @@ msgstr "低频效果"
 msgid "Dialogue Normalization"
 msgstr "对话正常化"

-msgid "basic"
-msgstr "基本"
-
-msgid "transponder"
-msgstr "转发器"
-
-msgid "stream"
-msgstr "数据流"
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-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 "PearlHD"
-msgstr "PearlHD"
-
-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 "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-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 "Fixed"
 msgstr "固定"

@ -265,9 +250,6 @@ msgstr "MPEG-2"
 msgid "H.264"
 msgstr "H.264"

-msgid "H.265"
-msgstr "H.265"
-
 msgid "MPEG-1 Layer I"
 msgstr "MPEG-1 Layer I"

--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@ -1,14 +1,14 @@
 # VDR plugin language source file. 
-# Copyright (C) 2007-2019 Rolf Ahrenberg
+# 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: vdr-femon 2.4.0\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2018-04-15 04:15+0300\n"
-"PO-Revision-Date: 2018-04-15 04:15+0300\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"
@ -25,12 +25,132 @@ msgstr "頻道信息瀏覽"
 msgid "Femon not available"
 msgstr "Femon插件無法使用"

-msgid "Video"
-msgstr "視頻"
+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 "PearlHD"
+msgstr "PearlHD"
+
+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 "音頻"

@ -118,141 +238,6 @@ msgstr "低頻效果"
 msgid "Dialogue Normalization"
 msgstr "對話正常化"

-msgid "basic"
-msgstr "基本"
-
-msgid "transponder"
-msgstr "轉發器"
-
-msgid "stream"
-msgstr "數據流"
-
-msgid "dBm"
-msgstr "dBm"
-
-msgid "dBuV"
-msgstr "dBuV"
-
-msgid "dBV"
-msgstr "dBV"
-
-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 "PearlHD"
-msgstr "PearlHD"
-
-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 "Signal level unit"
-msgstr ""
-
-msgid "Define the used signal level unit."
-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 "Fixed"
 msgstr "固定"

@ -265,9 +250,6 @@ msgstr "MPEG-2"
 msgid "H.264"
 msgstr "H.264"

-msgid "H.265"
-msgstr "H.265"
-
 msgid "MPEG-1 Layer I"
 msgstr "MPEG-1 Layer I"

--- a/receiver.c
+++ b/receiver.c
@ -1,259 +0,0 @@
-/*
- * receiver.c: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#include <unistd.h>
-
-#include "config.h"
-#include "log.h"
-#include "tools.h"
-#include "receiver.h"
-
-cFemonReceiver::cFemonReceiver(const cChannel *channelP, int aTrackP, int dTrackP)
-: cReceiver(channelP),
-  cThread("femon receiver"),
-  mutexM(),
-  sleepM(),
-  activeM(false),
-  detectH264M(this),
-  detectH265M(this),
-  detectMpegM(this, this),
-  detectAacM(this),
-  detectLatmM(this),
-  detectAc3M(this),
-  videoBufferM(KILOBYTE(512), TS_SIZE, false, "Femon video"),
-  videoTypeM(channelP ? channelP->Vtype(): 0),
-  videoPidM(channelP ? channelP->Vpid() : 0),
-  videoPacketCountM(0),
-  videoBitRateM(0.0),
-  videoValidM(false),
-  audioBufferM(KILOBYTE(256), TS_SIZE, false, "Femon audio"),
-  audioPidM(channelP ? channelP->Apid(aTrackP) : 0),
-  audioPacketCountM(0),
-  audioBitRateM(0.0),
-  audioValidM(false),
-  ac3BufferM(KILOBYTE(256), TS_SIZE, false, "Femon AC3"),
-  ac3PidM(channelP ? channelP->Dpid(dTrackP) : 0),
-  ac3PacketCountM(0),
-  ac3BitRateM(0),
-  ac3ValidM(false)
-{
-  debug1("%s (, %d, %d)", __PRETTY_FUNCTION__, aTrackP, dTrackP);
-
-  SetPids(NULL);
-  AddPid(videoPidM);
-  AddPid(audioPidM);
-  AddPid(ac3PidM);
-
-  videoBufferM.SetTimeouts(0, 100);
-  audioBufferM.SetTimeouts(0, 100);
-  ac3BufferM.SetTimeouts(0, 100);
-
-  videoInfoM.codec = VIDEO_CODEC_INVALID;
-  videoInfoM.format = VIDEO_FORMAT_INVALID;
-  videoInfoM.scan = VIDEO_SCAN_INVALID;
-  videoInfoM.aspectRatio = VIDEO_ASPECT_RATIO_INVALID;
-  videoInfoM.width = 0;
-  videoInfoM.height = 0;
-  videoInfoM.frameRate = 0;
-  videoInfoM.bitrate = AUDIO_BITRATE_INVALID;
-  audioInfoM.codec = AUDIO_CODEC_UNKNOWN;
-  audioInfoM.bitrate = AUDIO_BITRATE_INVALID;
-  audioInfoM.samplingFrequency = AUDIO_SAMPLING_FREQUENCY_INVALID;
-  audioInfoM.channelMode = AUDIO_CHANNEL_MODE_INVALID;
-  ac3InfoM.bitrate = AUDIO_BITRATE_INVALID;
-  ac3InfoM.samplingFrequency = AUDIO_SAMPLING_FREQUENCY_INVALID;
-  ac3InfoM.bitstreamMode = AUDIO_BITSTREAM_MODE_INVALID;
-  ac3InfoM.audioCodingMode = AUDIO_CODING_MODE_INVALID;
-  ac3InfoM.dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
-  ac3InfoM.centerMixLevel = AUDIO_CENTER_MIX_LEVEL_INVALID;
-  ac3InfoM.surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
-  ac3InfoM.dialogLevel = 0;
-  ac3InfoM.lfe = false;
-}
-
-cFemonReceiver::~cFemonReceiver(void)
-{
-  debug1("%s", __PRETTY_FUNCTION__);
-  Deactivate();
-}
-
-void cFemonReceiver::Deactivate(void)
-{
-  debug1("%s", __PRETTY_FUNCTION__);
-  Detach();
-  if (activeM) {
-     activeM = false;
-     sleepM.Signal();
-     if (Running())
-        Cancel(3);
-     }
-}
-
-void cFemonReceiver::Activate(bool onP)
-{
-  debug1("%s (%d)", __PRETTY_FUNCTION__, onP);
-  if (onP)
-     Start();
-  else
-     Deactivate();
-}
-
-void cFemonReceiver::Receive(const uchar *dataP, int lengthP)
-{
-  // TS packet length: TS_SIZE
-  if (Running() && (*dataP == TS_SYNC_BYTE) && (lengthP == TS_SIZE)) {
-     int len, pid = TsPid(dataP);
-     if (pid == videoPidM) {
-        ++videoPacketCountM;
-        len = videoBufferM.Put(dataP, lengthP);
-        if (len != lengthP) {
-           videoBufferM.ReportOverflow(lengthP - len);
-           videoBufferM.Clear();
-           }
-        }
-     else if (pid == audioPidM) {
-        ++audioPacketCountM;
-        len = audioBufferM.Put(dataP, lengthP);
-        if (len != lengthP) {
-           audioBufferM.ReportOverflow(lengthP - len);
-           audioBufferM.Clear();
-           }
-        }
-     else if (pid == ac3PidM) {
-        ++ac3PacketCountM;
-        len = ac3BufferM.Put(dataP, lengthP);
-        if (len != lengthP) {
-           ac3BufferM.ReportOverflow(lengthP - len);
-           ac3BufferM.Clear();
-           }
-        }
-     }
-}
-
-void cFemonReceiver::Action(void)
-{
-  debug1("%s", __PRETTY_FUNCTION__);
-  cTimeMs calcPeriod(0);
-  activeM = true;
-
-  while (Running() && activeM) {
-    uint8_t *Data;
-    double timeout;
-    int len, Length;
-    bool processed = false;
-
-    // process available video data
-    while ((Data = videoBufferM.Get(Length))) {
-      if (!activeM || (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;
-                }
-             }
-         videoBufferM.Del(Length);
-         continue;
-         }
-      processed = true;
-      if (TsPayloadStart(Data)) {
-         while (const uint8_t *p = videoAssemblerM.GetPes(len)) {
-           if (videoTypeM == 0x1B) {
-              if (detectH264M.processVideo(p, len)) {
-                 videoValidM = true;
-                 break;
-                 }
-              }
-           else if (videoTypeM == 0x24) {
-              if (detectH265M.processVideo(p, len)) {
-                 videoValidM = true;
-                 break;
-                 }
-              }
-           else {
-              if (detectMpegM.processVideo(p, len)) {
-                 videoValidM = true;
-                 break;
-                 }
-              }
-           }
-         videoAssemblerM.Reset();
-         }
-      videoAssemblerM.PutTs(Data, Length);
-      videoBufferM.Del(Length);
-      }
-
-    // process available audio data
-    while ((Data = audioBufferM.Get(Length))) {
-      if (!activeM || (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;
-                }
-             }
-         audioBufferM.Del(Length);
-         continue;
-         }
-      processed = true;
-      if (const uint8_t *p = audioAssemblerM.GetPes(len)) {
-         if (detectAacM.processAudio(p, len) || detectLatmM.processAudio(p, len) || detectMpegM.processAudio(p, len))
-            audioValidM = true;
-         audioAssemblerM.Reset();
-         }
-      audioAssemblerM.PutTs(Data, Length);
-      audioBufferM.Del(Length);
-      }
-
-    // process available dolby data
-    while ((Data = ac3BufferM.Get(Length))) {
-      if (!activeM || (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;
-                }
-             }
-         ac3BufferM.Del(Length);
-         continue;
-         }
-      processed = true;
-      if (const uint8_t *p = ac3AssemblerM.GetPes(len)) {
-         if (detectAc3M.processAudio(p, len))
-            ac3ValidM = true;
-         ac3AssemblerM.Reset();
-         }
-      ac3AssemblerM.PutTs(Data, Length);
-      ac3BufferM.Del(Length);
-      }
-
-    // calculate bitrates
-    timeout = double(calcPeriod.Elapsed());
-    if (activeM && (timeout >= (100.0 * FemonConfig.GetCalcInterval()))) {
-       // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
-       // PES headers should be compensated!
-       videoBitRateM     = (1000.0 * 8.0 * 184.0 * videoPacketCountM) / timeout;
-       videoPacketCountM = 0;
-       audioBitRateM     = (1000.0 * 8.0 * 184.0 * audioPacketCountM) / timeout;
-       audioPacketCountM = 0;
-       ac3BitRateM       = (1000.0 * 8.0 * 184.0 * ac3PacketCountM)   / timeout;
-       ac3PacketCountM   = 0;
-       calcPeriod.Set(0);
-       }
-
-    if (!processed)
-       sleepM.Wait(10); // to avoid busy loop and reduce cpu load
-    }
-}
--- a/receiver.h
+++ b/receiver.h
@ -1,180 +0,0 @@
-/*
- * receiver.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_RECEIVER_H
-#define __FEMON_RECEIVER_H
-
-#include <vdr/thread.h>
-#include <vdr/receiver.h>
-
-#include "aac.h"
-#include "ac3.h"
-#include "audio.h"
-#include "h264.h"
-#include "h265.h"
-#include "latm.h"
-#include "mpeg.h"
-#include "tools.h"
-#include "video.h"
-
-class cFemonReceiver : public cReceiver, public cThread, public cFemonVideoIf, public cFemonAudioIf, public cFemonAC3If {
-private:
-  cMutex            mutexM;
-  cCondWait         sleepM;
-  bool              activeM;
-
-  cFemonH264        detectH264M;
-  cFemonH265        detectH265M;
-  cFemonMPEG        detectMpegM;
-  cFemonAAC         detectAacM;
-  cFemonLATM        detectLatmM;
-  cFemonAC3         detectAc3M;
-
-  cRingBufferLinear videoBufferM;
-  cTsToPes          videoAssemblerM;
-  int               videoTypeM;
-  int               videoPidM;
-  int               videoPacketCountM;
-  double            videoBitRateM;
-  bool              videoValidM;
-  video_info_t      videoInfoM;
-
-  cRingBufferLinear audioBufferM;
-  cTsToPes          audioAssemblerM;
-  int               audioPidM;
-  int               audioPacketCountM;
-  double            audioBitRateM;
-  bool              audioValidM;
-  audio_info_t      audioInfoM;
-
-  cRingBufferLinear ac3BufferM;
-  cTsToPes          ac3AssemblerM;
-  int               ac3PidM;
-  int               ac3PacketCountM;
-  double            ac3BitRateM;
-  bool              ac3ValidM;
-  ac3_info_t        ac3InfoM;
-
-protected:
-  virtual void Activate(bool onP);
-  virtual void Receive(const uchar *dataP, int lengthP);
-  virtual void Action(void);
-
-public:
-  virtual void SetVideoCodec(eVideoCodec codecP)                   { cMutexLock MutexLock(&mutexM);
-                                                                     videoInfoM.codec = codecP; }
-  virtual void SetVideoFormat(eVideoFormat formatP)                { cMutexLock MutexLock(&mutexM);
-                                                                     videoInfoM.format = formatP; }
-  virtual void SetVideoScan(eVideoScan scanP)                      { cMutexLock MutexLock(&mutexM);
-                                                                     videoInfoM.scan = scanP; }
-  virtual void SetVideoAspectRatio(eVideoAspectRatio aspectRatioP) { cMutexLock MutexLock(&mutexM);
-                                                                     videoInfoM.aspectRatio = aspectRatioP; }
-  virtual void SetVideoSize(int widthP, int heightP)               { cMutexLock MutexLock(&mutexM);
-                                                                     videoInfoM.width  = widthP;
-                                                                     videoInfoM.height = heightP; }
-  virtual void SetVideoFramerate(double frameRateP)                { cMutexLock MutexLock(&mutexM);
-                                                                     videoInfoM.frameRate = frameRateP; }
-  virtual void SetVideoBitrate(double bitRateP)                    { cMutexLock MutexLock(&mutexM);
-                                                                     videoInfoM.bitrate = bitRateP; }
-
-  virtual void SetAudioCodec(eAudioCodec codecP)        { cMutexLock MutexLock(&mutexM);
-                                                          audioInfoM.codec = codecP; }
-  virtual void SetAudioBitrate(double bitRateP)         { cMutexLock MutexLock(&mutexM);
-                                                          audioInfoM.bitrate = bitRateP; }
-  virtual void SetAudioSamplingFrequency(int samplingP) { cMutexLock MutexLock(&mutexM);
-                                                          audioInfoM.samplingFrequency = samplingP; }
-  virtual void SetAudioChannel(eAudioChannelMode modeP) { cMutexLock MutexLock(&mutexM);
-                                                          audioInfoM.channelMode = modeP; }
-
-  virtual void SetAC3Bitrate(int bitRateP)            { cMutexLock MutexLock(&mutexM);
-                                                        ac3InfoM.bitrate = bitRateP; }
-  virtual void SetAC3SamplingFrequency(int samplingP) { cMutexLock MutexLock(&mutexM);
-                                                        ac3InfoM.samplingFrequency = samplingP; }
-  virtual void SetAC3Bitstream(int modeP)             { cMutexLock MutexLock(&mutexM);
-                                                        ac3InfoM.bitstreamMode = modeP; }
-  virtual void SetAC3AudioCoding(int modeP)           { cMutexLock MutexLock(&mutexM);
-                                                        ac3InfoM.audioCodingMode = modeP; }
-  virtual void SetAC3DolbySurround(int modeP)         { cMutexLock MutexLock(&mutexM);
-                                                        ac3InfoM.dolbySurroundMode = modeP; }
-  virtual void SetAC3CenterMix(int levelP)            { cMutexLock MutexLock(&mutexM);
-                                                        ac3InfoM.centerMixLevel = levelP; }
-  virtual void SetAC3SurroundMix(int levelP)          { cMutexLock MutexLock(&mutexM);
-                                                        ac3InfoM.surroundMixLevel = levelP; }
-  virtual void SetAC3Dialog(int levelP)               { cMutexLock MutexLock(&mutexM);
-                                                        ac3InfoM.dialogLevel = levelP; }
-  virtual void SetAC3LFE(bool onoffP)                 { cMutexLock MutexLock(&mutexM);
-                                                        ac3InfoM.lfe = onoffP; }
-
-public:
-  cFemonReceiver(const cChannel* channelP, int aTrackp, int dTrackP);
-  virtual ~cFemonReceiver();
-  void Deactivate(void);
-
-  bool   VideoValid(void)           { cMutexLock MutexLock(&mutexM);
-                                      return videoValidM; };                  // boolean
-  double VideoBitrate(void)         { cMutexLock MutexLock(&mutexM);
-                                      return videoBitRateM; };                // bit/s
-  int    VideoCodec(void)           { cMutexLock MutexLock(&mutexM);
-                                      return videoInfoM.codec; };             // eVideoCodec
-  int    VideoFormat(void)          { cMutexLock MutexLock(&mutexM);
-                                      return videoInfoM.format; };            // eVideoFormat
-  int    VideoScan(void)            { cMutexLock MutexLock(&mutexM);
-                                      return videoInfoM.scan; };              // eVideoScan
-  int    VideoAspectRatio(void)     { cMutexLock MutexLock(&mutexM);
-                                      return videoInfoM.aspectRatio; };       // eVideoAspectRatio
-  int    VideoHorizontalSize(void)  { cMutexLock MutexLock(&mutexM);
-                                      return videoInfoM.width; };             // pixels
-  int    VideoVerticalSize(void)    { cMutexLock MutexLock(&mutexM);
-                                      return videoInfoM.height; };            // pixels
-  double VideoFrameRate(void)       { cMutexLock MutexLock(&mutexM);
-                                      return videoInfoM.frameRate; };         // Hz
-  double VideoStreamBitrate(void)   { cMutexLock MutexLock(&mutexM);
-                                      return videoInfoM.bitrate; };           // bit/s
-
-  bool   AudioValid(void)           { cMutexLock MutexLock(&mutexM);
-                                      return audioValidM; };                  // boolean
-  double AudioBitrate(void)         { cMutexLock MutexLock(&mutexM);
-                                      return audioBitRateM; };                // bit/s
-  int    AudioCodec(void)           { cMutexLock MutexLock(&mutexM);
-                                      return audioInfoM.codec; };             // eAudioCodec
-  int    AudioChannelMode(void)     { cMutexLock MutexLock(&mutexM);
-                                      return audioInfoM.channelMode; };       // eAudioChannelMode
-  double AudioStreamBitrate(void)   { cMutexLock MutexLock(&mutexM);
-                                      return audioInfoM.bitrate; };           // bit/s or eAudioBitrate
-  int    AudioSamplingFreq(void)    { cMutexLock MutexLock(&mutexM);
-                                      return audioInfoM.samplingFrequency; }; // Hz or eAudioSamplingFrequency
-
-  bool   AC3Valid(void)             { cMutexLock MutexLock(&mutexM);
-                                      return ac3ValidM; };                    // boolean
-  double AC3Bitrate(void)           { cMutexLock MutexLock(&mutexM);
-                                      return ac3BitRateM; };                  // bit/s
-  double AC3StreamBitrate(void)     { cMutexLock MutexLock(&mutexM);
-                                      return ac3InfoM.bitrate; };             // bit/s or eAudioBitrate
-  int    AC3SamplingFreq(void)      { cMutexLock MutexLock(&mutexM);
-                                      return ac3InfoM.samplingFrequency; };   // Hz or eAudioSamplingFrequency
-  int    AC3BitStreamMode(void)     { cMutexLock MutexLock(&mutexM);
-                                      return ac3InfoM.bitstreamMode; };       // 0..7 or eAudioBitstreamMode
-  int    AC3AudioCodingMode(void)   { cMutexLock MutexLock(&mutexM);
-                                      return ac3InfoM.audioCodingMode; };     // 0..7 or eAudioCodingMode
-  bool   AC3_2_0(void)              { cMutexLock MutexLock(&mutexM);
-                                      return (ac3InfoM.audioCodingMode == AUDIO_CODING_MODE_2_0); }; // boolean
-  bool   AC3_5_1(void)	            { cMutexLock MutexLock(&mutexM);
-                                      return (ac3InfoM.audioCodingMode == AUDIO_CODING_MODE_3_2); }; // boolean
-  int    AC3DolbySurroundMode(void) { cMutexLock MutexLock(&mutexM);
-                                      return ac3InfoM.dolbySurroundMode; };   // eAudioDolbySurroundMode
-  int    AC3CenterMixLevel(void)    { cMutexLock MutexLock(&mutexM);
-                                      return ac3InfoM.centerMixLevel; };      // eAudioCenterMixLevel
-  int    AC3SurroundMixLevel(void)  { cMutexLock MutexLock(&mutexM);
-                                      return ac3InfoM.surroundMixLevel; };    // eAudioSurroundMixLevel
-  int    AC3DialogLevel(void)       { cMutexLock MutexLock(&mutexM);
-                                      return ac3InfoM.dialogLevel; };         // -dB
-  bool   AC3Lfe(void)               { cMutexLock MutexLock(&mutexM);
-                                      return ac3InfoM.lfe; };                 // boolean
-  };
-
-#endif //__FEMON_RECEIVER_H
-
--- a/setup.c
+++ b/setup.c
@ -1,172 +0,0 @@
-/*
- * setup.c: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#include <vdr/menu.h>
-
-#include "config.h"
-#include "log.h"
-#include "tools.h"
-#include "setup.h"
-
-cMenuFemonSetup::cMenuFemonSetup()
-: hideMenuM(FemonConfig.GetHideMenu()),
-  displayModeM(FemonConfig.GetDisplayMode()),
-  skinM(FemonConfig.GetSkin()),
-  themeM(FemonConfig.GetTheme()),
-  positionM(FemonConfig.GetPosition()),
-  downscaleM(FemonConfig.GetDownscale()),
-  signalUnitM(FemonConfig.GetSignalUnit()),
-  redLimitM(FemonConfig.GetRedLimit()),
-  greenLimitM(FemonConfig.GetGreenLimit()),
-  updateIntervalM(FemonConfig.GetUpdateInterval()),
-  analyzeStreamM(FemonConfig.GetAnalyzeStream()),
-  calcIntervalM(FemonConfig.GetCalcInterval()),
-  useSvdrpM(FemonConfig.GetUseSvdrp()),
-  svdrpPortM(FemonConfig.GetSvdrpPort())
-{
-  debug1("%s", __PRETTY_FUNCTION__);
-  strn0cpy(svdrpIpM, FemonConfig.GetSvdrpIp(), sizeof(svdrpIpM));
-
-  dispModesM[eFemonModeBasic]        = tr("basic");
-  dispModesM[eFemonModeTransponder]  = tr("transponder");
-  dispModesM[eFemonModeStream]       = tr("stream");
-  dispModesM[eFemonModeAC3]          = tr("AC-3");
-
-  signalUnitsM[eFemonSignalUnitdBm]  = tr("dBm");
-  signalUnitsM[eFemonSignalUnitdBuV] = tr("dBuV");
-  signalUnitsM[eFemonSignalUnitdBV]  = tr("dBV");
-
-  skinsM[eFemonSkinClassic]          = tr("Classic");
-  skinsM[eFemonSkinElchi]            = tr("Elchi");
-
-  themesM[eFemonThemeClassic]        = tr("Classic");
-  themesM[eFemonThemeElchi]          = tr("Elchi");
-  themesM[eFemonThemeSTTNG]          = tr("ST:TNG");
-  themesM[eFemonThemeDeepBlue]       = tr("DeepBlue");
-  themesM[eFemonThemeMoronimo]       = tr("Moronimo");
-  themesM[eFemonThemeEnigma]         = tr("Enigma");
-  themesM[eFemonThemeEgalsTry]       = tr("EgalsTry");
-  themesM[eFemonThemeDuotone]        = tr("Duotone");
-  themesM[eFemonThemeSilverGreen]    = tr("SilverGreen");
-  themesM[eFemonThemePearlHD]        = tr("PearlHD");
-
-  SetMenuCategory(mcSetupPlugins);
-  Setup();
-}
-
-void cMenuFemonSetup::Setup(void)
-{
-  int current = Current();
-
-  Clear();
-  helpM.Clear();
-
-  Add(new cMenuEditBoolItem(tr("Hide main menu entry"), &hideMenuM));
-  helpM.Append(tr("Define whether the main menu entry is hidden."));
-
-  Add(new cMenuEditStraItem(tr("Default display mode"), &displayModeM, eFemonModeMaxNumber, dispModesM));
-  helpM.Append(tr("Define the default display mode at startup."));
-
-  Add(new cMenuEditStraItem(trVDR("Setup.OSD$Skin"), &skinM, eFemonSkinMaxNumber, skinsM));
-  helpM.Append(tr("Define the used OSD skin."));
-
-  Add(new cMenuEditStraItem(trVDR("Setup.OSD$Theme"), &themeM, eFemonThemeMaxNumber, themesM));
-  helpM.Append(tr("Define the used OSD theme."));
-
-  Add(new cMenuEditBoolItem(tr("Position"), &positionM, trVDR("bottom"), trVDR("top")));
-  helpM.Append(tr("Define the position of OSD."));
-
-  Add(new cMenuEditIntItem(tr("Downscale OSD size [%]"), &downscaleM, 0, 20));
-  helpM.Append(tr("Define the downscale ratio for OSD size."));
-
-  Add(new cMenuEditStraItem(tr("Signal level unit"), &signalUnitM, eFemonSignalUnitMaxNumber, signalUnitsM));
-  helpM.Append(tr("Define the used signal level unit."));
-
-  Add(new cMenuEditIntItem(tr("Red limit [%]"), &redLimitM, 1, 50));
-  helpM.Append(tr("Define a limit for red bar, which is used to indicate a bad signal."));
-
-  Add(new cMenuEditIntItem(tr("Green limit [%]"), &greenLimitM, 51, 100));
-  helpM.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]"), &updateIntervalM, 1, 100));
-  helpM.Append(tr("Define an interval for OSD updates. The smaller interval generates higher CPU load."));
-
-  Add(new cMenuEditBoolItem(tr("Analyze stream"), &analyzeStreamM));
-  helpM.Append(tr("Define whether the DVB stream is analyzed and bitrates calculated."));
-
-  if (analyzeStreamM) {
-     Add(new cMenuEditIntItem(tr("Calculation interval [0.1s]"), &calcIntervalM, 1, 100));
-     helpM.Append(tr("Define an interval for calculation. The bigger interval generates more stable values."));
-     }
-
-  Add(new cMenuEditBoolItem(tr("Use SVDRP service"), &useSvdrpM));
-  helpM.Append(tr("Define whether the SVDRP service is used in client/server setups."));
-
-  if (useSvdrpM) {
-     Add(new cMenuEditIntItem(tr("SVDRP service port"), &svdrpPortM, 1, 65535));
-     helpM.Append(tr("Define the port number of SVDRP service."));
-
-     Add(new cMenuEditStrItem(tr("SVDRP service IP"), svdrpIpM, sizeof(svdrpIpM), ".1234567890"));
-     helpM.Append(tr("Define the IP address of SVDRP service."));
-     }
-
-  SetCurrent(Get(current));
-  Display();
-}
-
-void cMenuFemonSetup::Store(void)
-{
-  debug1("%s", __PRETTY_FUNCTION__);
-  // Store values into setup.conf
-  SetupStore("HideMenu",       hideMenuM);
-  SetupStore("DisplayMode",    displayModeM);
-  SetupStore("Skin",           skinM);
-  SetupStore("Theme",          themeM);
-  SetupStore("Position",       positionM);
-  SetupStore("Downscale",      downscaleM);
-  SetupStore("SignalUnit",     signalUnitM);
-  SetupStore("RedLimit",       redLimitM);
-  SetupStore("GreenLimit",     greenLimitM);
-  SetupStore("UpdateInterval", updateIntervalM);
-  SetupStore("AnalStream",     analyzeStreamM);
-  SetupStore("CalcInterval",   calcIntervalM);
-  SetupStore("UseSvdrp",       useSvdrpM);
-  SetupStore("ServerPort",     svdrpPortM);
-  SetupStore("ServerIp",       svdrpIpM);
-  // Update global config
-  FemonConfig.SetHideMenu(hideMenuM);
-  FemonConfig.SetDisplayMode(displayModeM);
-  FemonConfig.SetSkin(skinM);
-  FemonConfig.SetTheme(themeM);
-  FemonConfig.SetPosition(positionM);
-  FemonConfig.SetDownscale(downscaleM);
-  FemonConfig.SetSignalUnit(signalUnitM);
-  FemonConfig.SetRedLimit(redLimitM);
-  FemonConfig.SetGreenLimit(greenLimitM);
-  FemonConfig.SetUpdateInterval(updateIntervalM);
-  FemonConfig.SetAnalyzeStream(analyzeStreamM);
-  FemonConfig.SetCalcInterval(calcIntervalM);
-  FemonConfig.SetUseSvdrp(useSvdrpM);
-  FemonConfig.SetSvdrpPort(svdrpPortM);
-  FemonConfig.SetSvdrpIp(svdrpIpM);
-}
-
-eOSState cMenuFemonSetup::ProcessKey(eKeys keyP)
-{
-  int oldUseSvdrp = useSvdrpM;
-  int oldAnalyzeStream = analyzeStreamM;
-
-  eOSState state = cMenuSetupPage::ProcessKey(keyP);
-
-  if (keyP != kNone && (analyzeStreamM != oldAnalyzeStream || useSvdrpM != oldUseSvdrp))
-     Setup();
-
-  if ((keyP == kInfo) && (state == osUnknown) && (Current() < helpM.Size()))
-     return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("Help"), trVDR("Plugin"), PLUGIN_NAME_I18N), helpM[Current()]));
-
-  return state;
-}
--- a/setup.h
+++ b/setup.h
@ -1,43 +0,0 @@
-/*
- * setup.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_SETUP_H
-#define __FEMON_SETUP_H
-
-class cMenuFemonSetup : public cMenuSetupPage {
-private:
-  const char *dispModesM[eFemonModeMaxNumber];
-  const char *signalUnitsM[eFemonSignalUnitMaxNumber];
-  const char *skinsM[eFemonSkinMaxNumber];
-  const char *themesM[eFemonThemeMaxNumber];
-  cVector<const char*> helpM;
-  int hideMenuM;
-  int displayModeM;
-  int skinM;
-  int themeM;
-  int positionM;
-  int downscaleM;
-  int signalUnitM;
-  int redLimitM;
-  int greenLimitM;
-  int updateIntervalM;
-  int analyzeStreamM;
-  int calcIntervalM;
-  int useSvdrpM;
-  int svdrpPortM;
-  char svdrpIpM[MaxSvdrpIp + 1]; // must end with additional null
-  void Setup(void);
-
-protected:
-  virtual eOSState ProcessKey(eKeys Key);
-  virtual void Store(void);
-
-public:
-  cMenuFemonSetup();
-};
-
-#endif // __FEMON_SETUP_H
--- a/svdrpservice.h
+++ b/svdrpservice.h
@ -11,11 +11,11 @@

 class cLine: public cListObject {
 private:
-  char *lineM;
+  char *Line;
 public:
-  const char *Text()      { return lineM; }
-  cLine(const char *strP) { lineM = strP ? strdup(strP) : NULL; };
-  virtual ~cLine()        { if (lineM) free(lineM); };
+  const char *Text()   { return Line; }
+  cLine(const char *s) { Line = s ? strdup(s) : NULL; };
+  virtual ~cLine()     { if (Line) free(Line); };
 };

 struct SvdrpConnection_v1_0 {
--- a/symbols/format2160.xpm
+++ b/symbols/format2160.xpm
@ -1,23 +0,0 @@
-/* XPM */
-static const char *const format2160_xpm[] = {
-"40 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"++++++++++++++++++++++++++++++++++++++++",
-"+......................................+",
-"+.....++++......++..++++++....++++.....+",
-"+...+++++++..+++++.++++++++..++++++....+",
-"+...++....++.+++++.+++...++..++..++....+",
-"+.........++....++.++.......++....++...+",
-"+.........++....++.++.......++....++...+",
-"+.........++....++.++.+++...++....++...+",
-"+.......+++.....++.+++++++..++....++...+",
-"+......+++......++.+++..+++.++....++...+",
-"+.....+++.......++.++....++.++....++...+",
-"+.....+++.......++.++....++.++....++...+",
-"+....+++........++.++....++.++....++...+",
-"+....++.........++.+++..+++..++..++....+",
-"+....++++++++...++..+++++++..++++++....+",
-"+....++++++++...++...+++++....++++.....+",
-"+......................................+",
-"++++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/format2160i.xpm
+++ b/symbols/format2160i.xpm
@ -1,23 +0,0 @@
-/* XPM */
-static const char *const format2160i_xpm[] = {
-"43 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"+++++++++++++++++++++++++++++++++++++++++++",
-"+.........................................+",
-"+.....++++......++..++++++....++++........+",
-"+...+++++++..+++++.++++++++..++++++.......+",
-"+...++....++.+++++.+++...++..++..++.......+",
-"+.........++....++.++.......++....++......+",
-"+.........++....++.++.......++....++.++...+",
-"+.........++....++.++.+++...++....++.++...+",
-"+.......+++.....++.+++++++..++....++......+",
-"+......+++......++.+++..+++.++....++.++...+",
-"+.....+++.......++.++....++.++....++.++...+",
-"+.....+++.......++.++....++.++....++.++...+",
-"+....+++........++.++....++.++....++.++...+",
-"+....++.........++.+++..+++..++..++..++...+",
-"+....++++++++...++..+++++++..++++++..++...+",
-"+....++++++++...++...+++++....++++...++...+",
-"+.........................................+",
-"+++++++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/format2160p.xpm
+++ b/symbols/format2160p.xpm
@ -1,23 +0,0 @@
-/* XPM */
-static const char *const format2160p_xpm[] = {
-"47 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"+++++++++++++++++++++++++++++++++++++++++++++++",
-"+.............................................+",
-"+.....++++......++..++++++....++++............+",
-"+...+++++++..+++++.++++++++..++++++...........+",
-"+...++....++.+++++.+++...++..++..++...........+",
-"+.........++....++.++.......++....++..........+",
-"+.........++....++.++.......++....++..........+",
-"+.........++....++.++.+++...++....++.++++.....+",
-"+.......+++.....++.+++++++..++....++.+++++....+",
-"+......+++......++.+++..+++.++....++.++..++...+",
-"+.....+++.......++.++....++.++....++.++..++...+",
-"+.....+++.......++.++....++.++....++.+++++....+",
-"+....+++........++.++....++.++....++.++++.....+",
-"+....++.........++.+++..+++..++..++..++.......+",
-"+....++++++++...++..+++++++..++++++..++.......+",
-"+....++++++++...++...+++++....++++...++.......+",
-"+.............................................+",
-"+++++++++++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/h265.xpm
+++ b/symbols/h265.xpm
@ -1,23 +0,0 @@
-/* XPM */
-static const char *const h265_xpm[] = {
-"40 18 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"++++++++++++++++++++++++++++++++++++++++",
-"+......................................+",
-"+..++...++.....+++++...+++++..+++++++..+",
-"+..++...++....+++++++.+++++++.+++++++..+",
-"+..++...++....++...++.++...++.++.......+",
-"+..++...++.........++.++......++.......+",
-"+..++...++.........++.++......++.......+",
-"+..++...++........+++.++......++.......+",
-"+..+++++++.......+++..++++++..++++++...+",
-"+..+++++++......+++...+++++++.+++++++..+",
-"+..++...++.....+++....++...++.....+++..+",
-"+..++...++....+++.....++...++......++..+",
-"+..++...++....++......++...++......++..+",
-"+..++...++....++...++.++...++.++...++..+",
-"+..++...++.++.+++++++.+++++++.++...++..+",
-"+..++...++.++.+++++++..+++++...+++++...+",
-"+......................................+",
-"++++++++++++++++++++++++++++++++++++++++"};
--- a/tools.c
+++ b/tools.c
@ -1,590 +0,0 @@
-/*
- * tools.c: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-
-#include <ctype.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "osd.h"
-#include "receiver.h"
-#include "tools.h"
-
-static cString getCA(int valueP)
-{
-  // http://www.dvb.org/index.php?id=174
-  // http://en.wikipedia.org/wiki/Conditional_access_system
-  switch (valueP) {
-    case 0x0000:            return cString::sprintf("%s (%X)", trVDR("Free To Air"), valueP);  // Reserved
-    case 0x0001 ... 0x009F:
-    case 0x00A2 ... 0x00FF: return cString::sprintf("%s (%X)", tr("Fixed"),  valueP); // Standardized systems
-    case 0x00A0 ... 0x00A1: return cString::sprintf("%s (%X)", tr("Analog"), valueP); // Analog signals
-    case 0x0100 ... 0x01FF: return cString::sprintf("SECA Mediaguard (%X)",  valueP); // Canal Plus
-    case 0x0464:            return cString::sprintf("EuroDec (%X)",          valueP); // EuroDec
-    case 0x0500 ... 0x05FF: return cString::sprintf("Viaccess (%X)",         valueP); // France Telecom
-    case 0x0600 ... 0x06FF: return cString::sprintf("Irdeto (%X)",           valueP); // Irdeto
-    case 0x0700 ... 0x07FF: return cString::sprintf("DigiCipher 2 (%X)",     valueP); // Jerrold/GI/Motorola 4DTV
-    case 0x0900 ... 0x09FF: return cString::sprintf("NDS Videoguard (%X)",   valueP); // NDS
-    case 0x0B00 ... 0x0BFF: return cString::sprintf("Conax (%X)",            valueP); // Norwegian Telekom
-    case 0x0D00 ... 0x0DFF: return cString::sprintf("CryptoWorks (%X)",      valueP); // Philips CryptoTec
-    case 0x0E00 ... 0x0EFF: return cString::sprintf("PowerVu (%X)",          valueP); // Scientific Atlanta
-    case 0x1000:            return cString::sprintf("RAS (%X)",              valueP); // Tandberg Television
-    case 0x1200 ... 0x12FF: return cString::sprintf("NagraVision (%X)",      valueP); // BellVu Express
-    case 0x1700 ... 0x17FF: return cString::sprintf("VCAS (%X)",             valueP); // Verimatrix Inc. former BetaTechnik
-    case 0x1800 ... 0x18FF: return cString::sprintf("NagraVision (%X)",      valueP); // Kudelski SA
-    case 0x22F0:            return cString::sprintf("Codicrypt (%X)",        valueP); // Scopus Network Technologies
-    case 0x2600:            return cString::sprintf("BISS (%X)",             valueP); // European Broadcasting Union
-    case 0x2719:            return cString::sprintf("VanyaCas (%X)",         valueP); // S-Curious Research & Technology Pvt. Ltd.
-    case 0x4347:            return cString::sprintf("CryptOn (%X)",          valueP); // CryptOn
-    case 0x4800:            return cString::sprintf("Accessgate (%X)",       valueP); // Telemann
-    case 0x4900:            return cString::sprintf("China Crypt (%X)",      valueP); // CryptoWorks
-    case 0x4A02:            return cString::sprintf("Tongfang (%X)",         valueP); // Tsinghua Tongfang Company
-    case 0x4A10:            return cString::sprintf("EasyCas (%X)",          valueP); // EasyCas
-    case 0x4A20:            return cString::sprintf("AlphaCrypt (%X)",       valueP); // AlphaCrypt
-    case 0x4A60:            return cString::sprintf("SkyCrypt (%X)",         valueP); // @Sky
-    case 0x4A61:            return cString::sprintf("Neotioncrypt (%X)",     valueP); // Neotion
-    case 0x4A62:            return cString::sprintf("SkyCrypt (%X)",         valueP); // @Sky
-    case 0x4A63:            return cString::sprintf("Neotion SHL (%X)",      valueP); // Neotion
-    case 0x4A64 ... 0x4A6F: return cString::sprintf("SkyCrypt (%X)",         valueP); // @Sky
-    case 0x4A70:            return cString::sprintf("DreamCrypt (%X)",       valueP); // Dream Multimedia
-    case 0x4A80:            return cString::sprintf("ThalesCrypt (%X)",      valueP); // Thales Broadcast & Multimedia
-    case 0x4AA1:            return cString::sprintf("KeyFly (%X)",           valueP); // SIDSA
-    case 0x4ABF:            return cString::sprintf("CTI-CAS (%X)",          valueP); // Beijing Compunicate Technology Inc.
-    case 0x4AC1:            return cString::sprintf("Latens (%X)",           valueP); // Latens Systems
-    case 0x4AD0 ... 0x4AD1: return cString::sprintf("X-Crypt (%X)",          valueP); // XCrypt Inc.
-    case 0x4AD4:            return cString::sprintf("OmniCrypt (%X)",        valueP); // Widevine Technologies, Inc.
-    case 0x4AE0 ... 0x4AE1: return cString::sprintf("Z-Crypt (%X)",          valueP); // Digi Raum Electronics Co. Ltd.
-    case 0x4AE4:            return cString::sprintf("CoreCrypt (%X)",        valueP); // CoreTrust
-    case 0x4AE5:            return cString::sprintf("PRO-Crypt (%X)",        valueP); // IK SATPROF
-    case 0x4AEA:            return cString::sprintf("Cryptoguard (%X)",      valueP); // Gryptoguard AB
-    case 0x4AEB:            return cString::sprintf("Abel Quintic (%X)",     valueP); // Abel DRM Systems
-    case 0x4AF0:            return cString::sprintf("ABV (%X)",              valueP); // Alliance Broadcast Vision
-    case 0x5500:            return cString::sprintf("Z-Crypt (%X)",          valueP); // Digi Raum Electronics Co. Ltd.
-    case 0x5501:            return cString::sprintf("Griffin (%X)",          valueP); // Nucleus Systems Ltd.
-    case 0x5581:            return cString::sprintf("Bulcrypt (%X)",         valueP); // Bulcrypt
-    case 0x7BE1:            return cString::sprintf("DRE-Crypt (%X)",        valueP); // DRE-Crypt
-    case 0xA101:            return cString::sprintf("RosCrypt-M (%X)",       valueP); // NIIR
-    case 0xEAD0:            return cString::sprintf("VanyaCas (%X)",         valueP); // S-Curious Research & Technology Pvt. Ltd.
-    default:                break;
-    }
-  return cString::sprintf("%X", valueP);
-}
-
-static const char *getUserString(int valueP, const tDvbParameterMap *mapP)
-{
-  const tDvbParameterMap *map = mapP;
-  while (map && map->userValue != -1) {
-        if (map->driverValue == valueP)
-           return map->userString ? trVDR(map->userString) : "---";
-        map++;
-        }
-  return "---";
-}
-
-cString getFrontendInfo(cDevice *deviceP)
-{
-  const cChannel *channel;
-  int status, valid = DTV_STAT_VALID_NONE;
-  cString info = "";
-  double signal = 0, cnr = 0, ber = 0, per = 0;
-
-  if (!deviceP)
-     return info;
-
-  info = cString::sprintf("CARD:%d\nSTRG:%d\nQUAL:%d\nTYPE:%s\nNAME:%s", deviceP->CardIndex(), deviceP->SignalStrength(), deviceP->SignalQuality(), *deviceP->DeviceType(), *deviceP->DeviceName());
-  if (deviceP && deviceP->SignalStats(valid, &signal, &cnr, NULL, &ber, &per, &status)) {
-     if (valid & DTV_STAT_VALID_STATUS)
-        info = cString::sprintf("%s\nSTAT:%04X", *info, status);
-     if (valid & DTV_STAT_VALID_STRENGTH)
-        info = cString::sprintf("%s\nSGNL:%s", *info, *dtoa(signal, "%.2f"));
-     if (valid & DTV_STAT_VALID_CNR)
-        info = cString::sprintf("%s\nCNRA:%s", *info, *dtoa(cnr, "%.2f"));
-     if (valid & DTV_STAT_VALID_BERPOST)
-        info = cString::sprintf("%s\nBERA:%s", *info, *dtoa(ber, "%.0f"));
-     if (valid & DTV_STAT_VALID_PER)
-        info = cString::sprintf("%s\nPERA:%s", *info, *dtoa(per, "%.0f"));
-     }
-
-  if (cFemonOsd::Instance())
-     info = cString::sprintf("%s\nVIBR:%s\nAUBR:%s\nDDBR:%s", *info, *dtoa(cFemonOsd::Instance()->GetVideoBitrate(), "%.0f"), *dtoa(cFemonOsd::Instance()->GetAudioBitrate(), "%.0f"), *dtoa(cFemonOsd::Instance()->GetDolbyBitrate(), "%.0f"));
-
-  LOCK_CHANNELS_READ;
-  channel = Channels->GetByNumber(cDevice::CurrentChannel());
-  if (channel)
-     info = cString::sprintf("%s\nCHAN:%s", *info, *channel->ToText());
-
-  return info;
-}
-
-cString getFrontendName(cDevice *deviceP)
-{
-  if (!deviceP)
-     return NULL;
-
-  return (cString::sprintf("%s on deviceP #%d", *deviceP->DeviceName(), deviceP->CardIndex()));
-}
-
-cString getFrontendStatus(cDevice *deviceP)
-{
-  int status;
-  int valid = DTV_STAT_VALID_NONE;
-
-  if (deviceP && deviceP->SignalStats(valid, NULL, NULL, NULL, NULL, NULL, &status)) {
-     if (valid & DTV_STAT_VALID_STATUS)
-        return (cString::sprintf("Status %s:%s:%s:%s:%s on deviceP #%d", (status & DTV_STAT_HAS_LOCK) ? "LOCKED" : "-", (status & DTV_STAT_HAS_SIGNAL) ? "SIGNAL" : "-", (status & DTV_STAT_HAS_CARRIER) ? "CARRIER" : "-", (status & DTV_STAT_HAS_VITERBI) ? "VITERBI" : "-", (status & DTV_STAT_HAS_SYNC) ? "SYNC" : "-", deviceP->CardIndex()));
-     }
-
-  return NULL;
-}
-
-double getSignal(cDevice *deviceP)
-{
-  double strength;
-  int valid = DTV_STAT_VALID_NONE;
-
-  if (deviceP && deviceP->SignalStats(valid, &strength, NULL, NULL, NULL, NULL, NULL)) {
-     if (valid & DTV_STAT_VALID_STRENGTH)
-        return strength;
-     }
-
-  return 0;
-}
-
-double getCNR(cDevice *deviceP)
-{
-  double cnr;
-  int valid = DTV_STAT_VALID_NONE;
-
-  if (deviceP && deviceP->SignalStats(valid, NULL, &cnr, NULL, NULL, NULL, NULL)) {
-     if (valid & DTV_STAT_VALID_CNR)
-        return cnr;
-     }
-
-  return 0;
-}
-
-double getBER(cDevice *deviceP)
-{
-  double ber;
-  int valid = DTV_STAT_VALID_NONE;
-
-  if (deviceP && deviceP->SignalStats(valid, NULL, NULL, NULL, &ber, NULL, NULL)) {
-     if (valid & DTV_STAT_VALID_BERPOST)
-        return ber;
-     }
-
-  return 0;
-}
-
-double getPER(cDevice *deviceP)
-{
-  double per;
-  int valid = DTV_STAT_VALID_NONE;
-
-  if (deviceP && deviceP->SignalStats(valid, NULL, NULL, NULL, NULL, &per, NULL)) {
-     if (valid & DTV_STAT_VALID_PER)
-        return per;
-     }
-
-  return 0;
-}
-
-cString getSignalStrength(double strengthP)
-{
-  switch (FemonConfig.GetSignalUnit()) {
-    case eFemonSignalUnitdBm:  return cString::sprintf("%.2f %s", strengthP, tr("dBm"));
-    case eFemonSignalUnitdBuV: return cString::sprintf("%.2f %s", strengthP + (120 - 11.25), tr("dBuV"));
-    case eFemonSignalUnitdBV:  return cString::sprintf("%.2f %s", strengthP - 11.25, tr("dBV"));
-    default:                   break;
-    }
-  return cString::sprintf("---");
-}
-
-cString getApids(const cChannel *channelP)
-{
-  int value = 0;
-  cString apids = cString::sprintf("%d", channelP->Apid(value));
-  while (channelP->Apid(++value) && (value < MAXAPIDS))
-    apids = cString::sprintf("%s, %d", *apids, channelP->Apid(value));
-  return apids;
-}
-
-cString getDpids(const cChannel *channelP)
-{
-  int value = 0;
-  cString dpids = cString::sprintf("%d", channelP->Dpid(value));
-  while (channelP->Dpid(++value) && (value < MAXDPIDS))
-    dpids = cString::sprintf("%s, %d", *dpids, channelP->Dpid(value));
-  return dpids;
-}
-
-cString getSpids(const cChannel *channelP)
-{
-  int value = 0;
-  cString spids = cString::sprintf("%d", channelP->Spid(value));
-  while (channelP->Spid(++value) && (value < MAXSPIDS))
-    spids = cString::sprintf("%s, %d", *spids, channelP->Spid(value));
-  return spids;
-}
-
-cString getCAids(const cChannel *channelP)
-{
-  int value = 0;
-  cString caids = cString::sprintf("%s", *getCA(channelP->Ca(value)));
-  while (channelP->Ca(++value) && (value < MAXCAIDS))
-    caids = cString::sprintf("%s, %s", *caids, *getCA(channelP->Ca(value)));
-  return caids;
-}
-
-cString getVideoStream(int value)
-{
-  if (value != 0)
-     return cString::sprintf("#%d", value);
-  return cString::sprintf("---");
-}
-
-cString getAudioStream(int valueP, const cChannel *channelP)
-{
-  int pid = 0;
-  if (IS_AUDIO_TRACK(valueP))
-     pid = int(valueP - ttAudioFirst);
-  if (channelP && channelP->Apid(pid)) {
-     if (channelP->Alang(pid))
-        return cString::sprintf("#%d (%s)", channelP->Apid(pid), channelP->Alang(pid));
-     else
-        return cString::sprintf("#%d", channelP->Apid(pid));
-     }
-  return cString::sprintf("---");
-}
-
-cString getAC3Stream(int valueP, const cChannel *channelP)
-{
-  int pid = 0;
-  if (IS_DOLBY_TRACK(valueP))
-     pid = int(valueP - ttDolbyFirst);
-  if (channelP && channelP->Dpid(pid)) {
-     if (channelP->Dlang(pid))
-        return cString::sprintf("#%d (%s)", channelP->Dpid(pid), channelP->Dlang(pid));
-     else
-        return cString::sprintf("#%d", channelP->Dpid(pid));
-     }
-  return cString::sprintf("---");
-}
-
-cString getVideoCodec(int valueP)
-{
-  switch (valueP) {
-    case VIDEO_CODEC_MPEG2: return cString::sprintf("%s", tr("MPEG-2"));
-    case VIDEO_CODEC_H264:  return cString::sprintf("%s", tr("H.264"));
-    case VIDEO_CODEC_H265:  return cString::sprintf("%s", tr("H.265"));
-    default:                break;
-    }
-  return cString::sprintf("---");
-}
-
-cString getAudioCodec(int valueP)
-{
-  switch (valueP) {
-    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 valueP)
-{
-  switch (valueP) {
-    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 valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, CoderateValues));
-}
-
-cString getTransmission(int valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, TransmissionValues));
-}
-
-cString getBandwidth(int valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, BandwidthValues));
-}
-
-cString getInversion(int valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, InversionValues));
-}
-
-cString getHierarchy(int valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, HierarchyValues));
-}
-
-cString getGuard(int valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, GuardValues));
-}
-
-cString getModulation(int valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, ModulationValues));
-}
-
-cString getTerrestrialSystem(int valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, SystemValuesTerr));
-}
-
-cString getSatelliteSystem(int valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, SystemValuesSat));
-}
-
-cString getRollOff(int valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, RollOffValues));
-}
-
-cString getPilot(int valueP)
-{
-  return cString::sprintf("%s", getUserString(valueP, PilotValues));
-}
-
-cString getResolution(int widthP, int heightP, int scanP)
-{
-  if ((widthP > 0) && (heightP > 0)) {
-     switch (scanP) {
-       case VIDEO_SCAN_INTERLACED:  return cString::sprintf("%dx%d %s", widthP, heightP, tr("interlaced"));
-       case VIDEO_SCAN_PROGRESSIVE: return cString::sprintf("%dx%d %s", widthP, heightP, tr("progressive"));
-       default:                     return cString::sprintf("%dx%d",    widthP, heightP);
-       }
-     }
-  return cString::sprintf("---");
-}
-
-cString getAspectRatio(int valueP)
-{
-  switch (valueP) {
-    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("---");
-}
-
-cString getVideoFormat(int valueP)
-{
-  switch (valueP) {
-    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 valueP)
-{
-  if (valueP > 0)
-     return cString::sprintf("%.2f %s", valueP, tr("Hz"));
-  return cString::sprintf("---");
-}
-
-cString getAC3BitStreamMode(int valueP, int codingP)
-{
-  switch (valueP) {
-    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", (codingP == 1) ? tr("Voice Over (VO)") : tr("Karaoke"));
-    default:                          break;
-    }
-  return cString::sprintf("---");
-}
-
-cString getAC3AudioCodingMode(int valueP, int streamP)
-{
-  if (streamP != 7) {
-     switch (valueP) {
-       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("---");
-}
-
-cString getAC3CenterMixLevel(int valueP)
-{
-  switch (valueP) {
-    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("---");
-}
-
-cString getAC3SurroundMixLevel(int valueP)
-{
-  switch (valueP) {
-    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("---");
-}
-
-cString getAC3DolbySurroundMode(int valueP)
-{
-  switch (valueP) {
-    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("---");
-}
-
-cString getAC3DialogLevel(int valueP)
-{
-  if (valueP > 0)
-     return cString::sprintf("-%d %s", valueP, tr("dB"));
-  return cString::sprintf("---");
-}
-
-cString getFrequencyMHz(int valueP)
-{
-  double freq = valueP;
-  while (freq > 20000.0) freq /= 1000.0;
-  return cString::sprintf("%s %s", *dtoa(freq, "%lg"), tr("MHz"));
-}
-
-cString getAudioSamplingFreq(int valueP)
-{
-  switch (valueP) {
-    case AUDIO_SAMPLING_FREQUENCY_INVALID:  return cString::sprintf("---");
-    case AUDIO_SAMPLING_FREQUENCY_RESERVED: return cString::sprintf("%s", tr("reserved"));
-    default:                                break;
-    }
-  return cString::sprintf("%d %s", valueP, tr("Hz"));
-}
-
-cString getAudioBitrate(double valueP, double streamP)
-{
-  switch ((int)streamP) {
-    case AUDIO_BITRATE_INVALID:  return cString::sprintf("---");
-    case AUDIO_BITRATE_RESERVED: return cString::sprintf("%s (%s)", tr("reserved"), *getBitrateKbits(valueP));
-    case AUDIO_BITRATE_FREE:     return cString::sprintf("%s (%s)", tr("free"), *getBitrateKbits(valueP));
-    default:                     break;
-    }
-  return cString::sprintf("%s (%s)", *getBitrateKbits(streamP), *getBitrateKbits(valueP));
-}
-
-cString getVideoBitrate(double valueP, double streamP)
-{
-  return cString::sprintf("%s (%s)", *getBitrateMbits(streamP), *getBitrateMbits(valueP));
-}
-
-cString getBitrateMbits(double valueP)
-{
-  if (valueP > 0)
-     return cString::sprintf("%.2f %s", valueP / 1000000.0, tr("Mbit/s"));
-  return cString::sprintf("---");
-}
-
-cString getBitrateKbits(double valueP)
-{
-  if (valueP > 0)
-     return cString::sprintf("%.0f %s", valueP / 1000.0, tr("kbit/s"));
-  return cString::sprintf("---");
-}
-
-// --- cFemonBitStream -------------------------------------------------------
-
-uint32_t cFemonBitStream::GetUeGolomb()
-{
-  int n = 0;
-
-  while (!GetBit() && (n < 32))
-    n++;
-
-  return (n ? ((1 << n) - 1) + GetBits(n) : 0);
-}
-
-int32_t cFemonBitStream::GetSeGolomb()
-{
-  uint32_t r = GetUeGolomb() + 1;
-
-  return ((r & 1) ? -(r >> 1) : (r >> 1));
-}
-
-void cFemonBitStream::SkipGolomb()
-{
-  int n = 0;
-
-  while (!GetBit() && (n < 32))
-    n++;
-
-  SkipBits(n);
-}
--- a/tools.h
+++ b/tools.h
@ -1,81 +0,0 @@
-/*
- * tools.h: Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMON_COMMON_H
-#define __FEMON_COMMON_H
-
-#include <stdint.h>
-#include <vdr/channels.h>
-#include <vdr/dvbdevice.h>
-#include <vdr/remux.h>
-#include <vdr/tools.h>
-
-#define ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
-
-#define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"
-
-#define SATIP_DEVICE "SAT>IP"
-
-cString getFrontendInfo(cDevice *deviceP);
-cString getFrontendName(cDevice *deviceP);
-cString getFrontendStatus(cDevice *deviceP);
-
-double getCNR(cDevice *deviceP);
-double getSignal(cDevice *deviceP);
-double getBER(cDevice *deviceP);
-double getPER(cDevice *deviceP);
-
-cString getSignalStrength(double strengthP);
-cString getApids(const cChannel *channelP);
-cString getDpids(const cChannel *channelP);
-cString getSpids(const cChannel *channelP);
-cString getCAids(const cChannel *channelP);
-cString getVideoStream(int valueP);
-cString getVideoCodec(int valueP);
-cString getAudioStream(int valueP, const cChannel *channelP);
-cString getAudioCodec(int valueP);
-cString getAudioChannelMode(int valueP);
-cString getCoderate(int valueP);
-cString getTransmission(int valueP);
-cString getBandwidth(int valueP);
-cString getInversion(int valueP);
-cString getHierarchy(int valueP);
-cString getGuard(int valueP);
-cString getModulation(int valueP);
-cString getTerrestrialSystem(int valueP);
-cString getSatelliteSystem(int valueP);
-cString getRollOff(int valueP);
-cString getPilot(int valueP);
-cString getResolution(int widthP, int heightP, int scanP);
-cString getAspectRatio(int valueP);
-cString getVideoFormat(int valueP);
-cString getFrameRate(double valueP);
-cString getAC3Stream(int valueP, const cChannel *channelP);
-cString getAC3BitStreamMode(int valueP, int codingP);
-cString getAC3AudioCodingMode(int valueP, int streamP);
-cString getAC3CenterMixLevel(int valueP);
-cString getAC3SurroundMixLevel(int valueP);
-cString getAC3DolbySurroundMode(int valueP);
-cString getAC3DialogLevel(int valueP);
-cString getFrequencyMHz(int valueP);
-cString getAudioSamplingFreq(int valueP);
-cString getAudioBitrate(double valueP, double streamP);
-cString getVideoBitrate(double valueP, double streamP);
-cString getBitrateMbits(double valueP);
-cString getBitrateKbits(double valueP);
-
-class cFemonBitStream : public cBitStream {
-public:
-  cFemonBitStream(const uint8_t *dataP, const int lengthP) : cBitStream(dataP, lengthP) {}
-  uint32_t       GetUeGolomb();
-  int32_t        GetSeGolomb();
-  void           SkipGolomb();
-  void           SkipUeGolomb() { SkipGolomb(); }
-  void           SkipSeGolomb() { SkipGolomb(); }
-  };
-
-#endif // __FEMON_COMMON_H