Updated the APIVERSNUM requirement.

Added missing lithuanian translations

HISTORY

@@ -1,4 +1,3 @@
-
 ===================================
 VDR Plugin 'femon' Revision History
 ===================================
@@ -66,6 +65,7 @@ VDR Plugin 'femon' Revision History
 
 -  Backported changes and fixes from version 0.1.6.
 
+
 ===================================
 VDR Plugin 'femon' Revision History
 ===================================
@@ -343,6 +343,7 @@ VDR Plugin 'femon' Revision History
 
 - Backported from 1.7.2.
 
+
 ===================================
 VDR Plugin 'femon' Revision History
 ===================================
@@ -364,3 +365,157 @@ VDR Plugin 'femon' Revision History
 
 - Cleaned up compilation warnings.
 - Fixed font handling to be thread-safe.
+
+2009-08-29: Version 1.7.3
+
+- Removed OSD offset and height options.
+- Added PES assembler.
+- Added bitstream parsers for all codecs.
+
+2009-09-04: Version 1.7.4
+
+- Fixed H.264 bitstream parser.
+- Added a mutex to receiver class.
+- Added 1080/720/576/480 format symbols into status window.
+
+2009-10-01: Version 1.7.5
+
+- Changed H.264 parser to show display aspect ratio.
+- Removed error logging from unimplemented ioctl functions.
+- Removed bitstream parsing from Receive() method.
+- Added Chinese translation (Thanks to NanFeng).
+
+2010-02-01: Version 1.7.6
+
+- Updated for vdr-1.7.12.
+- Updated Estonian translation (Thanks to Arthur Konovalov).
+- Added Lithuanian translation (Thanks to Valdemaras Pipiras).
+
+2010-03-05: Version 1.7.7
+
+- Updated for vdr-1.7.13.
+- Added a setup option to downscale the OSD size.
+- Updated Estonian translation (Thanks to Arthur Konovalov).
+
+2010-06-23: Version 1.7.8
+
+- Fixed device switching.
+- Added preliminary support for LATM.
+- Updated Italian translation (Thanks to Diego Pierotto).
+- Fixed a crash in femon service (Thanks to Wolfgang Astleitner).
+
+2010-12-27: Version 1.7.9
+
+- Updated for vdr-1.7.16.
+- Added Makefile depencency for objects.
+- Fixed detection of replaying.
+- Added support for LDFLAGS.
+
+2011-05-15: Version 1.7.10
+
+- Updated for vdr-1.7.18.
+- Added scaling for symbols.
+
+2011-12-04: Version 1.7.11
+
+- Updated for vdr-1.7.22: New API functions for signal strength
+  and quality used to provide information for the OSD.
+- Added cppcheck target into Makefile.
+- Refactored bitstream code.
+
+2012-01-15: Version 1.7.12
+
+- Updated for vdr-1.7.23.
+- Updated SVDRP interface.
+- Added Hungarian translation (Thanks to Fuley Istvan).
+
+2012-02-05: Version 1.7.13
+
+- Added initial support for PVRINPUT devices (Thanks to Winfried Köhler).
+- Added initial support for IPTV devices.
+
+2012-03-10: Version 1.7.14
+
+- Updated for vdr-1.7.26.
+
+2012-03-12: Version 1.7.15
+
+- Cleaned up compilation warnings.
+- Fixed channel switching.
+
+2012-03-25: Version 1.7.16
+
+- Updated for vdr-1.7.27.
+- Cleaned up compilation warnings again.
+
+2012-04-02: Version 1.7.17
+
+- Added the dynamite compatibility patch (Thanks to Lars Hanisch).
+- Silenced error log messages when accessing pseudo devices.
+- Added a new theme: PearlHD (Thanks to Taipan @ VDRPortal).
+- Added the transponder info window support for IPTV devices.
+
+2013-02-10: Version 1.7.18
+
+- Updated for vdr-1.7.37.
+- Modified how the receiver is detached.
+- Added Ukrainian translation (Thanks to Yarema aka Knedlyk).
+
+2013-03-10: Version 1.7.19
+
+- 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.

Makefile

@@ -2,118 +2,136 @@
 # Makefile for Frontend Status Monitor plugin
 #
 
-# Debugging on/off 
+# 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.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = femon
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Wextra -Wswitch-default -Wfloat-equal -Wundef -Wpointer-arith -Wconversion -Wcast-align -Wredundant-decls -Wno-unused-parameter -Woverloaded-virtual -Wno-parentheses
+GITTAG  = $(shell git describe --always 2>/dev/null)
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+# 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))
+LIBDIR = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
+#
+TMPDIR ?= /tmp
+
+### The compiler options:
+
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
+
+### The version number of VDR's plugin API:
+
+APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(VDRDIR)/Make.config
-
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+-include $(PLGCFG)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ifdef FEMON_DEBUG
 DEFINES += -DDEBUG
 endif
 
+ifneq ($(strip $(GITTAG)),)
+DEFINES += -DGITVERSION='"-GIT-$(GITTAG)"'
+endif
+
 .PHONY: all all-redirect
 all-redirect: all
 
 ### The object files (add further files here):
 
-OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femontools.o femonmpeg.o femonac3.o femonaac.o femonh264.o femonsymbol.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:
 
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE) i18n
 
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
 ### Internationalization (I18N):
 
 PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $^
+	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)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	install -D -m644 $< $@
 
 .PHONY: i18n
-i18n: $(I18Nmsgs) $(I18Npot)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+$(SOFILE): $(OBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 ifndef FEMON_DEBUG
 	@$(STRIP) $@
 endif
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-dist: clean
+install-lib: $(SOFILE)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib install-i18n
+
+dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
@@ -122,4 +140,9 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+
+.PHONY: cppcheck
+cppcheck:
+	@cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)

README

@@ -26,24 +26,21 @@ transponder and stream information are also available in advanced display modes.
 
 The plugin is based on a neat console frontend status monitor application
 called 'femon' by Johannes Stezenbach (see DVB-apps/szap/femon.c for further
-information). The bitrate calculation trick originates from the 'dvbstream'
-application by Dave Chapman and the stream information routines are taken from
-the 'libdvb' library by Metzler Brothers. The H.264 parsing routines are taken
-from vdr-xineliboutput plugin by Petri Hintukainen.
+information).
 
 Terminology:
 
 --------------------------------------------------------------
 |## Channel Name ################### [SVDRP][AR][VF][A/DD][D]|
-|[=====Signal Strength in % ==============|=================]|
-|[=====Signal-to-Noise Ratio in % ========|=================]|
+|[=====Signal Strength ===================|=================]|
+|[=====Signal Quality ================|=====================]|
 | 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
-SNR     - Signal-to-noise ratio
+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
@@ -74,13 +71,8 @@ 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
-ln -s femon-X.Y.Z femon
-cd /put/your/path/here/VDR
-make
-make plugins
-./vdr -P femon
+make -C femon-X.Y.Z install
 
 Client-server architecture:
 
@@ -100,9 +92,6 @@ the local device number.
 
 Notes:
 
-- The plugin supports only those DVB cards with _one_ frontend, because I
-  haven't yet figured howto do it without patching the VDR core.
-
 - Disable the stream analyze to speed up heavy zapping sessions.
 
 - The signal strength and signal-to-noise ratio values are comparable only
@@ -110,9 +99,8 @@ Notes:
   specifications those values cannot be calculated into any real units.
 
 - If the OSD isn't visible, you've configured the OSD height too big or too
-  small. Please, try to adjust the variable on the setup page before writing
-  any bug reports. NTSC users should use a shrinked default OSD height by
-  modifying VDR's setup.conf: femon.OSDHeight = 420
+  small. Please, try to adjust the variable on the OSD setup page before
+  writing any bug reports.
 
 - If the SVDRP service is used: femon won't notice if the server is tuned
   to a different channel and tuning the channel on the server might annoy

femon.c

@@ -7,18 +7,22 @@
 
 #include <vdr/menu.h>
 #include <vdr/remote.h>
-#include <vdr/menu.h>
+#include <vdr/player.h>
 #include "femoncfg.h"
 #include "femonreceiver.h"
 #include "femonosd.h"
 #include "femonservice.h"
 #include "femontools.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10700
-#error "VDR-1.7.0 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 20200
+#error "VDR-2.2.0 API version or greater is required!"
 #endif
 
-static const char VERSION[]       = "1.7.2";
+#ifndef GITVERSION
+#define GITVERSION ""
+#endif
+
+static const char VERSION[]       = "2.2.0" GITVERSION;
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 
@@ -50,13 +54,13 @@ cPluginFemon::cPluginFemon()
   // Initialize any member variables here.
   // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
 }
 
 cPluginFemon::~cPluginFemon()
 {
   // Clean up after yourself!
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
 }
 
 const char *cPluginFemon::CommandLineHelp(void)
@@ -96,8 +100,8 @@ void cPluginFemon::Housekeeping(void)
 cOsdObject *cPluginFemon::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  if (cReplayControl::NowReplaying() || (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);
@@ -110,10 +114,9 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)
   if      (!strcasecmp(Name, "HideMenu"))       femonConfig.hidemenu       = atoi(Value);
   else if (!strcasecmp(Name, "DisplayMode"))    femonConfig.displaymode    = atoi(Value);
   else if (!strcasecmp(Name, "Position"))       femonConfig.position       = atoi(Value);
-  else if (!strcasecmp(Name, "OSDHeight"))      femonConfig.osdheight      = atoi(Value);
-  else if (!strcasecmp(Name, "OSDOffset"))      femonConfig.osdoffset      = atoi(Value);
   else if (!strcasecmp(Name, "Skin"))           femonConfig.skin           = atoi(Value);
   else if (!strcasecmp(Name, "Theme"))          femonConfig.theme          = atoi(Value);
+  else if (!strcasecmp(Name, "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);
@@ -133,14 +136,16 @@ bool cPluginFemon::Service(const char *Id, void *Data)
 {
   if (strcmp(Id,"FemonService-v1.0") == 0) {
      if (Data) {
-        FemonService_v1_0 *data = (FemonService_v1_0*)Data;
-        int ndx = cDevice::ActualDevice()->CardIndex();
-        data->fe_name = getFrontendName(ndx);
-        data->fe_status = getFrontendStatus(ndx);
-        data->fe_snr = getSNR(ndx);
-        data->fe_signal = getSignal(ndx);
-        data->fe_ber = getBER(ndx);
-        data->fe_unc = getUNC(ndx);
+        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_snr = getSNR(dev);
+        data->fe_signal = getSignal(dev);
+        data->fe_ber = getBER(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;
@@ -152,7 +157,7 @@ bool cPluginFemon::Service(const char *Id, void *Data)
 }
 
 const char **cPluginFemon::SVDRPHelpPages(void)
-{ 
+{
   static const char *HelpPages[] = {
     "OPEN\n"
     "    Open femon plugin.",
@@ -162,26 +167,30 @@ const char **cPluginFemon::SVDRPHelpPages(void)
     "    Switch to next possible device.",
     "PREV\n"
     "    Switch to previous possible device.",
-    "INFO\n"
-    "    Print the current frontend information.",
-    "NAME\n"
-    "    Print the current frontend name.",
-    "STAT\n"
-    "    Print the current frontend status.",
-    "SGNL\n"
-    "    Print the current signal strength.",
-    "SNRA\n"
-    "    Print the current signal-to-noise ratio.",
-    "BERA\n"
-    "    Print the current bit error rate.",
-    "UNCB\n"
-    "    Print the current uncorrected blocks rate.",
+    "INFO <card index>\n"
+    "    Print the frontend information.",
+    "NAME <card index>\n"
+    "    Print the frontend name.",
+    "STAT <card index>\n"
+    "    Print the frontend status.",
+    "STRG <card index>\n"
+    "    Print the signal strength.",
+    "QUAL <card index>\n"
+    "    Print the signal quality.",
+    "SGNL <card index>\n"
+    "    Print the signal strength from driver.",
+    "SNRA <card index>\n"
+    "    Print the signal-to-noise ratio from driver.",
+    "BERA <card index>\n"
+    "    Print the bit error rate.",
+    "UNCB <card index>\n"
+    "    Print the uncorrected blocks rate.",
     "VIBR\n"
-    "    Print the actual device and current video bitrate [Mbit/s].",
+    "    Print the current video bitrate [Mbit/s].",
     "AUBR\n"
-    "    Print the actual device and current audio bitrate [kbit/s].",
+    "    Print the current audio bitrate [kbit/s].",
     "DDBR\n"
-    "    Print the actual device and current dolby bitrate [kbit/s].",
+    "    Print the current dolby bitrate [kbit/s].",
     NULL
     };
   return HelpPages;
@@ -189,13 +198,19 @@ const char **cPluginFemon::SVDRPHelpPages(void)
 
 cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
 {
+  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) {
+     ReplyCode = 550; // Requested action not taken
+     return cString("Cannot open femon plugin while replaying");
+     }
   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("femon");
+        cRemote::CallPlugin(Name());
      return cString("Opening femon plugin");
      }
   else if (strcasecmp(Command, "QUIT") == 0) {
@@ -216,27 +231,33 @@ cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int
         return cString("Cannot switch device");
      }
   else if (strcasecmp(Command, "INFO") == 0) {
-     return getFrontendInfo(cDevice::ActualDevice()->CardIndex());
+     return getFrontendInfo(dev);
      }
   else if (strcasecmp(Command, "NAME") == 0) {
-     return getFrontendName(cDevice::ActualDevice()->CardIndex());
+     return getFrontendName(dev);
      }
   else if (strcasecmp(Command, "STAT") == 0) {
-     return getFrontendStatus(cDevice::ActualDevice()->CardIndex());
+     return getFrontendStatus(dev);
+     }
+  else if (strcasecmp(Command, "STRG") == 0) {
+     return cString::sprintf("%d on device #%d", dev->SignalStrength(), dev->CardIndex());
+     }
+  else if (strcasecmp(Command, "QUAL") == 0) {
+     return cString::sprintf("%d on device #%d", dev->SignalQuality(), dev->CardIndex());
      }
   else if (strcasecmp(Command, "SGNL") == 0) {
-     int value = getSignal(cDevice::ActualDevice()->CardIndex());
-     return cString::sprintf("%04X (%02d%%) on device #%d", value, value / 655, cDevice::ActualDevice()->CardIndex());
+     int value = getSignal(dev);
+     return cString::sprintf("%04X (%02d%%) on device #%d", value, value / 655, dev->CardIndex());
      }
   else if (strcasecmp(Command, "SNRA") == 0) {
-     int value = getSNR(cDevice::ActualDevice()->CardIndex());
-     return cString::sprintf("%04X (%02d%%) on device #%d", value, value / 655, cDevice::ActualDevice()->CardIndex());
+     int value = getSNR(dev);
+     return cString::sprintf("%04X (%02d%%) on device #%d", value, value / 655, dev->CardIndex());
      }
   else if (strcasecmp(Command, "BERA") == 0) {
-     return cString::sprintf("%08X on device #%d", getBER(cDevice::ActualDevice()->CardIndex()), cDevice::ActualDevice()->CardIndex());
+     return cString::sprintf("%08X on device #%d", getBER(dev), dev->CardIndex());
      }
   else if (strcasecmp(Command, "UNCB") == 0) {
-     return cString::sprintf("%08X on device #%d", getUNC(cDevice::ActualDevice()->CardIndex()), cDevice::ActualDevice()->CardIndex());
+     return cString::sprintf("%08X on device #%d", getUNC(dev), dev->CardIndex());
      }
   else if (strcasecmp(Command, "VIBR") == 0) {
      if (cFemonOsd::Instance())
@@ -276,7 +297,7 @@ public:
 
 cMenuFemonSetup::cMenuFemonSetup(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
   dispmodes[eFemonModeBasic]       = tr("basic");
   dispmodes[eFemonModeTransponder] = tr("transponder");
   dispmodes[eFemonModeStream]      = tr("stream");
@@ -294,8 +315,10 @@ cMenuFemonSetup::cMenuFemonSetup(void)
   themes[eFemonThemeEgalsTry]      = tr("EgalsTry");
   themes[eFemonThemeDuotone]       = tr("Duotone");
   themes[eFemonThemeSilverGreen]   = tr("SilverGreen");
+  themes[eFemonThemePearlHD]       = tr("PearlHD");
 
   data = femonConfig;
+  SetMenuCategory(mcSetupPlugins);
   Setup();
 }
 
@@ -321,11 +344,8 @@ void cMenuFemonSetup::Setup(void)
   Add(new cMenuEditBoolItem(tr("Position"), &data.position, trVDR("bottom"), trVDR("top")));
   help.Append(tr("Define the position of OSD."));
 
-  Add(new cMenuEditIntItem(trVDR("Setup.OSD$Height"), &data.osdheight, 400, 500));
-  help.Append(tr("Define the height of OSD."));
-
-  Add(new cMenuEditIntItem(tr("Horizontal offset"), &data.osdoffset, -50, 50));
-  help.Append(tr("Define the horizontal offset of OSD."));
+  Add(new 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."));
@@ -351,7 +371,7 @@ void cMenuFemonSetup::Setup(void)
      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"));
+     Add(new cMenuEditStrItem(tr("SVDRP service IP"), data.svdrpip, sizeof(data.svdrpip), ".1234567890"));
      help.Append(tr("Define the IP address of SVDRP service."));
      }
 
@@ -361,15 +381,14 @@ void cMenuFemonSetup::Setup(void)
 
 void cMenuFemonSetup::Store(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
   femonConfig = data;
   SetupStore("HideMenu",       femonConfig.hidemenu);
   SetupStore("DisplayMode",    femonConfig.displaymode);
   SetupStore("Skin",           femonConfig.skin);
   SetupStore("Theme",          femonConfig.theme);
   SetupStore("Position",       femonConfig.position);
-  SetupStore("OSDHeight",      femonConfig.osdheight);
-  SetupStore("OSDOffset",      femonConfig.osdoffset);
+  SetupStore("Downscale",      femonConfig.downscale);
   SetupStore("RedLimit",       femonConfig.redlimit);
   SetupStore("GreenLimit",     femonConfig.greenlimit);
   SetupStore("UpdateInterval", femonConfig.updateinterval);

femonaac.c

@@ -10,15 +10,25 @@
 
 #define IS_HEAAC_AUDIO(buf) (((buf)[0] == 0xFF) && (((buf)[1] & 0xF6) == 0xF0))
 
-static unsigned int samplerates[16] =
+int cFemonAAC::s_Samplerates[16] =
 {
   96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, -1, -1, -1, -1
 };
 
-bool getAACAudioInfo(uint8_t *buf, int len, audio_info_t *info)
+cFemonAAC::cFemonAAC(cFemonAudioIf *audiohandler)
+: m_AudioHandler(audiohandler)
 {
-  // HE-AAC audio detection, search for syncword with layer set to 0
-  if ((len < 4) || !IS_HEAAC_AUDIO(buf))
+}
+
+cFemonAAC::~cFemonAAC()
+{
+}
+
+bool cFemonAAC::processAudio(const uint8_t *buf, int len)
+{
+  cFemonBitStream bs(buf, len * 8);
+
+  if (!m_AudioHandler)
      return false;
 
   /* ADTS Fixed Header:
@@ -35,41 +45,59 @@ bool getAACAudioInfo(uint8_t *buf, int len, audio_info_t *info)
    * emphasis                  2b only if ID == 0 (ie MPEG-4)
    */
 
-  int sampling_frequency_index = (buf[2] & 0x03C) >> 2;
-  int channel_configuration = ((buf[2] & 0x01) << 2) | ((buf[3] & 0xC0) >> 6);
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.SkipBits(8 * PesPayloadOffset(buf));
 
-  info->codec = AUDIO_CODEC_HEAAC;
-  info->bitrate = AUDIO_BITRATE_RESERVED;
+  // HE-AAC audio detection
+  if (bs.GetBits(12) != 0xFFF)                  // syncword
+     return false;
+
+  bs.SkipBit();                                 // id
+
+  // layer must be 0
+  if (bs.GetBits(2))                            // layer
+      return false;
+
+  bs.SkipBit();                                 // protection_absent
+  bs.SkipBits(2);                               // profile
+  int sampling_frequency_index = bs.GetBits(4); // sampling_frequency_index
+  bs.SkipBit();                                 // private pid
+  int channel_configuration = bs.GetBits(3);    // channel_configuration
+
+  m_AudioHandler->SetAudioCodec(AUDIO_CODEC_HEAAC);
+  m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
 
   switch (channel_configuration) {
     case 0:
-         info->channelMode = AUDIO_CHANNEL_MODE_STEREO;
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
          break;
 
     case 1:
-         info->channelMode = AUDIO_CHANNEL_MODE_JOINT_STEREO;
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
          break;
 
     case 2:
-         info->channelMode = AUDIO_CHANNEL_MODE_DUAL;
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
          break;
 
     case 3:
-         info->channelMode = AUDIO_CHANNEL_MODE_SINGLE;
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
          break;
 
     default:
-         info->channelMode = AUDIO_CHANNEL_MODE_INVALID;
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
          break;
   }
 
   switch (sampling_frequency_index) {
     case 0xC ... 0xF:
-         info->samplingFrequency = AUDIO_SAMPLING_FREQUENCY_RESERVED;
+         m_AudioHandler->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
          break;
 
     default:
-         info->samplingFrequency = samplerates[sampling_frequency_index];
+         m_AudioHandler->SetAudioSamplingFrequency(s_Samplerates[sampling_frequency_index]);
          break;
   }
 

femonaac.h

@@ -10,6 +10,17 @@
 
 #include "femonaudio.h"
 
-bool getAACAudioInfo(uint8_t *buf, int len, audio_info_t *info);
+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

femonac3.c

@@ -9,107 +9,85 @@
 #include "femontools.h"
 #include "femonac3.h"
 
-#define IS_AC3_DATA(buf) (((buf)[0] == 0x0b) && ((buf)[1] == 0x77))
-
-static unsigned int ac3_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
 };
 
-static unsigned int ac3_freq[4] =
+int cFemonAC3::s_Frequencies[4] =
 {
   480, 441, 320, 0
 };
 
-//static unsigned int ac3_frames[3][32] =
-//{
-//  {64, 80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768,  896,  1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-//  {69, 87,  104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835,  975,  1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-//  {96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672, 768, 960, 1152, 1344, 1536, 1728, 1920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-//};
-
-bool getAC3AudioInfo(uint8_t *buf, int len, ac3_info_t *info)
+int cFemonAC3::s_Frames[3][32] =
 {
-  if (!IS_AC3_DATA(buf) || (len < 8))
+  {64, 80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768,  896,  1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+  {69, 87,  104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835,  975,  1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+  {96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672, 768, 960, 1152, 1344, 1536, 1728, 1920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+};
+
+cFemonAC3::cFemonAC3(cFemonAC3If *audiohandler)
+: m_AudioHandler(audiohandler)
+{
+}
+
+cFemonAC3::~cFemonAC3()
+{
+}
+
+bool cFemonAC3::processAudio(const uint8_t *buf, int len)
+{
+  int fscod, frmsizcod, bsmod, acmod;
+  int centermixlevel = AUDIO_CENTER_MIX_LEVEL_INVALID;
+  int surroundmixlevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
+  int dolbysurroundmode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
+  cFemonBitStream bs(buf, len * 8);
+
+  if (!m_AudioHandler)
      return false;
 
-  uint8_t *data = buf + 2;
-  uint8_t frame = (uint8_t)(data[2] & 0x3f);
-  info->bitrate = 1000 * ac3_bitrates[frame >> 1];
-  uint8_t fr = (data[2] & 0xc0 ) >> 6;
-  //uint8_t sz = ac3_frames[fr][frame >> 1];
-  //if ((frame & 1) && (fr == 1))
-  //   sz++;
-  //sz <<= 1;
-  info->samplingFrequency = 100 * ac3_freq[fr];
-  info->bitstreamMode = (data[3] & 7);
-  int acm = (data[4] & 0xE0) >> 5;
-  info->audioCodingMode = acm;
-  if ((acm & 0x01) && (acm != 0x01)) {
-     // 3 front channels
-     info->centerMixLevel = (data[4] & 0x18) >> 3;
-     if (acm & 0x04) {
-        // a surround channel exists
-        info->surroundMixLevel = (data[4] & 0x06) >> 1;
-        if (acm == 0x02) {
-           // if in 2/0 mode
-           info->dolbySurroundMode = ((data[4] & 0x01) << 1) | ((data[5] & 0x80) >> 7);
-           info->lfe = (data[5] & 0x40) >> 6;
-           info->dialogLevel = (data[5] & 0x3e) >> 1;
-           }
-        else {
-           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
-           info->lfe = (data[4] & 0x01);
-           info->dialogLevel = (data[5] & 0xF8) >> 3;
-           }
-        }
-     else {
-        info->surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
-        if (acm == 0x02) {
-           // if in 2/0 mode
-            info->dolbySurroundMode = (data[4] & 0x06) >> 1;
-            info->lfe = (data[4] & 0x01);
-            info->dialogLevel = (data[5] & 0xF8) >> 3;
-           }
-        else {
-           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
-           info->lfe = (data[4] & 0x04) >> 2;
-           info->dialogLevel = (data[4] & 0x03) << 3 | ((data[5] & 0xE0) >> 5);
-           }
-        }
-     }
-  else {
-     info->centerMixLevel = AUDIO_CENTER_MIX_LEVEL_INVALID;
-     if (acm & 0x04) {
-        // a surround channel exists
-        info->surroundMixLevel = (data[4] & 0x18) >> 3;
-        if (acm == 0x02) {
-           // if in 2/0 mode
-           info->dolbySurroundMode = (data[4] & 0x06) >> 1;
-           info->lfe = (data[4] & 0x01);
-           info->dialogLevel = (data[5] & 0xF8) >> 3;
-           }
-        else {
-           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
-           info->lfe = (data[4] & 0x04) >> 2;
-           info->dialogLevel = (data[4] & 0x03) << 3 | ((data[5] & 0xE0) >> 5);
-           }
-        }
-     else {
-        info->surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
-        if (acm == 0x02) {
-           // if in 2/0 mode
-           info->dolbySurroundMode = (data[4] & 0x18) >> 3;
-           info->lfe = (data[4] & 0x04) >> 2;
-           info->dialogLevel = (data[4] & 0x03) << 3 | ((data[5] & 0xE0) >> 5);
-           }
-        else {
-           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
-           info->lfe = (data[4] & 0x10) >> 4;
-           info->dialogLevel = ((data[4] & 0x0F) << 1) | ((data[5] & 0x80) >> 7);
-           }
-        }
-     }
-     
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.SkipBits(8 * PesPayloadOffset(buf));
+
+  // http://rmworkshop.com/dvd_info/related_info/ac3hdr.htm
+
+  // AC3 audio detection
+  if (bs.GetBits(16) != 0x0B77)     // syncword
+     return false;
+
+  bs.SkipBits(16);                  // CRC1
+
+  fscod = bs.GetBits(2);            // sampling rate values
+  frmsizcod = bs.GetBits(6);        // frame size code
+
+  bs.SkipBits(5);                   // bitstream id
+  bsmod = bs.GetBits(3);            // bitstream mode
+  acmod = bs.GetBits(3);            // audio coding mode
+
+  // 3 front channels
+  if ((acmod & 0x01) && (acmod != 0x01))
+     centermixlevel = bs.GetBits(2);
+
+  // if a surround channel exists
+  if (acmod & 0x04)
+     surroundmixlevel = bs.GetBits(2);
+
+  // if in 2/0 mode
+  if (acmod == 0x02)
+      dolbysurroundmode = bs.GetBits(2);
+
+  m_AudioHandler->SetAC3Bitrate(1000 * s_Bitrates[frmsizcod >> 1]);
+  m_AudioHandler->SetAC3SamplingFrequency(100 * s_Frequencies[fscod]);
+  m_AudioHandler->SetAC3Bitstream(bsmod);
+  m_AudioHandler->SetAC3AudioCoding(acmod);
+  m_AudioHandler->SetAC3CenterMix(centermixlevel);
+  m_AudioHandler->SetAC3SurroundMix(surroundmixlevel);
+  m_AudioHandler->SetAC3DolbySurround(dolbysurroundmode);
+
+  m_AudioHandler->SetAC3LFE(bs.GetBit());       // low frequency effects on
+  m_AudioHandler->SetAC3Dialog(bs.GetBits(5));  // dialog normalization
+
   return true;
 }

femonac3.h

@@ -10,6 +10,19 @@
 
 #include "femonaudio.h"
 
-bool getAC3AudioInfo(uint8_t *buf, int len, ac3_info_t *info);
+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

femonaudio.h

@@ -17,7 +17,8 @@ enum eAudioCodec {
   AUDIO_CODEC_MPEG2_I,
   AUDIO_CODEC_MPEG2_II,
   AUDIO_CODEC_MPEG2_III,
-  AUDIO_CODEC_HEAAC
+  AUDIO_CODEC_HEAAC,
+  AUDIO_CODEC_LATM
   };
 
 enum eAudioChannelMode {
@@ -89,7 +90,7 @@ enum eAudioCodingMode {
 
 typedef struct audio_info {
   eAudioCodec codec;             // enum
-  double      bitrate;           // kbit/s or eAudioBitrate
+  double      bitrate;           // bit/s or eAudioBitrate
   int         samplingFrequency; // Hz or eAudioSamplingFrequency
   int         channelMode;       // eAudioChannelMode
 } audio_info_t;
@@ -106,4 +107,44 @@ typedef struct ac3_info {
   bool        lfe;               // boolean
 } ac3_info_t;
 
+class cFemonAudioIf {
+public:
+  cFemonAudioIf() {}
+  virtual ~cFemonAudioIf() {}
+
+  // enum
+  virtual void SetAudioCodec(eAudioCodec codec) = 0;
+  // kbit/s or eAudioBitrate
+  virtual void SetAudioBitrate(double bitrate) = 0;
+  // Hz or eAudioSamplingFrequency
+  virtual void SetAudioSamplingFrequency(int sampling) = 0;
+  // eAudioChannelMode
+  virtual void SetAudioChannel(eAudioChannelMode mode) = 0;
+  };
+
+class cFemonAC3If {
+public:
+  cFemonAC3If() {}
+  virtual ~cFemonAC3If() {}
+
+  // bit/s or eAudioBitrate
+  virtual void SetAC3Bitrate(int bitrate) = 0;
+  // Hz or eAudioSamplingFrequency
+  virtual void SetAC3SamplingFrequency(int sampling) = 0;
+  // 0..7 or eAudioBitstreamMode
+  virtual void SetAC3Bitstream(int mode) = 0;
+  // 0..7 or eAudioCodingMode
+  virtual void SetAC3AudioCoding(int mode) = 0;
+  // eAudioDolbySurroundMode
+  virtual void SetAC3DolbySurround(int mode) = 0;
+  // eAudioCenterMixLevel
+  virtual void SetAC3CenterMix(int level) = 0;
+  // eAudioSurroundMixLevel
+  virtual void SetAC3SurroundMix(int level) = 0;
+  // -dB
+  virtual void SetAC3Dialog(int level) = 0;
+  // boolean
+  virtual void SetAC3LFE(bool onoff) = 0;
+  };
+
 #endif //__FEMONAUDIO_H

femoncfg.c

@@ -17,15 +17,14 @@ cFemonConfig::cFemonConfig(void)
   skin           = 0;
   theme          = 0;
   position       = 1;
+  downscale      = 0;
   redlimit       = 33;
   greenlimit     = 66;
   updateinterval = 5;
   analyzestream  = 1;
   calcinterval   = 20;
-  osdheight      = 480;
-  osdoffset      = 0;
   usesvdrp       = 0;
-  svdrpport      = 2001;
+  svdrpport      = 6419;
   strncpy(svdrpip, "0.0.0.0", sizeof(svdrpip));
 }
 
@@ -139,4 +138,16 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
     0xFFCE7B00, // clrYellow
     0xFF336600, // clrGreen
   },
+  {
+    // eFemonThemePearlHD
+    4,          // bpp
+    0x90000000, // clrBackground
+    0xCC000000, // clrTitleBackground
+    0xFFBEBEBE, // clrTitleText
+    0xFF4E78B1, // clrActiveText
+    0xFFBEBEBE, // clrInactiveText
+    0xAAFF0000, // clrRed
+    0xAAF8F800, // clrYellow
+    0x6000ff00, // clrGreen
+  },
 };

femoncfg.h

@@ -28,13 +28,12 @@ public:
   int skin;
   int theme;
   int position;
+  int downscale;
   int redlimit;
   int greenlimit;
   int updateinterval;
   int analyzestream;
   int calcinterval;
-  int osdheight;
-  int osdoffset;
   int usesvdrp;
   int svdrpport;
   char svdrpip[MaxSvdrpIp + 1]; // must end with additional null
@@ -60,20 +59,21 @@ enum eFemonThemes
   eFemonThemeEgalsTry,
   eFemonThemeDuotone,
   eFemonThemeSilverGreen,
+  eFemonThemePearlHD,
   eFemonThemeMaxNumber
 };
 
 struct cFemonTheme
 {
   int bpp;
-  int clrBackground;
-  int clrTitleBackground;
-  int clrTitleText;
-  int clrActiveText;
-  int clrInactiveText;
-  int clrRed;
-  int clrYellow;
-  int clrGreen;
+  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];

femonh264.h

@@ -10,6 +10,55 @@
 
 #include "femonvideo.h"
 
-bool getH264VideoInfo(uint8_t *buf, int len, video_info_t *info);
+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

femonlatm.c

@@ -0,0 +1,112 @@
+/*
+ * Frontend Status Monitor plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#include "femontools.h"
+#include "femonlatm.h"
+
+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::s_Samplerates[4] =
+{
+  22050, 24000, 16000, -1
+};
+
+cFemonLATM::cFemonLATM(cFemonAudioIf *audiohandler)
+: m_AudioHandler(audiohandler)
+{
+}
+
+cFemonLATM::~cFemonLATM()
+{
+}
+
+bool cFemonLATM::processAudio(const uint8_t *buf, int len)
+{
+  cFemonBitStream bs(buf, len * 8);
+
+  if (!m_AudioHandler)
+     return false;
+
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.SkipBits(8 * PesPayloadOffset(buf));
+
+  // MPEG audio detection
+  if (bs.GetBits(12) != 0x56E)              // syncword
+     return false;
+
+  m_AudioHandler->SetAudioCodec(AUDIO_CODEC_LATM);
+
+  if (bs.GetBit() == 0)                     // id: MPEG-1=1, extension to lower sampling frequencies=0
+     return true;                           // @todo: lower sampling frequencies support
+  int layer = 3 - bs.GetBits(2);            // layer: I=11, II=10, III=01
+  bs.SkipBit();                             // protection bit
+  int bit_rate_index = bs.GetBits(4);       // bitrate index
+  int sampling_frequency = bs.GetBits(2);   // sampling frequency
+  bs.SkipBit();                             // padding bit
+  bs.SkipBit();                             // private pid
+  int mode = bs.GetBits(2);                 // mode
+
+  switch (mode) {
+    case 0:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
+         break;
+
+    case 1:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
+         break;
+
+    case 2:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
+         break;
+
+    case 3:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
+         break;
+  }
+
+  if (layer == 3) {
+      m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
+  }
+  else {
+     switch (bit_rate_index) {
+       case 0:
+            m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
+            break;
+
+       case 0xF:
+            m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
+            break;
+
+       default:
+            m_AudioHandler->SetAudioBitrate(1000 * s_Bitrates[layer][bit_rate_index]);
+            break;
+     }
+  }
+
+  switch (sampling_frequency) {
+    case 3:
+         m_AudioHandler->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
+         break;
+
+    default:
+         m_AudioHandler->SetAudioSamplingFrequency(s_Samplerates[sampling_frequency]);
+         break;
+  }
+
+  return true;
+}

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

femonmpeg.c

@@ -8,10 +8,9 @@
 #include "femontools.h"
 #include "femonmpeg.h"
 
-#define IS_MPEG_AUDIO(buf)      (((buf)[0] == 0xFF) && ((buf)[1] & 0xF0))
-#define IS_SEQUENCE_HEADER(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == 0xB3))
+#define IS_EXTENSION_START(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == 0xB5))
 
-static unsigned int 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
@@ -25,160 +24,263 @@ static unsigned int bitrates[2][3][16] =
   }
 };
 
-static unsigned int samplerates[2][4] =
+int cFemonMPEG::s_Samplerates[2][4] =
 {
   {22050, 24000, 16000, -1}, // MPEG-2
   {44100, 48000, 32000, -1}  // MPEG-1
 };
 
-static eAudioCodec 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
 };
 
-bool getMPEGAudioInfo(uint8_t *buf, int len, audio_info_t *info)
+cFemonMPEG::cFemonMPEG(cFemonVideoIf *videohandler, cFemonAudioIf *audiohandler)
+: m_VideoHandler(videohandler),
+  m_AudioHandler(audiohandler)
 {
-  // MPEG audio detection, search for syncword
-  if ((len < 4) || !IS_MPEG_AUDIO(buf))
+}
+
+cFemonMPEG::~cFemonMPEG()
+{
+}
+
+bool cFemonMPEG::processAudio(const uint8_t *buf, int len)
+{
+  cFemonBitStream bs(buf, len * 8);
+
+  if (!m_AudioHandler)
      return false;
 
-  int mpegIndex = (buf[1] & 0x08) >> 3;        // MPEG-2=0, MPEG-1=1
-  int layerIndex = 3 - ((buf[1] & 0x06) >> 1); // I=11, II=10, III=01 
-  int bitrateIndex = (buf[2] & 0xF0) >> 4;
-  int frequency = (buf[2] & 0x0C) >> 2;
-  int channelMode = (buf[3] & 0xC0) >> 6;
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.SkipBits(8 * PesPayloadOffset(buf));
 
-  info->codec = formats[mpegIndex][layerIndex];
+  // MPEG audio detection
+  if (bs.GetBits(12) != 0xFFF)              // syncword
+     return false;
 
-  switch (channelMode) {
+  int id = bs.GetBit();                     // id: MPEG-2=0, MPEG-1=1
+  int layer = 3 - bs.GetBits(2);            // layer: I=11, II=10, III=01
+  bs.SkipBit();                             // protection bit
+  int bit_rate_index = bs.GetBits(4);       // bitrate index
+  int sampling_frequency = bs.GetBits(2);   // sampling frequency
+  bs.SkipBit();                             // padding bit
+  bs.SkipBit();                             // private pid
+  int mode = bs.GetBits(2);                 // mode
+
+  m_AudioHandler->SetAudioCodec(s_Formats[id][layer]);
+
+  switch (mode) {
     case 0:
-         info->channelMode = AUDIO_CHANNEL_MODE_STEREO;
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_STEREO);
          break;
-         
+
     case 1:
-         info->channelMode = AUDIO_CHANNEL_MODE_JOINT_STEREO;
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_JOINT_STEREO);
          break;
 
     case 2:
-         info->channelMode = AUDIO_CHANNEL_MODE_DUAL;
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_DUAL);
          break;
 
     case 3:
-         info->channelMode = AUDIO_CHANNEL_MODE_SINGLE;
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_SINGLE);
          break;
 
     default:
-         info->channelMode = AUDIO_CHANNEL_MODE_INVALID;
+         m_AudioHandler->SetAudioChannel(AUDIO_CHANNEL_MODE_INVALID);
          break;
   }
 
-  switch (bitrateIndex) {
+  switch (bit_rate_index) {
     case 0:
-         info->bitrate = AUDIO_BITRATE_FREE;
+         m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_FREE);
          break;
-         
+
     case 0xF:
-         info->bitrate = AUDIO_BITRATE_RESERVED;
+         m_AudioHandler->SetAudioBitrate(AUDIO_BITRATE_RESERVED);
          break;
 
     default:
-         info->bitrate = 1000 * bitrates[mpegIndex][layerIndex][bitrateIndex];
+         m_AudioHandler->SetAudioBitrate(1000 * s_Bitrates[id][layer][bit_rate_index]);
          break;
   }
-  
-  switch (frequency) {
+
+  switch (sampling_frequency) {
     case 3:
-         info->samplingFrequency = AUDIO_SAMPLING_FREQUENCY_RESERVED;
+         m_AudioHandler->SetAudioSamplingFrequency(AUDIO_SAMPLING_FREQUENCY_RESERVED);
          break;
 
     default:
-         info->samplingFrequency = samplerates[mpegIndex][frequency];
+         m_AudioHandler->SetAudioSamplingFrequency(s_Samplerates[id][sampling_frequency]);
          break;
   }
 
   return true;
 }
 
-bool getMPEGVideoInfo(uint8_t *buf, int len, video_info_t *info)
+bool cFemonMPEG::processVideo(const uint8_t *buf, int len)
 {
-  // MPEG-2 video detection, search for sequence header
-  if ((len < 7) || !IS_SEQUENCE_HEADER(buf))
+  cFemonBitStream bs(buf, len * 8);
+
+  if (!m_VideoHandler)
      return false;
 
-  // Parse header   
-  uint8_t *data = buf + 4;
-  info->codec = VIDEO_CODEC_MPEG2;
-  info->width = ((data[1] & 0xF0) >> 4) | (data[0] << 4);
-  info->height = ((data[1] & 0x0F) << 8) | (data[2]);
-  switch ((data[3] & 0xF0) >> 4) {
+  // skip PES header
+  if (!PesLongEnough(len))
+      return false;
+  bs.SkipBits(8 * PesPayloadOffset(buf));
+
+  // MPEG-2 video detection, search for start code
+  if (bs.GetBits(32) != 0x000001B3)         // sequence header
+     return false;
+
+  int scan = VIDEO_SCAN_UNKNOWN;
+  int format = VIDEO_FORMAT_UNKNOWN;
+  int aspect = VIDEO_ASPECT_RATIO_RESERVED;
+
+  int horizontal_size = bs.GetBits(12);     // horizontal size value
+  int vertical_size = bs.GetBits(12);       // vertical size value
+
+  switch (bs.GetBits(4)) {                  // aspect ratio information
     case 1:
-      info->aspectRatio = VIDEO_ASPECT_RATIO_1_1;
-      break;
+         aspect = VIDEO_ASPECT_RATIO_1_1;
+         break;
+
     case 2:
-      info->aspectRatio = VIDEO_ASPECT_RATIO_4_3;
-      break;
+         aspect = VIDEO_ASPECT_RATIO_4_3;
+         break;
+
     case 3:
-      info->aspectRatio = VIDEO_ASPECT_RATIO_16_9;
-      break;
+         aspect = VIDEO_ASPECT_RATIO_16_9;
+         break;
+
     case 4:
-      info->aspectRatio = VIDEO_ASPECT_RATIO_2_21_1;
-      break;
+         aspect = VIDEO_ASPECT_RATIO_2_21_1;
+         break;
+
     case 5 ... 15:
     default:
-      info->aspectRatio = VIDEO_ASPECT_RATIO_RESERVED;
-      break;
+         aspect = VIDEO_ASPECT_RATIO_RESERVED;
+         break;
     }
-  // Video scan should be read from progressive_sequence field in sequence extension
-  switch (data[3] & 0x0F) {
+
+  double frame_rate = 0;
+  switch (bs.GetBits(4)) {                  // frame rate code
     case 1:
-      info->frameRate   = 24000 / 1001.0;
-      info->scan        = VIDEO_SCAN_PROGRESSIVE;
-      info->format      = VIDEO_FORMAT_UNKNOWN;
-      break;
+         frame_rate = 24000 / 1001.0;
+         format = VIDEO_FORMAT_UNKNOWN;
+         break;
+
     case 2:
-      info->frameRate   = 24.0;
-      info->scan        = VIDEO_SCAN_PROGRESSIVE;
-      info->format      = VIDEO_FORMAT_UNKNOWN;
-      break;
+         frame_rate = 24.0;
+         format = VIDEO_FORMAT_UNKNOWN;
+         break;
+
     case 3:
-      info->frameRate   = 25.0;
-      info->scan        = VIDEO_SCAN_UNKNOWN;  // interlaced or progressive
-      info->format      = VIDEO_FORMAT_PAL;
-      break;
+         frame_rate = 25.0;
+         format = VIDEO_FORMAT_PAL;
+         break;
+
     case 4:
-      info->frameRate   = 30000 / 1001.0;
-      info->scan        = VIDEO_SCAN_UNKNOWN; // interlaced or progressive
-      info->format      = VIDEO_FORMAT_NTSC;
-      break;
+         frame_rate = 30000 / 1001.0;
+         format = VIDEO_FORMAT_NTSC;
+         break;
+
     case 5:
-      info->frameRate   = 30.0;
-      info->scan        = VIDEO_SCAN_UNKNOWN;  // interlaced or progressive
-      info->format      = VIDEO_FORMAT_NTSC;
-      break;
+         frame_rate = 30.0;
+         format = VIDEO_FORMAT_NTSC;
+         break;
+
     case 6:
-      info->frameRate   = 50.0;
-      info->scan        = VIDEO_SCAN_PROGRESSIVE;
-      info->format      = VIDEO_FORMAT_PAL;
-      break;
+         frame_rate = 50.0;
+         format = VIDEO_FORMAT_PAL;
+         break;
+
     case 7:
-      info->frameRate   = 60.0;
-      info->scan        = VIDEO_SCAN_PROGRESSIVE;
-      info->format      = VIDEO_FORMAT_NTSC;
-      break;
+         frame_rate = 60.0;
+         format = VIDEO_FORMAT_NTSC;
+         break;
+
     case 8:
-      info->frameRate   = 60000 / 1001.0;
-      info->scan        = VIDEO_SCAN_PROGRESSIVE;
-      info->format      = VIDEO_FORMAT_NTSC;
-      break;
+         frame_rate = 60000 / 1001.0;
+         format = VIDEO_FORMAT_NTSC;
+         break;
+
     case 9 ... 15:
     default:
-      info->frameRate   = 0;
-      info->scan        = VIDEO_SCAN_UNKNOWN;
-      info->format      = VIDEO_FORMAT_UNKNOWN;
-      break;
+         frame_rate = 0;
+         format = VIDEO_FORMAT_UNKNOWN;
+         break;
     }
-  info->bitrate = 400.0 * (double)(((data[4] << 10) & 0x0003FC00UL) | ((data[5] << 2) & 0x000003FCUL) | (((data[6] & 0xC0) >> 6) & 0x00000003UL));
+
+  int bit_rate = bs.GetBits(18);            // bit rate value
+
+  bs.SkipBit();             // marker bit
+  bs.SkipBits(10);          // vbv buffer size value
+  bs.SkipBit();             // constrained parameters value
+  if (bs.GetBit())          // load intra quantizer matrix
+     bs.SkipBits(8 * 64);   // intra quantizer matrix
+  if (bs.GetBit())          // load non-intra quantizer matrix
+     bs.SkipBits(8 * 64);   // non-intra quantizer matrix
+
+  if (bs.GetBits(32) != 0x000001B5) {               // extension start
+     bs.SkipBits(4);                                // extension start code identifier
+     bs.SkipBits(8);                                // profile and level indicator
+     scan = bs.GetBit() ? VIDEO_SCAN_PROGRESSIVE :
+                          VIDEO_SCAN_INTERLACED;    // progressive sequence
+     bs.SkipBits(2);                                // chroma format
+     horizontal_size |= (bs.GetBits(2) << 12);      // horizontal size extension
+     vertical_size |= (bs.GetBits(2) << 12);        // vertical size extension
+     bit_rate |= (bs.GetBits(12) << 18);            // bit rate extension
+     bs.SkipBit();                                  // marker bit
+     bs.SkipBits(8);                                // vpv buffer size extension
+     bs.SkipBit();                                  // low delay
+     bs.SkipBits(2);                                // frame rate extension n
+     bs.SkipBits(5);                                // frame rate extension d
+
+     if ((bs.GetBits(32) != 0x000001B5) &&          // extension start code
+         (bs.GetBits(4) == 0x0010)) {               // sequence display extension id
+        switch (bs.GetBits(3)) {                    // video format
+          case 0x000:
+               format = VIDEO_FORMAT_COMPONENT;
+               break;
+          case 0x001:
+               format = VIDEO_FORMAT_PAL;
+               break;
+          case 0x010:
+               format = VIDEO_FORMAT_NTSC;
+               break;
+          case 0x011:
+               format = VIDEO_FORMAT_SECAM;
+               break;
+          case 0x100:
+               format = VIDEO_FORMAT_MAC;
+               break;
+          case 0x101:
+               format = VIDEO_FORMAT_UNKNOWN;
+               break;
+          case 0x110:
+          case 0x111:
+               format = VIDEO_FORMAT_RESERVED;
+               break;
+          default:
+               format = VIDEO_FORMAT_INVALID;
+               break;
+          }
+        }
+     }
+
+  m_VideoHandler->SetVideoCodec(VIDEO_CODEC_MPEG2);
+  m_VideoHandler->SetVideoSize(horizontal_size, vertical_size);
+  m_VideoHandler->SetVideoBitrate(400.0 * (double)(bit_rate));
+  m_VideoHandler->SetVideoFramerate(frame_rate);
+  m_VideoHandler->SetVideoScan(eVideoScan(scan));
+  m_VideoHandler->SetVideoAspectRatio(eVideoAspectRatio(aspect));
+  m_VideoHandler->SetVideoFormat(eVideoFormat(format));
 
   return true;
 }

femonmpeg.h

@@ -8,10 +8,24 @@
 #ifndef __FEMONMPEG_H
 #define __FEMONMPEG_H
 
-#include "femonaudio.h"
 #include "femonvideo.h"
+#include "femonaudio.h"
 
-bool getMPEGAudioInfo(uint8_t *buf, int len, audio_info_t *info);
-bool getMPEGVideoInfo(uint8_t *buf, int len, video_info_t *info);
+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

femonosd.h

@@ -24,6 +24,13 @@
 
 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;
@@ -34,15 +41,30 @@ private:
   double            m_SvdrpAudioBitrate;
   SvdrpConnection_v1_0 m_SvdrpConnection;
   cPlugin          *m_SvdrpPlugin;
-  dvb_frontend_info m_FrontendInfo;
   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;
@@ -58,7 +80,7 @@ protected:
   cFemonOsd(const cFemonOsd&);
   cFemonOsd& operator= (const cFemonOsd&);
   virtual void Action(void);
-  virtual void ChannelSwitch(const cDevice * device, int channelNumber);
+  virtual void ChannelSwitch(const cDevice *device, int channelNumber, bool liveView);
   virtual void SetAudioTrack(int Index, const char * const *Tracks);
 
 public:

femonreceiver.c

@@ -8,40 +8,46 @@
 #include <unistd.h>
 #include "femontools.h"
 #include "femoncfg.h"
-#include "femonmpeg.h"
-#include "femonaac.h"
-#include "femonac3.h"
-#include "femonh264.h"
 #include "femonreceiver.h"
 
-#define TS_SIZE       188
-#define PAY_START     0x40
-#define ADAPT_FIELD   0x20
-#define PAYLOAD       0x10
-#define PTS_DTS_FLAGS 0xC0
-
-cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[])
-: cReceiver(ChannelID, -1, Vpid, Apid, Dpid, NULL),
+cFemonReceiver::cFemonReceiver(const cChannel *Channel, int ATrack, int DTrack)
+: cReceiver(Channel),
   cThread("femon receiver"),
+  m_Mutex(),
   m_Sleep(),
   m_Active(false),
-  m_VideoPid(Vpid),
+  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_VideoInfoBufferIndex(0),
-  m_AudioPid(Apid[0]),
+  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_AudioInfoBufferIndex(0),
-  m_AC3Pid(Dpid[0]),
-  m_AC3PacketCount(0), 
+  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),
-  m_AC3InfoBufferIndex(0)
+  m_AC3Valid(false)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  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;
@@ -51,16 +57,10 @@ cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[
   m_VideoInfo.height = 0;
   m_VideoInfo.frameRate = 0;
   m_VideoInfo.bitrate = AUDIO_BITRATE_INVALID;
-  for (unsigned int i = 0; i < ELEMENTS(m_VideoInfoBuffer); ++i)
-      memcpy(&m_VideoInfoBuffer[i], &m_VideoInfo, sizeof(video_info_t));
-
   m_AudioInfo.codec = AUDIO_CODEC_UNKNOWN;
   m_AudioInfo.bitrate = AUDIO_BITRATE_INVALID;
   m_AudioInfo.samplingFrequency = AUDIO_SAMPLING_FREQUENCY_INVALID;
   m_AudioInfo.channelMode = AUDIO_CHANNEL_MODE_INVALID;
-  for (unsigned int i = 0; i < ELEMENTS(m_AudioInfoBuffer); ++i)
-      memcpy(&m_AudioInfoBuffer[i], &m_AudioInfo, sizeof(audio_info_t));
-
   m_AC3Info.bitrate = AUDIO_BITRATE_INVALID;
   m_AC3Info.samplingFrequency = AUDIO_SAMPLING_FREQUENCY_INVALID;
   m_AC3Info.bitstreamMode = AUDIO_BITSTREAM_MODE_INVALID;
@@ -70,109 +70,29 @@ cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[
   m_AC3Info.surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
   m_AC3Info.dialogLevel = 0;
   m_AC3Info.lfe = false;
-  for (unsigned int i = 0; i < ELEMENTS(m_AC3InfoBuffer); ++i)
-      memcpy(&m_AC3InfoBuffer[i], &m_AC3Info, sizeof(ac3_info_t));
 }
 
 cFemonReceiver::~cFemonReceiver(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
   Deactivate();
 }
 
 void cFemonReceiver::Deactivate(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  Detach();
   if (m_Active) {
      m_Active = false;
      m_Sleep.Signal();
      if (Running())
         Cancel(3);
-     Detach();
      }
 }
 
-void cFemonReceiver::GetVideoInfo(uint8_t *buf, int len)
-{
-  int c = 0;
-
-  while (c < len) {
-    video_info_t tmp;
-    uint8_t *b = buf + c;
-    if (getMPEGVideoInfo(b, len - c, &tmp) || getH264VideoInfo(b, len - c, &tmp)) {
-       bool coherent = true;
-       memcpy(&m_VideoInfoBuffer[m_VideoInfoBufferIndex], &tmp, sizeof(video_info_t));
-       m_VideoInfoBufferIndex = (m_VideoInfoBufferIndex + 1) % ELEMENTS(m_VideoInfoBuffer);
-       for (unsigned int i = 1; i < ELEMENTS(m_VideoInfoBuffer); ++i) {
-           if (memcmp(&m_VideoInfoBuffer[0], &m_VideoInfoBuffer[i], sizeof(video_info_t)))
-              coherent = false;
-              break;
-           }
-       if (!m_VideoValid || coherent) {
-          m_VideoValid = true;
-          memcpy(&m_VideoInfo, &m_VideoInfoBuffer[0], sizeof(video_info_t));
-          }
-       return;
-       }
-    c++;
-    }
-}
-
-void cFemonReceiver::GetAudioInfo(uint8_t *buf, int len)
-{
-  int c = 0;
-
-  while (c < len) {
-    audio_info_t tmp;
-    uint8_t *b = buf + c;
-    if (getAACAudioInfo(b, len - c, &tmp) || getMPEGAudioInfo(b, len - c, &tmp)) {
-       bool coherent = true;
-       memcpy(&m_AudioInfoBuffer[m_AudioInfoBufferIndex], &tmp, sizeof(audio_info_t));
-       m_AudioInfoBufferIndex = (m_AudioInfoBufferIndex + 1) % ELEMENTS(m_AudioInfoBuffer);
-       for (unsigned int i = 1; i < ELEMENTS(m_AudioInfoBuffer); ++i) {
-           if (memcmp(&m_AudioInfoBuffer[0], &m_AudioInfoBuffer[i], sizeof(audio_info_t)))
-              coherent = false;
-              break;
-           }
-       if (!m_AudioValid || coherent) {
-          m_AudioValid = true;
-          memcpy(&m_AudioInfo, &m_AudioInfoBuffer[0], sizeof(audio_info_t));
-          }
-       return;
-       }
-    c++;
-    }	
-}
-
-void cFemonReceiver::GetAC3Info(uint8_t *buf, int len)
-{
-  int c = 0;
-
-  while (c < len) {
-    ac3_info_t tmp;
-    uint8_t *b = buf + c;
-    if (getAC3AudioInfo(b, len - c, &tmp)) {
-       bool coherent = true;
-       memcpy(&m_AC3InfoBuffer[m_AC3InfoBufferIndex], &tmp, sizeof(ac3_info_t));
-       m_AC3InfoBufferIndex = (m_AC3InfoBufferIndex + 1) % ELEMENTS(m_AC3InfoBuffer);
-       for (unsigned int i = 1; i < ELEMENTS(m_AC3InfoBuffer); ++i) {
-           if (memcmp(&m_AC3InfoBuffer[0], &m_AC3InfoBuffer[i], sizeof(ac3_info_t)))
-              coherent = false;
-              break;
-           }
-       if (!m_AC3Valid || coherent) {
-          m_AC3Valid = true;
-          memcpy(&m_AC3Info, &m_AC3InfoBuffer[0], sizeof(ac3_info_t));
-          }   
-       return;
-       }
-    c++;
-    }
-}
-
 void cFemonReceiver::Activate(bool On)
 {
-  Dprintf("%s(%d)\n", __PRETTY_FUNCTION__, On);
+  debug("%s(%d)\n", __PRETTY_FUNCTION__, On);
   if (On)
      Start();
   else
@@ -182,59 +102,149 @@ void cFemonReceiver::Activate(bool On)
 void cFemonReceiver::Receive(uchar *Data, int Length)
 {
   // TS packet length: TS_SIZE
-  if (Length == TS_SIZE) {
-     int pid = ((Data[1] & 0x1f) << 8) | (Data[2]);
+  if (Running() && (*Data == TS_SYNC_BYTE) && (Length == TS_SIZE)) {
+     int len, pid = TsPid(Data);
      if (pid == m_VideoPid) {
-        m_VideoPacketCount++;
-        }
-     else if (pid == m_AudioPid) {
-        m_AudioPacketCount++;
-        }
-     else if (pid == m_AC3Pid) {
-        m_AC3PacketCount++;
-        }
-     /* the following originates from libdvbmpeg: */
-     if (!(Data[3] & PAYLOAD)) {
-        return;
-        }
-     uint8_t off = 0;
-     if (Data[3] & ADAPT_FIELD) {
-        off = (uint8_t)(Data[4] + 1);
-        }
-     if (Data[1] & PAY_START) {
-        uint8_t *sb = Data + 4 + off;
-        if (sb[7] & PTS_DTS_FLAGS) {
-           uint8_t *pay = sb + sb[8] + 9; 
-           int l = TS_SIZE - 13 - off - sb[8];
-           if (pid == m_VideoPid) {
-              GetVideoInfo(pay, l);
-              }
-           else if (pid == m_AudioPid) {
-              GetAudioInfo(pay, l);
-              }
-           else if (pid == m_AC3Pid) {
-              GetAC3Info(pay, l);
-              }
+        ++m_VideoPacketCount;
+        len = m_VideoBuffer.Put(Data, Length);
+        if (len != Length) {
+           m_VideoBuffer.ReportOverflow(Length - len);
+           m_VideoBuffer.Clear();
+           }
+        }
+     else if (pid == m_AudioPid) {
+        ++m_AudioPacketCount;
+        len = m_AudioBuffer.Put(Data, Length);
+        if (len != Length) {
+           m_AudioBuffer.ReportOverflow(Length - len);
+           m_AudioBuffer.Clear();
+           }
+        }
+     else if (pid == m_AC3Pid) {
+        ++m_AC3PacketCount;
+        len = m_AC3Buffer.Put(Data, Length);
+        if (len != Length) {
+           m_AC3Buffer.ReportOverflow(Length - len);
+           m_AC3Buffer.Clear();
            }
         }
-     /* end */
      }
 }
 
 void cFemonReceiver::Action(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  cTimeMs t;
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  cTimeMs calcPeriod(0);
   m_Active = true;
+
   while (Running() && m_Active) {
-        t.Set(0);
-        // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
-        m_VideoBitrate = (10.0 * 8.0 * 184.0 * m_VideoPacketCount) / femonConfig.calcinterval;
-        m_VideoPacketCount = 0;
-        m_AudioBitrate = (10.0 * 8.0 * 184.0 * m_AudioPacketCount) / femonConfig.calcinterval;
-        m_AudioPacketCount = 0;
-        m_AC3Bitrate   = (10.0 * 8.0 * 184.0 * m_AC3PacketCount)   / femonConfig.calcinterval;
-        m_AC3PacketCount = 0;
-        m_Sleep.Wait(max((int)(100 * femonConfig.calcinterval - t.Elapsed()), 3));
+    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
     }
 }

femonreceiver.h

@@ -11,41 +11,51 @@
 #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 {
+class cFemonReceiver : public cReceiver, public cThread, public cFemonVideoIf, public cFemonAudioIf, public cFemonAC3If {
 private:
-  cCondWait     m_Sleep;
-  bool          m_Active;
+  cMutex            m_Mutex;
+  cCondWait         m_Sleep;
+  bool              m_Active;
 
-  int           m_VideoPid;
-  int           m_VideoPacketCount;
-  double        m_VideoBitrate;
-  bool          m_VideoValid;
-  video_info_t  m_VideoInfo;
-  video_info_t  m_VideoInfoBuffer[3];
-  unsigned int  m_VideoInfoBufferIndex;
+  cFemonH264        m_DetectH264;
+  cFemonMPEG        m_DetectMPEG;
+  cFemonAAC         m_DetectAAC;
+  cFemonLATM        m_DetectLATM;
+  cFemonAC3         m_DetectAC3;
 
-  int           m_AudioPid;
-  int           m_AudioPacketCount;
-  double        m_AudioBitrate;
-  bool          m_AudioValid;
-  audio_info_t  m_AudioInfo;
-  audio_info_t  m_AudioInfoBuffer[3];
-  unsigned int  m_AudioInfoBufferIndex;
+  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;
 
-  int           m_AC3Pid;
-  int           m_AC3PacketCount;
-  double        m_AC3Bitrate;
-  bool          m_AC3Valid;
-  ac3_info_t    m_AC3Info;
-  ac3_info_t    m_AC3InfoBuffer[3];
-  unsigned int  m_AC3InfoBufferIndex;
+  cRingBufferLinear m_AudioBuffer;
+  cTsToPes          m_AudioAssembler;
+  int               m_AudioPid;
+  int               m_AudioPacketCount;
+  double            m_AudioBitrate;
+  bool              m_AudioValid;
+  audio_info_t      m_AudioInfo;
 
-  void          GetVideoInfo(uint8_t *buf, int len);
-  void          GetAudioInfo(uint8_t *buf, int len);
-  void          GetAC3Info(uint8_t *buf, int len);
+  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);
@@ -53,41 +63,115 @@ protected:
   virtual void Action(void);
 
 public:
-  cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[]);
+  virtual void SetVideoCodec(eVideoCodec codec)                   { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.codec = codec; }
+  virtual void SetVideoFormat(eVideoFormat format)                { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.format = format; }
+  virtual void SetVideoScan(eVideoScan scan)                      { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.scan = scan; }
+  virtual void SetVideoAspectRatio(eVideoAspectRatio aspectratio) { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.aspectRatio = aspectratio; }
+  virtual void SetVideoSize(int width, int height)                { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.width  = width;
+                                                                    m_VideoInfo.height = height; }
+  virtual void SetVideoFramerate(double framerate)                { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.frameRate = framerate; }
+  virtual void SetVideoBitrate(double bitrate)                    { cMutexLock MutexLock(&m_Mutex);
+                                                                    m_VideoInfo.bitrate = bitrate; }
+
+  virtual void SetAudioCodec(eAudioCodec codec)        { cMutexLock MutexLock(&m_Mutex);
+                                                         m_AudioInfo.codec = codec; }
+  virtual void SetAudioBitrate(double bitrate)         { cMutexLock MutexLock(&m_Mutex);
+                                                         m_AudioInfo.bitrate = bitrate; }
+  virtual void SetAudioSamplingFrequency(int sampling) { cMutexLock MutexLock(&m_Mutex);
+                                                         m_AudioInfo.samplingFrequency = sampling; }
+  virtual void SetAudioChannel(eAudioChannelMode mode) { cMutexLock MutexLock(&m_Mutex);
+                                                         m_AudioInfo.channelMode = mode; }
+
+  virtual void SetAC3Bitrate(int bitrate)            { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.bitrate = bitrate; }
+  virtual void SetAC3SamplingFrequency(int sampling) { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.samplingFrequency = sampling; }
+  virtual void SetAC3Bitstream(int mode)             { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.bitstreamMode = mode; }
+  virtual void SetAC3AudioCoding(int mode)           { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.audioCodingMode = mode; }
+  virtual void SetAC3DolbySurround(int mode)         { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.dolbySurroundMode = mode; }
+  virtual void SetAC3CenterMix(int level)            { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.centerMixLevel = level; }
+  virtual void SetAC3SurroundMix(int level)          { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.surroundMixLevel = level; }
+  virtual void SetAC3Dialog(int level)               { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.dialogLevel = level; }
+  virtual void SetAC3LFE(bool onoff)                 { cMutexLock MutexLock(&m_Mutex);
+                                                       m_AC3Info.lfe = onoff; }
+
+public:
+  cFemonReceiver(const cChannel* Channel, int ATrack, int DTrack);
   virtual ~cFemonReceiver();
   void Deactivate(void);
 
-  bool   VideoValid(void)           { return m_VideoValid; };                  // boolean
-  double VideoBitrate(void)         { return m_VideoBitrate; };                // bit/s
-  int    VideoCodec(void)           { return m_VideoInfo.codec; };             // eVideoCodec
-  int    VideoFormat(void)          { return m_VideoInfo.format; };            // eVideoFormat
-  int    VideoScan(void)            { return m_VideoInfo.scan; };              // eVideoScan
-  int    VideoAspectRatio(void)     { return m_VideoInfo.aspectRatio; };       // eVideoAspectRatio
-  int    VideoHorizontalSize(void)  { return m_VideoInfo.width; };             // pixels
-  int    VideoVerticalSize(void)    { return m_VideoInfo.height; };            // pixels
-  double VideoFrameRate(void)       { return m_VideoInfo.frameRate; };         // Hz
-  double VideoStreamBitrate(void)   { return m_VideoInfo.bitrate; };           // bit/s
+  bool   VideoValid(void)           { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoValid; };                  // boolean
+  double VideoBitrate(void)         { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoBitrate; };                // bit/s
+  int    VideoCodec(void)           { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.codec; };             // eVideoCodec
+  int    VideoFormat(void)          { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.format; };            // eVideoFormat
+  int    VideoScan(void)            { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.scan; };              // eVideoScan
+  int    VideoAspectRatio(void)     { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.aspectRatio; };       // eVideoAspectRatio
+  int    VideoHorizontalSize(void)  { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.width; };             // pixels
+  int    VideoVerticalSize(void)    { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.height; };            // pixels
+  double VideoFrameRate(void)       { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.frameRate; };         // Hz
+  double VideoStreamBitrate(void)   { cMutexLock MutexLock(&m_Mutex);
+                                      return m_VideoInfo.bitrate; };           // bit/s
 
-  bool   AudioValid(void)           { return m_AudioValid; };                  // boolean
-  double AudioBitrate(void)         { return m_AudioBitrate; };                // bit/s
-  int    AudioCodec(void)           { return m_AudioInfo.codec; };             // eAudioCodec
-  int    AudioChannelMode(void)     { return m_AudioInfo.channelMode; };       // eAudioChannelMode
-  double AudioStreamBitrate(void)   { return m_AudioInfo.bitrate; };           // bit/s or eAudioBitrate
-  int    AudioSamplingFreq(void)    { return m_AudioInfo.samplingFrequency; }; // Hz or eAudioSamplingFrequency
+  bool   AudioValid(void)           { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioValid; };                  // boolean
+  double AudioBitrate(void)         { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioBitrate; };                // bit/s
+  int    AudioCodec(void)           { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioInfo.codec; };             // eAudioCodec
+  int    AudioChannelMode(void)     { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioInfo.channelMode; };       // eAudioChannelMode
+  double AudioStreamBitrate(void)   { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioInfo.bitrate; };           // bit/s or eAudioBitrate
+  int    AudioSamplingFreq(void)    { cMutexLock MutexLock(&m_Mutex);
+                                      return m_AudioInfo.samplingFrequency; }; // Hz or eAudioSamplingFrequency
 
-  bool   AC3Valid(void)             { return m_AC3Valid; };                    // boolean
-  double AC3Bitrate(void)           { return m_AC3Bitrate; };                  // bit/s
-  double AC3StreamBitrate(void)     { return m_AC3Info.bitrate; };             // bit/s or eAudioBitrate
-  int    AC3SamplingFreq(void)      { return m_AC3Info.samplingFrequency; };   // Hz or eAudioSamplingFrequency
-  int    AC3BitStreamMode(void)     { return m_AC3Info.bitstreamMode; };       // 0..7 or eAudioBitstreamMode
-  int    AC3AudioCodingMode(void)   { return m_AC3Info.audioCodingMode; };     // 0..7 or eAudioCodingMode
-  bool   AC3_2_0(void)              { return m_AC3Info.audioCodingMode == AUDIO_CODING_MODE_2_0; }; // boolean
-  bool   AC3_5_1(void)	            { return m_AC3Info.audioCodingMode == AUDIO_CODING_MODE_3_2; }; // boolean
-  int    AC3DolbySurroundMode(void) { return m_AC3Info.dolbySurroundMode; };   // eAudioDolbySurroundMode
-  int    AC3CenterMixLevel(void)    { return m_AC3Info.centerMixLevel; };      // eAudioCenterMixLevel
-  int    AC3SurroundMixLevel(void)  { return m_AC3Info.surroundMixLevel; };    // eAudioSurroundMixLevel
-  int    AC3DialogLevel(void)       { return m_AC3Info.dialogLevel; };         // -dB
-  bool   AC3Lfe(void)               { return m_AC3Info.lfe; };                 // boolean
+  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

femonsymbol.c

@@ -5,6 +5,8 @@
  *
  */
 
+#include <vdr/device.h>
+#include "femontools.h"
 #include "femonsymbol.h"
 
 #include "symbols/stereo.xpm"
@@ -37,37 +39,172 @@
 #include "symbols/five.xpm"
 #include "symbols/six.xpm"
 #include "symbols/seven.xpm"
+#include "symbols/eight.xpm"
+#include "symbols/format1080.xpm"
+#include "symbols/format1080i.xpm"
+#include "symbols/format1080p.xpm"
+#include "symbols/format720.xpm"
+#include "symbols/format720i.xpm"
+#include "symbols/format720p.xpm"
+#include "symbols/format576.xpm"
+#include "symbols/format576i.xpm"
+#include "symbols/format576p.xpm"
+#include "symbols/format480.xpm"
+#include "symbols/format480i.xpm"
+#include "symbols/format480p.xpm"
 
-cBitmap bmSymbol[SYMBOL_MAX_COUNT] =
+static cBitmap bmOnePixel(1, 1, 1);
+static cBitmap bmStereo(stereo_xpm);
+static cBitmap bmMonoLeft(monoleft_xpm);
+static cBitmap bmMonoRight(monoright_xpm);
+static cBitmap bmDolbyDigital(dolbydigital_xpm);
+static cBitmap bmDolbyDigital20(dolbydigital20_xpm);
+static cBitmap bmDolbyDigital51(dolbydigital51_xpm);
+static cBitmap bmMpeg2(mpeg2_xpm);
+static cBitmap bmH264(h264_xpm);
+static cBitmap bmPal(pal_xpm);
+static cBitmap bmNtsc(ntsc_xpm);
+static cBitmap bmEncrypted(encrypted_xpm);
+static cBitmap bmSvdrp(svdrp_xpm);
+static cBitmap bmLock(lock_xpm);
+static cBitmap bmSignal(signal_xpm);
+static cBitmap bmCarrier(carrier_xpm);
+static cBitmap bmViterbi(viterbi_xpm);
+static cBitmap bmSync(sync_xpm);
+static cBitmap bmAspectRatio11(ar11_xpm);
+static cBitmap bmAspectRatio169(ar169_xpm);
+static cBitmap bmAspectRatio2211(ar2211_xpm);
+static cBitmap bmAspectRatio43(ar43_xpm);
+static cBitmap bmDevice(device_xpm);
+static cBitmap bmZero(zero_xpm);
+static cBitmap bmOne(one_xpm);
+static cBitmap bmTwo(two_xpm);
+static cBitmap bmThree(three_xpm);
+static cBitmap bmFour(four_xpm);
+static cBitmap bmFive(five_xpm);
+static cBitmap bmSix(six_xpm);
+static cBitmap bmSeven(seven_xpm);
+static cBitmap bmEight(eight_xpm);
+static cBitmap bmFormat1080(format1080_xpm);
+static cBitmap bmFormat1080i(format1080i_xpm);
+static cBitmap bmFormat1080p(format1080p_xpm);
+static cBitmap bmFormat720(format720_xpm);
+static cBitmap bmFormat720i(format720i_xpm);
+static cBitmap bmFormat720p(format720p_xpm);
+static cBitmap bmFormat576(format576_xpm);
+static cBitmap bmFormat576i(format576i_xpm);
+static cBitmap bmFormat576p(format576p_xpm);
+static cBitmap bmFormat480(format480_xpm);
+static cBitmap bmFormat480i(format480i_xpm);
+static cBitmap bmFormat480p(format480p_xpm);
+
+cFemonSymbolCache femonSymbols;
+
+cFemonSymbolCache::cFemonSymbolCache()
+: xFactorM(1.0),
+  yFactorM(1.0),
+  antiAliasM(false)
 {
-  cBitmap(stereo_xpm),         // SYMBOL_STEREO
-  cBitmap(monoleft_xpm),       // SYMBOL_MONO_LEFT
-  cBitmap(monoright_xpm),      // SYMBOL_MONO_RIGHT
-  cBitmap(dolbydigital_xpm),   // SYMBOL_DD
-  cBitmap(dolbydigital20_xpm), // SYMBOL_DD20
-  cBitmap(dolbydigital51_xpm), // SYMBOL_DD51
-  cBitmap(mpeg2_xpm),          // SYMBOL_MPEG2
-  cBitmap(h264_xpm),           // SYMBOL_H264
-  cBitmap(pal_xpm),            // SYMBOL_PAL
-  cBitmap(ntsc_xpm),           // SYMBOL_NTSC
-  cBitmap(encrypted_xpm),      // SYMBOL_ENCRYPTED
-  cBitmap(svdrp_xpm),          // SYMBOL_SVDRP
-  cBitmap(lock_xpm),           // SYMBOL_LOCK
-  cBitmap(signal_xpm),         // SYMBOL_SIGNAL
-  cBitmap(carrier_xpm),        // SYMBOL_CARRIER
-  cBitmap(viterbi_xpm),        // SYMBOL_VITERBI
-  cBitmap(sync_xpm),           // SYMBOL_SYNC
-  cBitmap(ar11_xpm),           // SYMBOL_AR_1_1
-  cBitmap(ar169_xpm),          // SYMBOL_AR_16_9
-  cBitmap(ar2211_xpm),         // SYMBOL_AR_2_21_1
-  cBitmap(ar43_xpm),           // SYMBOL_AR_4_3
-  cBitmap(device_xpm),         // SYMBOL_DEVICE
-  cBitmap(zero_xpm),           // SYMBOL_ZERO
-  cBitmap(one_xpm),            // SYMBOL_ONE
-  cBitmap(two_xpm),            // SYMBOL_TWO
-  cBitmap(three_xpm),          // SYMBOL_THREE
-  cBitmap(four_xpm),           // SYMBOL_FOUR
-  cBitmap(five_xpm),           // SYMBOL_FIVE
-  cBitmap(six_xpm),            // SYMBOL_SIX
-  cBitmap(seven_xpm)           // SYMBOL_SEVEN
-};
+  Populate();
+}
+
+cFemonSymbolCache::~cFemonSymbolCache()
+{
+  Flush();
+}
+
+void cFemonSymbolCache::Refresh()
+{
+  int width, height;
+  double aspect, xfactor, yfactor;
+  cDevice::PrimaryDevice()->GetOsdSize(width, height, aspect);
+  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)) {
+     xFactorM = xfactor;
+     yFactorM = yfactor;
+     Populate();
+     }
+}
+
+bool cFemonSymbolCache::Populate(void)
+{
+  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(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(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;
+     }
+
+  return false;
+}
+
+bool cFemonSymbolCache::Flush(void)
+{
+  debug("%s()\n", __PRETTY_FUNCTION__);
+  for (int i = 0; i < cacheM.Size(); ++i) {
+      cBitmap *bmp = cacheM[i];
+      DELETENULL(bmp);
+      }
+  cacheM.Clear();
+  return true;
+}
+
+cBitmap& cFemonSymbolCache::Get(eSymbols symbolP)
+{
+  cBitmap *bitmapM = cacheM[SYMBOL_ONEPIXEL];
+
+  if (symbolP < cacheM.Size())
+     bitmapM = cacheM[symbolP];
+  else
+    error("%s(): Invalid symbol %d\n", __PRETTY_FUNCTION__, symbolP);
+
+  return *bitmapM;
+}

femonsymbol.h

@@ -8,9 +8,11 @@
 #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,
@@ -41,9 +43,45 @@ enum eSymbols {
   SYMBOL_FIVE,
   SYMBOL_SIX,
   SYMBOL_SEVEN,
+  SYMBOL_EIGHT,
+  SYMBOL_FORMAT_1080,
+  SYMBOL_FORMAT_1080i,
+  SYMBOL_FORMAT_1080p,
+  SYMBOL_FORMAT_720,
+  SYMBOL_FORMAT_720i,
+  SYMBOL_FORMAT_720p,
+  SYMBOL_FORMAT_576,
+  SYMBOL_FORMAT_576i,
+  SYMBOL_FORMAT_576p,
+  SYMBOL_FORMAT_480,
+  SYMBOL_FORMAT_480i,
+  SYMBOL_FORMAT_480p,
   SYMBOL_MAX_COUNT
   };
 
-extern cBitmap bmSymbol[SYMBOL_MAX_COUNT];
+class cFemonSymbolCache {
+private:
+  enum {
+    DEFAULT_SPACING  = 5,
+    DEFAULT_ROUNDING = 10,
+    DEFAULT_HEIGHT   = 576,
+    DEFAULT_WIDTH    = 720
+    };
+  double xFactorM;
+  double yFactorM;
+  bool antiAliasM;
+  cVector<cBitmap*> cacheM;
+  bool Populate(void);
+  bool Flush(void);
+public:
+  cFemonSymbolCache();
+  ~cFemonSymbolCache();
+  void Refresh();
+  cBitmap& Get(eSymbols symbolP);
+  int GetSpacing()  { return int(yFactorM * cFemonSymbolCache::DEFAULT_SPACING);  }
+  int GetRounding() { return int(yFactorM * cFemonSymbolCache::DEFAULT_ROUNDING); }
+};
+
+extern cFemonSymbolCache femonSymbols;
 
 #endif // __FEMONSYMBOL_H

femontools.c

@@ -5,6 +5,12 @@
  *
  */
 
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+
+#include <ctype.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
@@ -20,81 +26,113 @@ static cString getCA(int value)
   switch (value) {
     case 0x0000:            return cString::sprintf("%s (%X)", trVDR("Free To Air"), value);  // Reserved
     case 0x0001 ... 0x009F:
-    case 0x00A2 ... 0x00FF: return cString::sprintf("%s (%X)", tr("Fixed"),          value); // Standardized systems
-    case 0x00A0 ... 0x00A1: return cString::sprintf("%s (%X)", tr("Analog"),         value); // Analog signals
-    case 0x0100 ... 0x01FF: return cString::sprintf("%s (%X)", "SECA Mediaguard",    value); // Canal Plus
-    case 0x0464:            return cString::sprintf("%s (%X)", "EuroDec",            value); // EuroDec
-    case 0x0500 ... 0x05FF: return cString::sprintf("%s (%X)", "Viaccess",           value); // France Telecom
-    case 0x0600 ... 0x06FF: return cString::sprintf("%s (%X)", "Irdeto",             value); // Irdeto
-    case 0x0900 ... 0x09FF: return cString::sprintf("%s (%X)", "NDS Videoguard",     value); // News Datacom
-    case 0x0B00 ... 0x0BFF: return cString::sprintf("%s (%X)", "Conax",              value); // Norwegian Telekom
-    case 0x0D00 ... 0x0DFF: return cString::sprintf("%s (%X)", "CryptoWorks",        value); // Philips
-    case 0x0E00 ... 0x0EFF: return cString::sprintf("%s (%X)", "PowerVu",            value); // Scientific Atlanta
-    case 0x1000:            return cString::sprintf("%s (%X)", "RAS",                value); // Tandberg Television
-    case 0x1200 ... 0x12FF: return cString::sprintf("%s (%X)", "NagraVision",        value); // BellVu Express
-    case 0x1700 ... 0x17FF: return cString::sprintf("%s (%X)", "BetaCrypt",          value); // BetaTechnik
-    case 0x1800 ... 0x18FF: return cString::sprintf("%s (%X)", "NagraVision",        value); // Kudelski SA
-    case 0x22F0:            return cString::sprintf("%s (%X)", "Codicrypt",          value); // Scopus Network Technologies
-    case 0x2600:            return cString::sprintf("%s (%X)", "BISS",               value); // European Broadcasting Union
-    case 0x4347:            return cString::sprintf("%s (%X)", "CryptOn",            value); // CryptOn
-    case 0x4800:            return cString::sprintf("%s (%X)", "Accessgate",         value); // Telemann
-    case 0x4900:            return cString::sprintf("%s (%X)", "China Crypt",        value); // CryptoWorks
-    case 0x4A10:            return cString::sprintf("%s (%X)", "EasyCas",            value); // EasyCas
-    case 0x4A20:            return cString::sprintf("%s (%X)", "AlphaCrypt",         value); // AlphaCrypt
-    case 0x4A70:            return cString::sprintf("%s (%X)", "DreamCrypt",         value); // Dream Multimedia
-    case 0x4A60:            return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
-    case 0x4A61:            return cString::sprintf("%s (%X)", "Neotioncrypt",       value); // Neotion
-    case 0x4A62:            return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
-    case 0x4A63:            return cString::sprintf("%s (%X)", "Neotion SHL",        value); // Neotion
-    case 0x4A64 ... 0x4A6F: return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
-    case 0x4A80:            return cString::sprintf("%s (%X)", "ThalesCrypt",        value); // TPS
-    case 0x4AA1:            return cString::sprintf("%s (%X)", "KeyFly",             value); // SIDSA
-    case 0x4ABF:            return cString::sprintf("%s (%X)", "DG-Crypt",           value); // Beijing Compunicate Technology Inc.
-    case 0x4AD0 ... 0x4AD1: return cString::sprintf("%s (%X)", "X-Crypt",            value); // XCrypt Inc.
-    case 0x4AD4:            return cString::sprintf("%s (%X)", "OmniCrypt",          value); // Widevine Technologies, Inc.
-    case 0x4AE0:            return cString::sprintf("%s (%X)", "RossCrypt",          value); // Digi Raum Electronics Co. Ltd.
-    case 0x5500:            return cString::sprintf("%s (%X)", "Z-Crypt",            value); // Digi Raum Electronics Co. Ltd.
-    case 0x5501:            return cString::sprintf("%s (%X)", "Griffin",            value); // Griffin
+    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 0x0700 ... 0x07FF: return cString::sprintf("DigiCipher 2 (%X)",     value); // Jerrold/GI/Motorola 4DTV
+    case 0x0900 ... 0x09FF: return cString::sprintf("NDS Videoguard (%X)",   value); // NDS
+    case 0x0B00 ... 0x0BFF: return cString::sprintf("Conax (%X)",            value); // Norwegian Telekom
+    case 0x0D00 ... 0x0DFF: return cString::sprintf("CryptoWorks (%X)",      value); // Philips CryptoTec
+    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("VCAS (%X)",             value); // Verimatrix Inc. former 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 0x2719:            return cString::sprintf("VanyaCas (%X)",         value); // S-Curious Research & Technology Pvt. Ltd.
+    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 0x4A02:            return cString::sprintf("Tongfang (%X)",         value); // Tsinghua Tongfang Company
+    case 0x4A10:            return cString::sprintf("EasyCas (%X)",          value); // EasyCas
+    case 0x4A20:            return cString::sprintf("AlphaCrypt (%X)",       value); // AlphaCrypt
+    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 0x4A70:            return cString::sprintf("DreamCrypt (%X)",       value); // Dream Multimedia
+    case 0x4A80:            return cString::sprintf("ThalesCrypt (%X)",      value); // Thales Broadcast & Multimedia
+    case 0x4AA1:            return cString::sprintf("KeyFly (%X)",           value); // SIDSA
+    case 0x4ABF:            return cString::sprintf("CTI-CAS (%X)",          value); // Beijing Compunicate Technology Inc.
+    case 0x4AC1:            return cString::sprintf("Latens (%X)",           value); // Latens Systems
+    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 ... 0x4AE1: return cString::sprintf("Z-Crypt (%X)",          value); // Digi Raum Electronics Co. Ltd.
+    case 0x4AE4:            return cString::sprintf("CoreCrypt (%X)",        value); // CoreTrust
+    case 0x4AE5:            return cString::sprintf("PRO-Crypt (%X)",        value); // IK SATPROF
+    case 0x4AEA:            return cString::sprintf("Cryptoguard (%X)",      value); // Gryptoguard AB
+    case 0x4AEB:            return cString::sprintf("Abel Quintic (%X)",     value); // Abel DRM Systems
+    case 0x4AF0:            return cString::sprintf("ABV (%X)",              value); // Alliance Broadcast Vision
+    case 0x5500:            return cString::sprintf("Z-Crypt (%X)",          value); // Digi Raum Electronics Co. Ltd.
+    case 0x5501:            return cString::sprintf("Griffin (%X)",          value); // Nucleus Systems Ltd.
+    case 0x5581:            return cString::sprintf("Bulcrypt (%X)",         value); // Bulcrypt
+    case 0x7BE1:            return cString::sprintf("DRE-Crypt (%X)",        value); // DRE-Crypt
+    case 0xA101:            return cString::sprintf("RosCrypt-M (%X)",       value); // NIIR
+    case 0xEAD0:            return cString::sprintf("VanyaCas (%X)",         value); // S-Curious Research & Technology Pvt. Ltd.
     default:                break;
     }
   return cString::sprintf("%X", value);
 }
 
-static const char *getUserString(int Value, const tChannelParameterMap *Map)
+static const char *getUserString(int Value, const tDvbParameterMap *Map)
 {
-  const tChannelParameterMap *map = Map;
+  const tDvbParameterMap *map = Map;
   while (map && map->userValue != -1) {
         if (map->driverValue == Value)
-           return map->userString ? tr(map->userString) : "---";
+           return map->userString ? trVDR(map->userString) : "---";
         map++;
         }
   return "---";
 }
 
-cString getFrontendInfo(int cardIndex)
+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)
 {
-  cString info;
   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());
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
 
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  if (!device)
+     return info;
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
   if (fe < 0)
-     return NULL;
-  CHECK(ioctl(fe, FE_GET_INFO, &value));
-  CHECK(ioctl(fe, FE_READ_STATUS, &status));
-  CHECK(ioctl(fe, FE_READ_SIGNAL_STRENGTH, &signal));
-  CHECK(ioctl(fe, FE_READ_SNR, &snr));
-  CHECK(ioctl(fe, FE_READ_BER, &ber));
-  CHECK(ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &unc));
-  close(fe);
+     return info;
 
-  info = cString::sprintf("CARD:%d\nTYPE:%d\nNAME:%s\nSTAT:%02X\nSGNL:%04X\nSNRA:%04X\nBERA:%08X\nUNCB:%08X", cardIndex, value.type, value.name, status, signal, snr, ber, unc);
+  info = cString::sprintf("CARD:%d\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());
@@ -105,85 +143,90 @@ cString getFrontendInfo(int cardIndex)
   return info;
 }
 
-cString getFrontendName(int cardIndex)
+cString getFrontendName(cDvbDevice *device)
 {
-  struct dvb_frontend_info value;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
-
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  if (fe < 0)
+  if (!device)
      return NULL;
-  CHECK(ioctl(fe, FE_GET_INFO, &value));
-  close(fe);
 
-  return (cString::sprintf("%s on device #%d", value.name, cardIndex));
+  return (cString::sprintf("%s on device #%d", *device->DeviceName(), device->CardIndex()));
 }
 
-cString getFrontendStatus(int cardIndex)
+cString getFrontendStatus(cDvbDevice *device)
 {
   fe_status_t value;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
 
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  if (!device)
+     return NULL;
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
   if (fe < 0)
      return NULL;
-  CHECK(ioctl(fe, FE_READ_STATUS, &value));
+  memset(&value, 0, sizeof(value));
+  ioctl(fe, FE_READ_STATUS, &value);
   close(fe);
 
-  return (cString::sprintf("Status %s:%s:%s:%s:%s on device #%d", (value & FE_HAS_LOCK) ? "LOCKED" : "-", (value & FE_HAS_SIGNAL) ? "SIGNAL" : "-", (value & FE_HAS_CARRIER) ? "CARRIER" : "-", (value & FE_HAS_VITERBI) ? "VITERBI" : "-", (value & FE_HAS_SYNC) ? "SYNC" : "-", cardIndex));
+  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(int cardIndex)
+uint16_t getSignal(cDvbDevice *device)
 {
   uint16_t value = 0;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
 
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  if (!device)
+     return (value);
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
   if (fe < 0)
      return (value);
-  CHECK(ioctl(fe, FE_READ_SIGNAL_STRENGTH, &value));
+  ioctl(fe, FE_READ_SIGNAL_STRENGTH, &value);
   close(fe);
 
   return (value);
 }
 
-uint16_t getSNR(int cardIndex)
+uint16_t getSNR(cDvbDevice *device)
 {
   uint16_t value = 0;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
 
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  if (!device)
+     return (value);
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
   if (fe < 0)
      return (value);
-  CHECK(ioctl(fe, FE_READ_SNR, &value));
+  ioctl(fe, FE_READ_SNR, &value);
   close(fe);
 
   return (value);
 }
 
-uint32_t getBER(int cardIndex)
+uint32_t getBER(cDvbDevice *device)
 {
   uint32_t value = 0;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
 
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  if (!device)
+     return (value);
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
   if (fe < 0)
      return (value);
-  CHECK(ioctl(fe, FE_READ_BER, &value));
+  ioctl(fe, FE_READ_BER, &value);
   close(fe);
 
   return (value);
 }
 
-uint32_t getUNC(int cardIndex)
+uint32_t getUNC(cDvbDevice *device)
 {
   uint32_t value = 0;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
 
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  if (!device)
+     return (value);
+
+  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
   if (fe < 0)
      return (value);
-  CHECK(ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &value));
+  ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &value);
   close(fe);
 
   return (value);
@@ -280,6 +323,7 @@ cString getAudioCodec(int value)
     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("---");
@@ -306,7 +350,7 @@ cString getTransmission(int value)
 {
   return cString::sprintf("%s", getUserString(value, TransmissionValues));
 }
- 
+
 cString getBandwidth(int value)
 {
   return cString::sprintf("%s", getUserString(value, BandwidthValues));
@@ -332,9 +376,14 @@ cString getModulation(int value)
   return cString::sprintf("%s", getUserString(value, ModulationValues));
 }
 
-cString getSystem(int value)
+cString getTerrestrialSystem(int value)
 {
-  return cString::sprintf("%s", getUserString(value, SystemValues));
+  return cString::sprintf("%s", getUserString(value, SystemValuesTerr));
+}
+
+cString getSatelliteSystem(int value)
+{
+  return cString::sprintf("%s", getUserString(value, SystemValuesSat));
 }
 
 cString getRollOff(int value)
@@ -342,6 +391,11 @@ cString getRollOff(int value)
   return cString::sprintf("%s", getUserString(value, RollOffValues));
 }
 
+cString getPilot(int value)
+{
+  return cString::sprintf("%s", getUserString(value, PilotValues));
+}
+
 cString getResolution(int width, int height, int scan)
 {
   if ((width > 0) && (height > 0)) {
@@ -483,8 +537,9 @@ cString getAC3DialogLevel(int value)
 
 cString getFrequencyMHz(int value)
 {
-   while (value > 20000) value /= 1000;
-   return cString::sprintf("%d %s", value, tr("MHz"));
+  double freq = value;
+  while (freq > 20000.0) freq /= 1000.0;
+  return cString::sprintf("%s %s", *dtoa(freq, "%lg"), tr("MHz"));
 }
 
 cString getAudioSamplingFreq(int value)
@@ -522,7 +577,36 @@ cString getBitrateMbits(double value)
 
 cString getBitrateKbits(double value)
 {
-  if (value > 0) 
+  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);
+}

femontools.h

@@ -10,27 +10,35 @@
 
 #include <stdint.h>
 #include <vdr/channels.h>
+#include <vdr/dvbdevice.h>
+#include <vdr/remux.h>
 #include <vdr/tools.h>
 
 #ifdef DEBUG
-#define Dprintf(x...) printf(x);
+#define debug(x...) dsyslog("FEMON: " x);
+#define error(x...) esyslog("ERROR: " x);
 #else
-#define Dprintf(x...) ;
+#define debug(x...) ;
+#define error(x...) esyslog("ERROR: " x);
 #endif
 
 #define ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
 
 #define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"
 
-cString getFrontendInfo(int cardIndex = 0);
-cString getFrontendName(int cardIndex = 0);
-cString getFrontendStatus(int cardIndex = 0);
+#define SATIP_DEVICE "SAT>IP"
 
-uint16_t getSNR(int cardIndex = 0);
-uint16_t getSignal(int cardIndex = 0);
+cDvbDevice *getDvbDevice(cDevice* device);
 
-uint32_t getBER(int cardIndex = 0);
-uint32_t getUNC(int cardIndex = 0);
+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);
@@ -48,8 +56,10 @@ cString getInversion(int value);
 cString getHierarchy(int value);
 cString getGuard(int value);
 cString getModulation(int value);
-cString getSystem(int value);
+cString getTerrestrialSystem(int value);
+cString getSatelliteSystem(int value);
 cString getRollOff(int value);
+cString getPilot(int value);
 cString getResolution(int width, int height, int scan);
 cString getAspectRatio(int value);
 cString getVideoFormat(int value);
@@ -68,4 +78,14 @@ 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

femonvideo.h

@@ -66,7 +66,28 @@ typedef struct video_info {
   int               width;       // pixels
   int               height;      // pixels
   double            frameRate;   // Hz
-  double            bitrate;     // Mbit/s
+  double            bitrate;     // bit/s
 } video_info_t;
 
+class cFemonVideoIf {
+public:
+  cFemonVideoIf() {}
+  virtual ~cFemonVideoIf() {}
+
+  // eVideoCodec
+  virtual void SetVideoCodec(eVideoCodec codec) = 0;
+  // eVideoFormat
+  virtual void SetVideoFormat(eVideoFormat format) = 0;
+  // eVideoScan
+  virtual void SetVideoScan(eVideoScan scan) = 0;
+  // eVideoAspectRatio
+  virtual void SetVideoAspectRatio(eVideoAspectRatio aspectratio) = 0;
+  // pixels
+  virtual void SetVideoSize(int width, int height) = 0;
+  // Hz
+  virtual void SetVideoFramerate(double framerate) = 0;
+  // Mbit/s
+  virtual void SetVideoBitrate(double bitrate) = 0;
+  };
+
 #endif //__FEMONVIDEO_H

iptvservice.h

@@ -0,0 +1,22 @@
+/*
+ * iptvservice.h: IPTV plugin for the Video Disk Recorder
+ *
+ * See the README file for copyright information and how to reach the author.
+ *
+ */
+
+#ifndef __IPTVSERVICE_H
+#define __IPTVSERVICE_H
+
+#include <vdr/tools.h>
+
+#define stIptv ('I' << 24)
+
+struct IptvService_v1_0 {
+  unsigned int cardIndex;
+  cString protocol;
+  cString bitrate;
+  };
+
+#endif //__IPTVSERVICE_H
+

po/de_DE.po

@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Peter Marquardt
 # Andreas Brachold
@@ -7,12 +7,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Christian Wieninger\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,6 +66,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"
 
+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Hauptmen<65>eintrag verstecken"
 
@@ -89,13 +93,10 @@ msgstr "Position"
 msgid "Define the position of OSD."
 msgstr ""
 
-msgid "Define the height of OSD."
+msgid "Downscale OSD size [%]"
 msgstr ""
 
-msgid "Horizontal offset"
-msgstr "Horizontaler Offset"
-
-msgid "Define the horizontal offset of OSD."
+msgid "Define the downscale ratio for OSD size."
 msgstr ""
 
 msgid "Red limit [%]"
@@ -179,6 +180,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
 msgid "Stream Information"
 msgstr "Streaminformation"
 
@@ -188,9 +195,6 @@ msgstr "Video Stream"
 msgid "Codec"
 msgstr ""
 
-msgid "Bitrate"
-msgstr "Bitrate"
-
 msgid "Aspect Ratio"
 msgstr "Seitenverh<72>ltnis"
 
@@ -233,12 +237,6 @@ msgstr "Dolby Surround Modus"
 msgid "Low Frequency Effects"
 msgstr "Tieft<66>ner Effekte"
 
-msgid "on"
-msgstr "Ein"
-
-msgid "off"
-msgstr "Aus"
-
 msgid "Dialogue Normalization"
 msgstr "Dialog Normalisierung"
 
@@ -275,6 +273,9 @@ msgstr ""
 msgid "HE-AAC"
 msgstr ""
 
+msgid "LATM"
+msgstr ""
+
 msgid "stereo"
 msgstr ""
 

po/es_ES.po

@@ -1,16 +1,17 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Luis Palacios
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Luis Palacios\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Spanish <vdr@linuxtv.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,6 +64,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"
 
+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Ocultar en el men<65> principal"
 
@@ -87,13 +91,10 @@ msgstr "Posici
 msgid "Define the position of OSD."
 msgstr ""
 
-msgid "Define the height of OSD."
+msgid "Downscale OSD size [%]"
 msgstr ""
 
-msgid "Horizontal offset"
-msgstr "Desplazamiento horizontal"
-
-msgid "Define the horizontal offset of OSD."
+msgid "Define the downscale ratio for OSD size."
 msgstr ""
 
 msgid "Red limit [%]"
@@ -177,6 +178,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Tasa de bits"
+
 msgid "Stream Information"
 msgstr "Informaci<63>n del flujo"
 
@@ -186,9 +193,6 @@ msgstr "Flujo de video"
 msgid "Codec"
 msgstr ""
 
-msgid "Bitrate"
-msgstr "Tasa de bits"
-
 msgid "Aspect Ratio"
 msgstr "Proporciones de la imagen"
 
@@ -231,12 +235,6 @@ msgstr "Nivel sonoro Dolby Surround"
 msgid "Low Frequency Effects"
 msgstr "Efectos de baja frecuencia"
 
-msgid "on"
-msgstr "on"
-
-msgid "off"
-msgstr "off"
-
 msgid "Dialogue Normalization"
 msgstr "Normalizaci<63>n del di<64>logo"
 
@@ -273,6 +271,9 @@ msgstr ""
 msgid "HE-AAC"
 msgstr ""
 
+msgid "LATM"
+msgstr ""
+
 msgid "stereo"
 msgstr ""
 

po/et_EE.po

@@ -1,16 +1,17 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Arthur Konovalov
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Arthur Konovalov\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Estonian <vdr@linuxtv.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +23,7 @@ msgid "Signal Information"
 msgstr "Signaaliinfo"
 
 msgid "Femon not available"
-msgstr ""
+msgstr "Femon ei ole k<>ttesaadav"
 
 msgid "basic"
 msgstr "standard"
@@ -37,7 +38,7 @@ msgid "AC-3"
 msgstr "AC-3"
 
 msgid "Classic"
-msgstr "Klassikaline"
+msgstr "Classic"
 
 msgid "Elchi"
 msgstr "Elchi"
@@ -63,89 +64,89 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"
 
+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
-msgstr "Peida valik peamen<65><6E>s"
+msgstr "Peita valik peamen<65><6E>s"
 
 msgid "Define whether the main menu entry is hidden."
-msgstr ""
+msgstr "Valiku peamen<65><6E>s peitmise m<><6D>ritlemine."
 
 msgid "Default display mode"
-msgstr "Vaikimisi displei moodus"
+msgstr "Vaikemoodus"
 
 msgid "Define the default display mode at startup."
-msgstr ""
+msgstr "K<EFBFBD>ivitamisel vaikemooduse m<><6D>ritlemine."
 
 msgid "Define the used OSD skin."
-msgstr ""
+msgstr "Kasutatava ekraanikesta m<><6D>ritlemine."
 
 msgid "Define the used OSD theme."
-msgstr ""
+msgstr "Kasutatava teema m<><6D>ritlemine."
 
 msgid "Position"
 msgstr "Positsioon"
 
 msgid "Define the position of OSD."
-msgstr ""
+msgstr "Ekraaniinfo positsiooni m<><6D>ritlemine."
 
-msgid "Define the height of OSD."
-msgstr ""
+msgid "Downscale OSD size [%]"
+msgstr "Ekraanimen<EFBFBD><EFBFBD> v<>hendamine [%]"
 
-msgid "Horizontal offset"
-msgstr "Horisontaalne nihe"
-
-msgid "Define the horizontal offset of OSD."
-msgstr ""
+msgid "Define the downscale ratio for OSD size."
+msgstr "Ekraanimen<EFBFBD><EFBFBD> suuruse v<>hendamise m<><6D>ritlemine"
 
 msgid "Red limit [%]"
 msgstr "Punase limiit [%]"
 
 msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr ""
+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 ""
+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 ""
+msgstr "Ekraaniinfo uuendamise intervalli m<><6D>ritlemine. V<>iksem intervall- suurem CPU koormus."
 
 msgid "Analyze stream"
 msgstr "Voo anal<61><6C>s"
 
 msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr ""
+msgstr "DVB voo bitikiiruse rehkendamise m<><6D>ritlemine."
 
 msgid "Calculation interval [0.1s]"
-msgstr "Kalkulatsiooni intervall [0,1s]"
+msgstr "Arvutamise intervall [0,1s]"
 
 msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr ""
+msgstr "Arvutamise intervalli m<><6D>ritlemine. Suurem intervall annab stabiilsemaid tulemusi."
 
 msgid "Use SVDRP service"
-msgstr ""
+msgstr "SVDRP teenus"
 
 msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr ""
+msgstr "SVDRP teenuse klient/server seadete m<><6D>ritlemine."
 
 msgid "SVDRP service port"
-msgstr ""
+msgstr "SVDRP port"
 
 msgid "Define the port number of SVDRP service."
-msgstr ""
+msgstr "SVDRP teenuse pordi m<><6D>ritlemine."
 
 msgid "SVDRP service IP"
-msgstr ""
+msgstr "SVDRP IP"
 
 msgid "Define the IP address of SVDRP service."
-msgstr ""
+msgstr "SVDRP teenuse IP aadressi m<><6D>ritlemine."
 
 msgid "Help"
-msgstr ""
+msgstr "Abi"
 
 msgid "Video"
 msgstr "Video"
@@ -177,17 +178,20 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitikiirus"
+
 msgid "Stream Information"
-msgstr "Voo info"
+msgstr "Vooinfo"
 
 msgid "Video Stream"
 msgstr "Videovoog"
 
 msgid "Codec"
-msgstr ""
-
-msgid "Bitrate"
-msgstr "Bitikiirus"
+msgstr "Koodek"
 
 msgid "Aspect Ratio"
 msgstr "K<>lgsuhe"
@@ -205,7 +209,7 @@ msgid "Audio Stream"
 msgstr "Audiovoog"
 
 msgid "Channel Mode"
-msgstr ""
+msgstr "Kanalimoodus"
 
 msgid "Sampling Frequency"
 msgstr "S<>mplimissagedus"
@@ -231,12 +235,6 @@ msgstr "Dolby Surround'i t
 msgid "Low Frequency Effects"
 msgstr "LFE kanal"
 
-msgid "on"
-msgstr "Sees"
-
-msgid "off"
-msgstr "V<>ljas"
-
 msgid "Dialogue Normalization"
 msgstr "Dialoogi normalisatsioon"
 
@@ -244,64 +242,67 @@ msgid "Fixed"
 msgstr "Fikseeritud"
 
 msgid "Analog"
-msgstr ""
+msgstr "Analoog"
 
 msgid "MPEG-2"
-msgstr ""
+msgstr "MPEG-2"
 
 msgid "H.264"
-msgstr ""
+msgstr "H.264"
 
 msgid "MPEG-1 Layer I"
-msgstr ""
+msgstr "MPEG-1 Layet I"
 
 msgid "MPEG-1 Layer II"
-msgstr ""
+msgstr "MPEG-1 Layer II"
 
 msgid "MPEG-1 Layer III"
-msgstr ""
+msgstr "MPEG-1 Layer III"
 
 msgid "MPEG-2 Layer I"
-msgstr ""
+msgstr "MPEG-2 Layer I"
 
 msgid "MPEG-2 Layer II"
-msgstr ""
+msgstr "MPEG-2 Layer II"
 
 msgid "MPEG-2 Layer III"
-msgstr ""
+msgstr "MPEG-2 Layer III"
 
 msgid "HE-AAC"
-msgstr ""
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
 
 msgid "stereo"
-msgstr ""
+msgstr "stereo"
 
 msgid "joint Stereo"
-msgstr ""
+msgstr "joint stereo"
 
 msgid "dual"
-msgstr ""
+msgstr "duaalne"
 
 msgid "mono"
-msgstr ""
+msgstr "mono"
 
 msgid "interlaced"
-msgstr ""
+msgstr "<EFBFBD>lerealaotus"
 
 msgid "progressive"
-msgstr ""
+msgstr "progressiivne"
 
 msgid "reserved"
-msgstr "reserveeritud"
+msgstr "reserv."
 
 msgid "extended"
-msgstr ""
+msgstr "laiendatud"
 
 msgid "unknown"
 msgstr "tundmatu"
 
 msgid "component"
-msgstr ""
+msgstr "komponentne"
 
 msgid "PAL"
 msgstr "PAL"
@@ -310,10 +311,10 @@ msgid "NTSC"
 msgstr "NTSC"
 
 msgid "SECAM"
-msgstr ""
+msgstr "SECAM"
 
 msgid "MAC"
-msgstr ""
+msgstr "MAC"
 
 msgid "Hz"
 msgstr "Hz"
@@ -346,10 +347,10 @@ msgid "Karaoke"
 msgstr "Karaoke"
 
 msgid "Ch1"
-msgstr "Kan. 1"
+msgstr "Kan.1"
 
 msgid "Ch2"
-msgstr "Kan. 2"
+msgstr "Kan.2"
 
 msgid "C"
 msgstr "C"

po/fi_FI.po

@@ -1,16 +1,17 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Rolf Ahrenberg
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,6 +64,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"
 
+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Piilota valinta päävalikosta"
 
@@ -87,14 +91,11 @@ msgstr "Sijainti"
 msgid "Define the position of OSD."
 msgstr "Määrittele näytön sijainti."
 
-msgid "Define the height of OSD."
-msgstr "Määrittele näytön korkeus."
+msgid "Downscale OSD size [%]"
+msgstr "Pienennä näytön kokoa [%]"
 
-msgid "Horizontal offset"
-msgstr "Vaakakeskitys"
-
-msgid "Define the horizontal offset of OSD."
-msgstr "Määrittele näytön vaakakeskitys."
+msgid "Define the downscale ratio for OSD size."
+msgstr "Määrittele näytön pienennyssuhde."
 
 msgid "Red limit [%]"
 msgstr "Punaisen taso [%]"
@@ -169,7 +170,7 @@ msgid "Nid"
 msgstr "Verkko-ID"
 
 msgid "Tid"
-msgstr "Lähete-ID"
+msgstr "TS-ID"
 
 msgid "Rid"
 msgstr "Radio-ID"
@@ -177,6 +178,12 @@ msgstr "Radio-ID"
 msgid "Coderate"
 msgstr "Suojaustaso"
 
+msgid "Protocol"
+msgstr "Protokolla"
+
+msgid "Bitrate"
+msgstr "Bittinopeus"
+
 msgid "Stream Information"
 msgstr "Lähetteen tiedot"
 
@@ -186,9 +193,6 @@ msgstr "Kuvaraita"
 msgid "Codec"
 msgstr "Koodekki"
 
-msgid "Bitrate"
-msgstr "Bittinopeus"
-
 msgid "Aspect Ratio"
 msgstr "Kuvasuhde"
 
@@ -231,12 +235,6 @@ msgstr "Dolby Surround -tehoste"
 msgid "Low Frequency Effects"
 msgstr "LFE-kanava"
 
-msgid "on"
-msgstr "päällä"
-
-msgid "off"
-msgstr "poissa"
-
 msgid "Dialogue Normalization"
 msgstr "Dialogin normalisointi"
 
@@ -273,6 +271,9 @@ msgstr "MPEG-2 kerros III"
 msgid "HE-AAC"
 msgstr "HE-AAC"
 
+msgid "LATM"
+msgstr "LATM"
+
 msgid "stereo"
 msgstr "stereo"
 

po/fr_FR.po

@@ -1,25 +1,28 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Nicolas Huillard
+# Michaël Nival <mnival@club-internet.fr>, 2010
+# Bernard Jaulin <bernard.jaulin@gmail.com>, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2008-01-26 09:59+0100\n"
-"Last-Translator: NIVAL Micha<68>l <mnival@club-internet.fr>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
+"Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
+"Language-Team: French <vdr@linuxtv.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "DVB Signal Information Monitor (OSD)"
-msgstr "Affiche les informations du signal DVB"
+msgstr "Moniteur sur le signal DVB"
 
 msgid "Signal Information"
-msgstr "Signal DVB"
+msgstr "Infos sur le signal DVB"
 
 msgid "Femon not available"
 msgstr "Femon n'est pas disponible"
@@ -63,98 +66,98 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"
 
+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Masquer dans le menu principal"
 
 msgid "Define whether the main menu entry is hidden."
-msgstr "D<EFBFBD>finit si l'entr<EFBFBD>e doit <EFBFBD>tre masqu<EFBFBD>e dans le menu principal."
+msgstr "Définit si l'entrée doit être masquée dans le menu principal."
 
 msgid "Default display mode"
-msgstr "Affichage par d<EFBFBD>faut"
+msgstr "Affichage par défaut"
 
 msgid "Define the default display mode at startup."
-msgstr "D<EFBFBD>finit l'affichage par d<EFBFBD>faut au d<EFBFBD>marrage."
+msgstr "Définit l'affichage par défaut au démarrage."
 
 msgid "Define the used OSD skin."
-msgstr "D<EFBFBD>finit le skin OSD <EFBFBD> utiliser."
+msgstr "Définit le skin OSD à utiliser."
 
 msgid "Define the used OSD theme."
-msgstr "D<EFBFBD>finit le th<EFBFBD>me OSD <EFBFBD> utiliser."
+msgstr "Définit le thème OSD à utiliser."
 
 msgid "Position"
 msgstr "Position"
 
 msgid "Define the position of OSD."
-msgstr "D<EFBFBD>finit la position de l'OSD."
+msgstr "Définit la position de l'OSD."
 
-msgid "Define the height of OSD."
-msgstr "D<EFBFBD>finit l'hauteur de l'OSD."
+msgid "Downscale OSD size [%]"
+msgstr "Réduit la taille de l'OSD (%)"
 
-msgid "Horizontal offset"
-msgstr "D<EFBFBD>placement horizontal"
-
-msgid "Define the horizontal offset of OSD."
-msgstr "D<>finit le d<>placement horizontal de l'OSD."
+msgid "Define the downscale ratio for OSD size."
+msgstr "Définit le ration de réduction de l'OSD."
 
 msgid "Red limit [%]"
 msgstr "Limite du rouge (%)"
 
 msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr "D<EFBFBD>finit la limite de la barre rouge, qui est utilis<EFBFBD> pour indiquer un mauvais signal."
+msgstr "Définit la limite de la barre rouge, qui est utilisé pour indiquer un mauvais signal."
 
 msgid "Green limit [%]"
 msgstr "Limite du vert (%)"
 
 msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr "D<EFBFBD>finit la limite de la barre rouge, qui est utilis<EFBFBD> pour indiquer un bon signal."
+msgstr "Définit la limite de la barre rouge, qui est utilisé pour indiquer un bon signal."
 
 msgid "OSD update interval [0.1s]"
-msgstr "Intervalle de mise <EFBFBD> jour (0,1s)"
+msgstr "Intervalle de mise à jour (0,1s)"
 
 msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "D<EFBFBD>finit l'intervalle de mise <EFBFBD> jour de l'OSD. Un petit intervalle g<EFBFBD>n<EFBFBD>re une charge CPU plus importante."
+msgstr "Définit l'intervalle de mise à jour de l'OSD. Un petit intervalle génère une charge CPU plus importante."
 
 msgid "Analyze stream"
 msgstr "Analyser le flux"
 
 msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "D<EFBFBD>finit si le flux DVB est analys<EFBFBD> et le bitrates calcul<EFBFBD>."
+msgstr "Définit si le flux DVB est analysé et le taux d'échantillonnage fixe calculé."
 
 msgid "Calculation interval [0.1s]"
 msgstr "Intervalle de calcul (0,1s)"
 
 msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "D<EFBFBD>finit l'intervalle de cacul. Un plus grand intervalle g<EFBFBD>n<EFBFBD>re une valeur plus stable."
+msgstr "Définit l'intervalle de cacul. Un plus grand intervalle génère une valeur plus stable."
 
 msgid "Use SVDRP service"
 msgstr "Utiliser le service SVDRP"
 
 msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "D<EFBFBD>finit si le service SVDRP est utilis<EFBFBD> en configuration client/serveur."
+msgstr "Définit si le service SVDRP est utilisé dans la configuration client/serveur."
 
 msgid "SVDRP service port"
 msgstr "Port du service SVDRP"
 
 msgid "Define the port number of SVDRP service."
-msgstr "D<EFBFBD>finit le port d'<EFBFBD>coute du service SVDRP."
+msgstr "Définit le port d'écoute du service SVDRP."
 
 msgid "SVDRP service IP"
 msgstr "IP du service SVDRP"
 
 msgid "Define the IP address of SVDRP service."
-msgstr "D<EFBFBD>finit l'adresse IP du service SVDRP."
+msgstr "Définit l'adresse IP du service SVDRP."
 
 msgid "Help"
 msgstr "Aide"
 
 msgid "Video"
-msgstr "Vid<EFBFBD>o"
+msgstr "Vidéo"
 
 msgid "Audio"
 msgstr "Audio"
 
 msgid "Transponder Information"
-msgstr "Information transpondeur"
+msgstr "Information du transpondeur"
 
 msgid "Apid"
 msgstr "Apid"
@@ -177,38 +180,41 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
-msgid "Stream Information"
-msgstr "Information flux"
-
-msgid "Video Stream"
-msgstr "Flux vid<69>o"
-
-msgid "Codec"
-msgstr ""
+msgid "Protocol"
+msgstr "Protocole"
 
 msgid "Bitrate"
-msgstr "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 "Proportions d'image"
+msgstr "Format de l'image"
 
 msgid "Frame Rate"
-msgstr "Rafra<EFBFBD>chissement"
+msgstr "Rafraîchissement"
 
 msgid "Video Format"
-msgstr "Standard vid<EFBFBD>o"
+msgstr "Standard vidéo"
 
 msgid "Resolution"
-msgstr "R<EFBFBD>solution"
+msgstr "Résolution"
 
 msgid "Audio Stream"
 msgstr "Flux audio"
 
 msgid "Channel Mode"
-msgstr ""
+msgstr "Mode chaîne"
 
 msgid "Sampling Frequency"
-msgstr "Fr<EFBFBD>quence d'<EFBFBD>chantillonage"
+msgstr "Fréquence d'échantillonage"
 
 msgid "AC-3 Stream"
 msgstr "Flux AC-3"
@@ -231,12 +237,6 @@ msgstr "Mode Dolby Surround"
 msgid "Low Frequency Effects"
 msgstr "Effets de basses"
 
-msgid "on"
-msgstr "Oui"
-
-msgid "off"
-msgstr "Non"
-
 msgid "Dialogue Normalization"
 msgstr "Normalisation des dialogues"
 
@@ -247,61 +247,64 @@ msgid "Analog"
 msgstr "Analogique"
 
 msgid "MPEG-2"
-msgstr ""
+msgstr "MPEG-2"
 
 msgid "H.264"
-msgstr ""
+msgstr "H.264"
 
 msgid "MPEG-1 Layer I"
-msgstr ""
+msgstr "MPEG-1 Layer I"
 
 msgid "MPEG-1 Layer II"
-msgstr ""
+msgstr "MPEG-1 Layer II"
 
 msgid "MPEG-1 Layer III"
-msgstr ""
+msgstr "MPEG-1 Layer III"
 
 msgid "MPEG-2 Layer I"
-msgstr ""
+msgstr "MPEG-2 Layer I"
 
 msgid "MPEG-2 Layer II"
-msgstr ""
+msgstr "MPEG-2 Layer II"
 
 msgid "MPEG-2 Layer III"
-msgstr ""
+msgstr "MPEG-2 Layer III"
 
 msgid "HE-AAC"
-msgstr ""
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
 
 msgid "stereo"
-msgstr ""
+msgstr "stéréo"
 
 msgid "joint Stereo"
-msgstr ""
+msgstr "joint Stereo"
 
 msgid "dual"
-msgstr ""
+msgstr "double"
 
 msgid "mono"
-msgstr ""
+msgstr "mono"
 
 msgid "interlaced"
-msgstr ""
+msgstr "entrelacé"
 
 msgid "progressive"
-msgstr ""
+msgstr "progressif"
 
 msgid "reserved"
-msgstr "r<EFBFBD>serv<EFBFBD>"
+msgstr "réservé"
 
 msgid "extended"
-msgstr ""
+msgstr "étendu"
 
 msgid "unknown"
 msgstr "inconnu"
 
 msgid "component"
-msgstr ""
+msgstr "composant"
 
 msgid "PAL"
 msgstr "PAL"
@@ -310,10 +313,10 @@ msgid "NTSC"
 msgstr "NTSC"
 
 msgid "SECAM"
-msgstr ""
+msgstr "SECAM"
 
 msgid "MAC"
-msgstr ""
+msgstr "MAC"
 
 msgid "Hz"
 msgstr "Hz"
@@ -373,7 +376,7 @@ msgid "dB"
 msgstr "dB"
 
 msgid "not indicated"
-msgstr "non indiqu<EFBFBD>"
+msgstr "non indiqué"
 
 msgid "MHz"
 msgstr "MHz"

po/hu_HU.po

@@ -0,0 +1,392 @@
+# VDR plugin language source file.
+# Copyright (C) 2007-2015 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# F<>ley Istv<74>n <ifuley at tigercomp dot ro>, 2011
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
+"Last-Translator: F<>ley Istv<74>n <ifuley at tigercomp dot ro>\n"
+"Language-Team: Hungarian <ifuley at tigercomp dot ro>\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Hungarian\n"
+"X-Poedit-Country: HUNGARY\n"
+"X-Poedit-SourceCharset: iso-8859-2\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "DVB jelszint monitor (OSD)"
+
+msgid "Signal Information"
+msgstr "Jel inform<72>ci<63>"
+
+msgid "Femon not available"
+msgstr "Femon nem el<65>rhet<65>"
+
+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<EFBFBD>tk<74>k"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "K<>tsz<73>n<EFBFBD> (duotone)"
+
+msgid "SilverGreen"
+msgstr "Ez<45>st-z<>ld"
+
+msgid "PearlHD"
+msgstr "PearlHD"
+
+msgid "Hide main menu entry"
+msgstr "Men<65>bejegyz<79>s elrejt<6A>se"
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "Meghat<61>rozza, hogy megjelenjen-e a f<>men<65>ben."
+
+msgid "Default display mode"
+msgstr "Alap<61>rtelmezett megjelen<65>t<EFBFBD>si m<>d"
+
+msgid "Define the default display mode at startup."
+msgstr "Bekapcsol<6F>skor melyik megjelen<65>t<EFBFBD>si m<>ddal induljon."
+
+msgid "Define the used OSD skin."
+msgstr "Az OSD b<>r kiv<69>laszt<7A>sa."
+
+msgid "Define the used OSD theme."
+msgstr "Az OSD t<>ma kiv<69>laszt<7A>sa."
+
+msgid "Position"
+msgstr "Elhelyez<65>s"
+
+msgid "Define the position of OSD."
+msgstr "A k<>perny<6E>elhelyez<65>s kiv<69>laszt<7A>sa"
+
+msgid "Downscale OSD size [%]"
+msgstr "Az OSD lem<65>retez<65>se [%]"
+
+msgid "Define the downscale ratio for OSD size."
+msgstr "Az OSD m<>ret<65>nek lem<65>retez<65>se sz<73>zal<61>kban."
+
+msgid "Red limit [%]"
+msgstr "Piros sz<73>nt hat<61>ra [%]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "A piros s<>v hat<61>r<EFBFBD>nak be<62>ll<6C>t<EFBFBD>sa, ezt haszn<7A>ljuk a nem el<65>gs<67>ges jelszint kijelz<6C>s<EFBFBD>hez."
+
+msgid "Green limit [%]"
+msgstr "Z<>ld sz<73>nt hat<61>ra [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "A z<>ld s<>v hat<61>r<EFBFBD>nak be<62>ll<6C>t<EFBFBD>sa, ezt haszn<7A>ljuk az el<65>gs<67>ges jelszint kijelz<6C>s<EFBFBD>hez."
+
+msgid "OSD update interval [0.1s]"
+msgstr "OSD friss<73>t<EFBFBD>s<EFBFBD>nek gyakoris<69>ga [0.1mp]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "Meghat<61>rozza, hogy milyen gyakran legyen friss<73>tve az OSD. Kisebb intervallum nagyobb CPU terhel<65>st eredm<64>nyez."
+
+msgid "Analyze stream"
+msgstr "Adatfolyam (stream) elemz<6D>se."
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "Meghat<61>rozza, hogy a DVB adatfolyam elemz<6D>sre ker<65>lj<6C>n-e, <20>s sz<73>mol<6F>djon-e bitr<74>ta."
+
+msgid "Calculation interval [0.1s]"
+msgstr "Sz<53>m<EFBFBD>t<EFBFBD>s gyakoris<69>ga [0.1mp]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "Meghat<61>rozza, hogy milyen gyakran t<>rt<72>njen sz<73>m<EFBFBD>t<EFBFBD>s. Nagyobb intervallum pontosabb <20>rt<72>keket eredm<64>nyez."
+
+msgid "Use SVDRP service"
+msgstr "SVDRP szolg<6C>ltat<61>s haszn<7A>lata."
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "Ki-bekapcsolja az SVDRP szolg<6C>ltat<61>st, amely kliens-szerver k<>rnyezetben haszn<7A>latos."
+
+msgid "SVDRP service port"
+msgstr "Az SVDRP szolg<6C>ltat<61>s portja"
+
+msgid "Define the port number of SVDRP service."
+msgstr "Meghat<61>rozza, hogy melyik porton fut az SVDRP."
+
+msgid "SVDRP service IP"
+msgstr "Az SVDRP szolg<6C>ltat<61>s IP-je"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "Meghat<61>rozza, hogy milyen IP c<>men fut az SVDRP szolg<6C>ltat<61>s."
+
+msgid "Help"
+msgstr "Seg<65>ts<74>g"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Transponder Information"
+msgstr "Transponder inf<6E>"
+
+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 "Bitr<74>ta"
+
+msgid "Stream Information"
+msgstr "Adatfolyam inf<6E>"
+
+msgid "Video Stream"
+msgstr "Vide<64> adatfolyam"
+
+msgid "Codec"
+msgstr "Kodek"
+
+msgid "Aspect Ratio"
+msgstr "M<>retar<61>ny"
+
+msgid "Frame Rate"
+msgstr "K<>pfriss<73>t<EFBFBD>s"
+
+msgid "Video Format"
+msgstr "Vide<64> form<72>tum"
+
+msgid "Resolution"
+msgstr "Felbont<6E>s"
+
+msgid "Audio Stream"
+msgstr "Hang adatfolyam"
+
+msgid "Channel Mode"
+msgstr "Hangs<67>v m<>d"
+
+msgid "Sampling Frequency"
+msgstr "Mintav<61>telez<65>si frekvencia"
+
+msgid "AC-3 Stream"
+msgstr "AC-3 adatfolyam"
+
+msgid "Bit Stream Mode"
+msgstr "Bit Stream m<>d"
+
+msgid "Audio Coding Mode"
+msgstr "Hang k<>dol<6F>si m<>d"
+
+msgid "Center Mix Level"
+msgstr "K<>z<EFBFBD>pcsatorna kever<65>si jelszintje"
+
+msgid "Surround Mix Level"
+msgstr "T<>rhat<61>s csatorna kever<65>si szintje"
+
+msgid "Dolby Surround Mode"
+msgstr "Dolby Surround m<>d"
+
+msgid "Low Frequency Effects"
+msgstr "LFE - alacsony frekvenci<63>s effektek"
+
+msgid "Dialogue Normalization"
+msgstr "P<>rbesz<73>d jelszint normaliz<69>l<EFBFBD>sa"
+
+msgid "Fixed"
+msgstr "<22>lland<6E>"
+
+msgid "Analog"
+msgstr "analog"
+
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layer I"
+
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"
+
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"
+
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"
+
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"
+
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"
+
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
+
+msgid "stereo"
+msgstr "sztere<72>"
+
+msgid "joint Stereo"
+msgstr "joint sztere<72>"
+
+msgid "dual"
+msgstr "du<64>l"
+
+msgid "mono"
+msgstr "mon<6F>"
+
+msgid "interlaced"
+msgstr "v<>ltotts<74>vos"
+
+msgid "progressive"
+msgstr "progressz<73>v"
+
+msgid "reserved"
+msgstr "fenntartott"
+
+msgid "extended"
+msgstr "kiterjesztett"
+
+msgid "unknown"
+msgstr "ismeretlen"
+
+msgid "component"
+msgstr "komponens"
+
+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 "Mestercsatorna (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Zene <20>s effektek (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "L<>t<EFBFBD>sk<73>rosultak (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "Hall<6C>sk<73>rosultak (HI)"
+
+msgid "Dialogue (D)"
+msgstr "P<>rbesz<73>d (D)"
+
+msgid "Commentary (C)"
+msgstr "Narr<72>ci<63> (C)"
+
+msgid "Emergency (E)"
+msgstr "S<>rg<72>ss<73>gi (E)"
+
+msgid "Voice Over (VO)"
+msgstr "R<>besz<73>l<EFBFBD>s (VO)"
+
+msgid "Karaoke"
+msgstr "Karaoke"
+
+msgid "Ch1"
+msgstr "Ch1"
+
+msgid "Ch2"
+msgstr "Ch2"
+
+msgid "C"
+msgstr "K"
+
+msgid "L"
+msgstr "B"
+
+msgid "R"
+msgstr "J"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "BS"
+
+msgid "SR"
+msgstr "JS"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "nincs felt<6C>ntetve"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "free"
+msgstr "szabad"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"

po/it_IT.po

@@ -1,20 +1,24 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2015 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: femon 1.7.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2008-11-10 23:37+0100\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
+"Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Italian\n"
+"X-Poedit-Country: ITALY\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Mostra info segnale DVB (OSD)"
@@ -64,17 +68,20 @@ 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 <EFBFBD> nascosta."
+msgstr "Definisci se la voce del menu principale è nascosta."
 
 msgid "Default display mode"
-msgstr "Modalit<EFBFBD> visualizz. predefinita"
+msgstr "Modalità visualizz. predefinita"
 
 msgid "Define the default display mode at startup."
-msgstr "Definisci la modalit<EFBFBD> di visualizz. predefinita all'avvio."
+msgstr "Definisci la modalità di visualizz. predefinita all'avvio."
 
 msgid "Define the used OSD skin."
 msgstr "Definisci lo stile interfaccia OSD utilizzato."
@@ -88,14 +95,11 @@ msgstr "Posizione"
 msgid "Define the position of OSD."
 msgstr "Definisci la posizione dell'OSD."
 
-msgid "Define the height of OSD."
-msgstr "Definisci l'altezza dell'OSD."
+msgid "Downscale OSD size [%]"
+msgstr "Riduci dimensione OSD [%]"
 
-msgid "Horizontal offset"
-msgstr "Limite orizzontale"
-
-msgid "Define the horizontal offset of OSD."
-msgstr "Definisci il limite orizzontale dell'OSD."
+msgid "Define the downscale ratio for OSD size."
+msgstr "Definisci il rapporto di riduzione della dimensione OSD."
 
 msgid "Red limit [%]"
 msgstr "Limite rosso [%]"
@@ -113,19 +117,19 @@ 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<EFBFBD> piccolo <EFBFBD> l'intervallo maggiore sar<EFBFBD> l'uso di CPU."
+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 <EFBFBD> analizzato e i bitrate calcolati."
+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<EFBFBD> grande genera valori pi<EFBFBD> stabili."
+msgstr "Definisci un intervallo di calcolo. L'intervallo più grande genera valori più stabili."
 
 msgid "Use SVDRP service"
 msgstr "Utilizza servizio SVDRP"
@@ -178,6 +182,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
 msgid "Stream Information"
 msgstr "Informazioni flusso"
 
@@ -187,9 +197,6 @@ msgstr "Flusso video"
 msgid "Codec"
 msgstr "Codifica"
 
-msgid "Bitrate"
-msgstr "Bitrate"
-
 msgid "Aspect Ratio"
 msgstr "Formato immagine"
 
@@ -206,7 +213,7 @@ msgid "Audio Stream"
 msgstr "Flusso audio"
 
 msgid "Channel Mode"
-msgstr "Modalit<EFBFBD> canale"
+msgstr "Modalità canale"
 
 msgid "Sampling Frequency"
 msgstr "Frequenza campionamento"
@@ -215,10 +222,10 @@ msgid "AC-3 Stream"
 msgstr "Flusso AC-3"
 
 msgid "Bit Stream Mode"
-msgstr "Modalit<EFBFBD> bitstream"
+msgstr "Modalità bitstream"
 
 msgid "Audio Coding Mode"
-msgstr "Modalit<EFBFBD> codifica audio"
+msgstr "Modalità codifica audio"
 
 msgid "Center Mix Level"
 msgstr "Livello sonoro centrale"
@@ -227,17 +234,11 @@ msgid "Surround Mix Level"
 msgstr "Livello sonoro surround"
 
 msgid "Dolby Surround Mode"
-msgstr "Modalit<EFBFBD> Dolby Surround"
+msgstr "Modalità Dolby Surround"
 
 msgid "Low Frequency Effects"
 msgstr "Effetti bassa frequenza"
 
-msgid "on"
-msgstr "Attivo"
-
-msgid "off"
-msgstr "Disattivo"
-
 msgid "Dialogue Normalization"
 msgstr "Normalizzazione dialoghi"
 
@@ -274,6 +275,9 @@ msgstr "MPEG-2 Layer III"
 msgid "HE-AAC"
 msgstr "HE-AAC"
 
+msgid "LATM"
+msgstr "LATM"
+
 msgid "stereo"
 msgstr "stereo"
 

po/lt_LT.po

@@ -0,0 +1,389 @@
+# VDR plugin language source file.
+# Copyright (C) 2007-2015 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Valdemaras Pipiras
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
+"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
+"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
+"Language: lt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "DVB signalo stebėjimas (OSD)"
+
+msgid "Signal Information"
+msgstr "Signalo informacija"
+
+msgid "Femon not available"
+msgstr "Femon įskiepas nepasiekiamas"
+
+msgid "basic"
+msgstr "Standartinis"
+
+msgid "transponder"
+msgstr "Siųstuvas"
+
+msgid "stream"
+msgstr "Srautas"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Klasikinis"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
+msgid "DeepBlue"
+msgstr "Tamsiai mėlyna"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "Sidabro žalia"
+
+msgid "PearlHD"
+msgstr "PearlHD"
+
+msgid "Hide main menu entry"
+msgstr "Paslėpti pagrindinio meniu įrašus"
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "Nustatyti pagrindinio meniu įrašų paslėpimą."
+
+msgid "Default display mode"
+msgstr "Numatytasis rodymo būdas"
+
+msgid "Define the default display mode at startup."
+msgstr "Nustatyti numatytąjį rodymo būdą paleidžiant."
+
+msgid "Define the used OSD skin."
+msgstr "Nustatyti naudojamą ekrano apvalkalą."
+
+msgid "Define the used OSD theme."
+msgstr "Nustatyti naudojamą ekrano temą."
+
+msgid "Position"
+msgstr "Pozicija"
+
+msgid "Define the position of OSD."
+msgstr "Nustatyti ekrano užsklandos poziciją."
+
+msgid "Downscale OSD size [%]"
+msgstr "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 "Red limit [%]"
+msgstr "Raudonoji ribą [%]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "Nustatyti raudonos juostos ribą, kuri naudojama blogo signalo indikacijai."
+
+msgid "Green limit [%]"
+msgstr "Žalioji riba [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "Nustatyti žalios juostos ribą, kuri naudojama gero signalo indikacijai."
+
+msgid "OSD update interval [0.1s]"
+msgstr "Ekrano užsklandos atnaujinimo intervalas [0.1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "Nustatyti ekrano užsklandos atnaujinimo intervalą. Mažesnis intervalas labiau apkrauna centrinį procesorių (CPU)."
+
+msgid "Analyze stream"
+msgstr "Analizuoti srautą"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "Nurodyti ar DVB srautas turi būti analizuojamas bei jo kokybė išskaičiuojama."
+
+msgid "Calculation interval [0.1s]"
+msgstr "Apskaitos intervalos [0.1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "Nustatyti apskaitos intervalą. Kuo didesnis intervalas, tuo tikslesni duomenys."
+
+msgid "Use SVDRP service"
+msgstr "Naudoti SVDRP paslaugą"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "Nurodyti ar SVDRP paslauga naudojama kliento/serverio nustatymuose."
+
+msgid "SVDRP service port"
+msgstr "SVDRP įrenginio portas"
+
+msgid "Define the port number of SVDRP service."
+msgstr "Nustatyti SVDRP įrenginio prievadą."
+
+msgid "SVDRP service IP"
+msgstr "SVDRP įrenginio IP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "Nustatyti SVDRP įrenginio IP adresą."
+
+msgid "Help"
+msgstr "Pagalba"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Transponder Information"
+msgstr "Siųstuvo informacija"
+
+msgid "Apid"
+msgstr "Apid"
+
+msgid "Dpid"
+msgstr "Dpid"
+
+msgid "Spid"
+msgstr "Spid"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Coderate"
+msgstr "Kodavimo dažnis"
+
+msgid "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 "Fixed"
+msgstr "Sutvarkyta"
+
+msgid "Analog"
+msgstr "Analoginis"
+
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layer I"
+
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"
+
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"
+
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"
+
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"
+
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"
+
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
+
+msgid "stereo"
+msgstr "stereo"
+
+msgid "joint Stereo"
+msgstr "jungtinis stereo"
+
+msgid "dual"
+msgstr "dvigubas"
+
+msgid "mono"
+msgstr "mono"
+
+msgid "interlaced"
+msgstr "persipynęs (interlaced)"
+
+msgid "progressive"
+msgstr "progresyvinis"
+
+msgid "reserved"
+msgstr "rezervuota"
+
+msgid "extended"
+msgstr "išplėstas"
+
+msgid "unknown"
+msgstr "nežinomas"
+
+msgid "component"
+msgstr "komponentas"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Complete Main (CM)"
+msgstr "Pilnai pagrindinis (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Muzika ir efektai (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "Skirta silpnaregiams (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "Skirta žmoniems su klausos negalia (HI)"
+
+msgid "Dialogue (D)"
+msgstr "Dialogas (D)"
+
+msgid "Commentary (C)"
+msgstr "Komentarai (C)"
+
+msgid "Emergency (E)"
+msgstr "Avarinis (E)"
+
+msgid "Voice Over (VO)"
+msgstr "Įgarsinta (VO)"
+
+msgid "Karaoke"
+msgstr "Karaoke"
+
+msgid "Ch1"
+msgstr "Kan1"
+
+msgid "Ch2"
+msgstr "Kan2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "K"
+
+msgid "R"
+msgstr "D"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SL"
+
+msgid "SR"
+msgstr "SR"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "nerasta"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "free"
+msgstr "nekoduota"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"

po/ru_RU.po

@@ -1,16 +1,17 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2015 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Vyacheslav Dikonov
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: femon 1.7.0\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
 "Last-Translator: Vyacheslav Dikonov\n"
-"Language-Team: <vdr@linuxtv.org>\n"
+"Language-Team: Russian <vdr@linuxtv.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,6 +64,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"
 
+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
 
@@ -87,13 +91,10 @@ msgstr "
 msgid "Define the position of OSD."
 msgstr ""
 
-msgid "Define the height of OSD."
+msgid "Downscale OSD size [%]"
 msgstr ""
 
-msgid "Horizontal offset"
-msgstr ""
-
-msgid "Define the horizontal offset of OSD."
+msgid "Define the downscale ratio for OSD size."
 msgstr ""
 
 msgid "Red limit [%]"
@@ -177,6 +178,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
 msgid "Stream Information"
 msgstr ""
 
@@ -186,9 +193,6 @@ msgstr ""
 msgid "Codec"
 msgstr ""
 
-msgid "Bitrate"
-msgstr ""
-
 msgid "Aspect Ratio"
 msgstr ""
 
@@ -231,12 +235,6 @@ msgstr ""
 msgid "Low Frequency Effects"
 msgstr ""
 
-msgid "on"
-msgstr "<22><><EFBFBD>"
-
-msgid "off"
-msgstr "<22><><EFBFBD><EFBFBD>"
-
 msgid "Dialogue Normalization"
 msgstr ""
 
@@ -273,6 +271,9 @@ msgstr ""
 msgid "HE-AAC"
 msgstr ""
 
+msgid "LATM"
+msgstr ""
+
 msgid "stereo"
 msgstr ""
 

po/sk_SK.po

@@ -0,0 +1,389 @@
+# VDR plugin language source file.
+# Copyright (C) 2007-2015 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Milan Hrala
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\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<72>cie o sign<67>le (OSD)"
+
+msgid "Signal Information"
+msgstr "Inform<72>cie o sign<67>le"
+
+msgid "Femon not available"
+msgstr "Femon nie je k dispoz<6F>cii"
+
+msgid "basic"
+msgstr "<22>tandardtn<74>"
+
+msgid "transponder"
+msgstr "Transpond<6E>r"
+
+msgid "stream"
+msgstr "d<>tov<6F> tok"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Klasick<63>"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
+msgid "DeepBlue"
+msgstr "tmavo modr<64>"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "strieborno zelen<65>"
+
+msgid "PearlHD"
+msgstr "PearlHD"
+
+msgid "Hide main menu entry"
+msgstr "Schova<76> polo<6C>ku v hlavnom menu"
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "Ur<55>ite, <20>i v hlavnom menu bude polo<6C>ka skryt<79>."
+
+msgid "Default display mode"
+msgstr "<22>tandardn<64> re<72>im zobrazenia"
+
+msgid "Define the default display mode at startup."
+msgstr "Zadajte predvolen<65> re<72>im zobrazenia pri spusten<65>."
+
+msgid "Define the used OSD skin."
+msgstr "Zadajte pou<6F>it<69> OSD vzh<7A>ad."
+
+msgid "Define the used OSD theme."
+msgstr "Definujte pou<6F>it<69> OSD t<>mu."
+
+msgid "Position"
+msgstr "Poz<6F>cia"
+
+msgid "Define the position of OSD."
+msgstr "Definujte poz<6F>ciu OSD."
+
+msgid "Downscale OSD size [%]"
+msgstr "Zmen<65>i<EFBFBD> ve<76>kos<6F> OSD [%]"
+
+msgid "Define the downscale ratio for OSD size."
+msgstr "Zadajte zmen<65>enie pomeru pre OSD ve<76>kosti."
+
+msgid "Red limit [%]"
+msgstr "<22>erven<65> limit [%]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "Zadajte limit pre <20>erven<65> pruh , ktor<6F> sa pou<6F><75>va na ozna<6E>enie zl<7A>ho sign<67>lu."
+
+msgid "Green limit [%]"
+msgstr "Zelen<65> limit [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "Zadajte limit pre zelen<65>ho pruhu, ktor<6F> sa pou<6F>ije na ozna<6E>enie dobr<62>ho sign<67>lu."
+
+msgid "OSD update interval [0.1s]"
+msgstr "OSD aktualiza<7A>n<EFBFBD> interval [0.1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "Zadajte interval pre aktualiz<69>cie OSD. Men<65><6E> interval vytv<74>ra vy<76><79>ie za<7A>a<EFBFBD>enie CPU."
+
+msgid "Analyze stream"
+msgstr "Anal<61>za d<>tov<6F>ho toku"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "Zadajte <20>i sa DVB pr<70>d analyzuje a d<>tov<6F> tok vypo<70><6F>ta."
+
+msgid "Calculation interval [0.1s]"
+msgstr "V<>po<70>tov<6F> interval [0.1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "Zadajte interval pre v<>po<70>et. V<><56><EFBFBD><EFBFBD> interval vytv<74>ra stabilnej<65>ie hodnoty."
+
+msgid "Use SVDRP service"
+msgstr "Pou<6F>i<EFBFBD> SVDRP slu<6C>bu"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "Zadajte <20>i sa pou<6F>ije slu<6C>ba SVDRP v klient / server nastaveniach."
+
+msgid "SVDRP service port"
+msgstr "Port SVDRP slu<6C>by"
+
+msgid "Define the port number of SVDRP service."
+msgstr "Zadajte <20><>slo portu slu<6C>by SVDRP."
+
+msgid "SVDRP service IP"
+msgstr "IP SVDRP slu<6C>by"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "zadajte IP adresu slu<6C>by SVDRP."
+
+msgid "Help"
+msgstr "Pomoc"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Audio"
+msgstr "Zvuk"
+
+msgid "Transponder Information"
+msgstr "Inform<72>cie transpond<6E>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<6F> k<>dovania"
+
+msgid "Protocol"
+msgstr "Protokol"
+
+msgid "Bitrate"
+msgstr "D<>tov<6F> tok"
+
+msgid "Stream Information"
+msgstr "Inform<72>cie o d<>tovom toku"
+
+msgid "Video Stream"
+msgstr "Video stopa"
+
+msgid "Codec"
+msgstr "kodek"
+
+msgid "Aspect Ratio"
+msgstr "Pomer str<74>n"
+
+msgid "Frame Rate"
+msgstr "Po<50>et sn<73>mkov"
+
+msgid "Video Format"
+msgstr "Video form<72>t"
+
+msgid "Resolution"
+msgstr "Rozl<7A><6C>enie"
+
+msgid "Audio Stream"
+msgstr "Zvukov<6F> stopa"
+
+msgid "Channel Mode"
+msgstr "re<72>im kan<61>la"
+
+msgid "Sampling Frequency"
+msgstr "Vzorkovacia frekvencia"
+
+msgid "AC-3 Stream"
+msgstr "AC-3 d<>tov<6F> tok"
+
+msgid "Bit Stream Mode"
+msgstr "re<72>im bitov<6F>ho toku"
+
+msgid "Audio Coding Mode"
+msgstr "Re<52><65>m k<>dovania zvuku"
+
+msgid "Center Mix Level"
+msgstr "<22>rove<76> Center mix"
+
+msgid "Surround Mix Level"
+msgstr "<22>rove<76> Surround mix"
+
+msgid "Dolby Surround Mode"
+msgstr "Dolby Surround re<72><65>m"
+
+msgid "Low Frequency Effects"
+msgstr "Basov<6F> efekty"
+
+msgid "Dialogue Normalization"
+msgstr "<22>tandartn<74> dial<61>g"
+
+msgid "Fixed"
+msgstr "Pevn<76>"
+
+msgid "Analog"
+msgstr "Anal<61>g"
+
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+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<65> stereo"
+
+msgid "dual"
+msgstr "dvojit<69>"
+
+msgid "mono"
+msgstr "mono"
+
+msgid "interlaced"
+msgstr "prekladan<61>"
+
+msgid "progressive"
+msgstr "progres<65>vny"
+
+msgid "reserved"
+msgstr "obsaden<65>"
+
+msgid "extended"
+msgstr "roz<6F><7A>ren<65>"
+
+msgid "unknown"
+msgstr "nezn<7A>my"
+
+msgid "component"
+msgstr "s<><73>as<61>"
+
+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<76> (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Hudba a efekty (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "zrakovo postihnut<75> (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "sluchovo postihnut<75> (HI)"
+
+msgid "Dialogue (D)"
+msgstr "Dial<61>g (D)"
+
+msgid "Commentary (C)"
+msgstr "Koment<6E>r (C)"
+
+msgid "Emergency (E)"
+msgstr "Pohotovostn<74> (E)"
+
+msgid "Voice Over (VO)"
+msgstr "Viacvrstvov<6F> hlas (VO)"
+
+msgid "Karaoke"
+msgstr "Karaoke"
+
+msgid "Ch1"
+msgstr "kan<61>l1"
+
+msgid "Ch2"
+msgstr "kan<61>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<65>"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "free"
+msgstr "vo<76>n<EFBFBD>"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"

po/uk_UA.po

@@ -0,0 +1,389 @@
+# Ukrainian translation.
+# Copyright (C) 2010 The Claws Mail Team
+# This file is distributed under the same license as the claws-mail package.
+# Yarema aka Knedlyk <yupadmin@gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-femon 2.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\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"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "Монітор інформації про DVB сигнал"
+
+msgid "Signal Information"
+msgstr "Інформація про сигнал"
+
+msgid "Femon not available"
+msgstr "Femon не доступний"
+
+msgid "basic"
+msgstr "основне"
+
+msgid "transponder"
+msgstr "транспондер"
+
+msgid "stream"
+msgstr "потік"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Класичний"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "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 "Аудіо"
+
+msgid "Transponder Information"
+msgstr "Інформація про транспондер"
+
+msgid "Apid"
+msgstr "Apid"
+
+msgid "Dpid"
+msgstr "Dpid"
+
+msgid "Spid"
+msgstr "Spid"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Coderate"
+msgstr "Шв. кодування"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Bitrate"
+msgstr "Бітрейт"
+
+msgid "Stream Information"
+msgstr "Інформація про потік"
+
+msgid "Video Stream"
+msgstr "Відео потік"
+
+msgid "Codec"
+msgstr "Кодек"
+
+msgid "Aspect Ratio"
+msgstr "Співвідношення сторін"
+
+msgid "Frame Rate"
+msgstr "Частота кадрів"
+
+msgid "Video Format"
+msgstr "Формат відео"
+
+msgid "Resolution"
+msgstr "Роздільна здатність"
+
+msgid "Audio Stream"
+msgstr "Аудіо потік"
+
+msgid "Channel Mode"
+msgstr "Режим каналу"
+
+msgid "Sampling Frequency"
+msgstr "Частота"
+
+msgid "AC-3 Stream"
+msgstr "AC-3 потік"
+
+msgid "Bit Stream Mode"
+msgstr "Режим бітового потоку:"
+
+msgid "Audio Coding Mode"
+msgstr "Режим кодування малюнка"
+
+msgid "Center Mix Level"
+msgstr "Рівень міксування в центрі"
+
+msgid "Surround Mix Level"
+msgstr "Рівень міксування заповнення"
+
+msgid "Dolby Surround Mode"
+msgstr "Режим Dolby Surround"
+
+msgid "Low Frequency Effects"
+msgstr "Ефекти низької частоти"
+
+msgid "Dialogue Normalization"
+msgstr "Нормалізація гучності"
+
+msgid "Fixed"
+msgstr "Фіксовано"
+
+msgid "Analog"
+msgstr "Аналог."
+
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layer I"
+
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"
+
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"
+
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"
+
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"
+
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"
+
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
+
+msgid "stereo"
+msgstr "стерео"
+
+msgid "joint Stereo"
+msgstr "об’єднане стерео"
+
+msgid "dual"
+msgstr "дуальний"
+
+msgid "mono"
+msgstr "моно"
+
+msgid "interlaced"
+msgstr "черезрядкове"
+
+msgid "progressive"
+msgstr "прогресивне"
+
+msgid "reserved"
+msgstr "зарезервовано"
+
+msgid "extended"
+msgstr "розширено"
+
+msgid "unknown"
+msgstr "невідомо"
+
+msgid "component"
+msgstr "компонентно"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "Гц"
+
+msgid "Complete Main (CM)"
+msgstr "Заповнення основного (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Музика і ефекти (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "Слабозорі (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "Погіршений слух (HI)"
+
+msgid "Dialogue (D)"
+msgstr "Діалог (D)"
+
+msgid "Commentary (C)"
+msgstr "Коментарі (C)"
+
+msgid "Emergency (E)"
+msgstr "Аварійне (E)"
+
+msgid "Voice Over (VO)"
+msgstr "Голос через (VO)"
+
+msgid "Karaoke"
+msgstr "Караоке"
+
+msgid "Ch1"
+msgstr "Кан.1"
+
+msgid "Ch2"
+msgstr "Кан.2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "L"
+
+msgid "R"
+msgstr "R"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SL"
+
+msgid "SR"
+msgstr "Симв.шв."
+
+msgid "dB"
+msgstr "дБ"
+
+msgid "not indicated"
+msgstr "не вказано"
+
+msgid "MHz"
+msgstr "МГц"
+
+msgid "free"
+msgstr "вільний"
+
+msgid "Mbit/s"
+msgstr "Мбіт/c"
+
+msgid "kbit/s"
+msgstr "кбіт/с"

po/zh_CN.po

@@ -0,0 +1,389 @@
+# VDR plugin language source file.
+# Copyright (C) 2007-2015 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.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
+"Last-Translator: NanFeng <nfgx@21cn.com>\n"
+"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "卫星信号信息显示(OSD)"
+
+msgid "Signal Information"
+msgstr "频道信息浏览"
+
+msgid "Femon not available"
+msgstr "Femon插件无法使用"
+
+msgid "basic"
+msgstr "基本"
+
+msgid "transponder"
+msgstr "转发器"
+
+msgid "stream"
+msgstr "数据流"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "经典"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "双色调"
+
+msgid "SilverGreen"
+msgstr "银绿"
+
+msgid "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 "音频"
+
+msgid "Transponder Information"
+msgstr "转发器信息"
+
+msgid "Apid"
+msgstr "Apid"
+
+msgid "Dpid"
+msgstr "Dpid"
+
+msgid "Spid"
+msgstr "Spid"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Coderate"
+msgstr "码速率"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "比特率"
+
+msgid "Stream Information"
+msgstr "流信息"
+
+msgid "Video Stream"
+msgstr "视频流"
+
+msgid "Codec"
+msgstr "解码模式"
+
+msgid "Aspect Ratio"
+msgstr "纵横比"
+
+msgid "Frame Rate"
+msgstr "帧速率"
+
+msgid "Video Format"
+msgstr "视频制式"
+
+msgid "Resolution"
+msgstr "分辨率"
+
+msgid "Audio Stream"
+msgstr "音频流"
+
+msgid "Channel Mode"
+msgstr "声道模式"
+
+msgid "Sampling Frequency"
+msgstr "采样频率"
+
+msgid "AC-3 Stream"
+msgstr "AC-3流"
+
+msgid "Bit Stream Mode"
+msgstr "比特流模式"
+
+msgid "Audio Coding Mode"
+msgstr "音频编码模式"
+
+msgid "Center Mix Level"
+msgstr "中心混合级别"
+
+msgid "Surround Mix Level"
+msgstr "环绕混合级别"
+
+msgid "Dolby Surround Mode"
+msgstr "杜比环绕声模式"
+
+msgid "Low Frequency Effects"
+msgstr "低频效果"
+
+msgid "Dialogue Normalization"
+msgstr "对话正常化"
+
+msgid "Fixed"
+msgstr "固定"
+
+msgid "Analog"
+msgstr "模拟"
+
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layer I"
+
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"
+
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"
+
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"
+
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"
+
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"
+
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
+
+msgid "stereo"
+msgstr "立体声"
+
+msgid "joint Stereo"
+msgstr "联合立体声"
+
+msgid "dual"
+msgstr "双重"
+
+msgid "mono"
+msgstr "单声道"
+
+msgid "interlaced"
+msgstr "隔行扫描"
+
+msgid "progressive"
+msgstr "进步"
+
+msgid "reserved"
+msgstr "保留"
+
+msgid "extended"
+msgstr "扩展"
+
+msgid "unknown"
+msgstr "未知"
+
+msgid "component"
+msgstr "组件"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "赫兹"
+
+msgid "Complete Main (CM)"
+msgstr "完成主要 (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "音乐和效果 (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "视障 (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "听障 (HI)"
+
+msgid "Dialogue (D)"
+msgstr "对话 (D)"
+
+msgid "Commentary (C)"
+msgstr "评论 (C)"
+
+msgid "Emergency (E)"
+msgstr "紧急 (E)"
+
+msgid "Voice Over (VO)"
+msgstr "旁白 (VO)"
+
+msgid "Karaoke"
+msgstr "卡拉OK"
+
+msgid "Ch1"
+msgstr "Ch1"
+
+msgid "Ch2"
+msgstr "Ch2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "L"
+
+msgid "R"
+msgstr "R"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SL"
+
+msgid "SR"
+msgstr "SR"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "没有说明"
+
+msgid "MHz"
+msgstr "兆赫兹"
+
+msgid "free"
+msgstr "免费"
+
+msgid "Mbit/s"
+msgstr "兆位/秒"
+
+msgid "kbit/s"
+msgstr "千字节/秒"

po/zh_TW.po

@@ -0,0 +1,389 @@
+# VDR plugin language source file. 
+# Copyright (C) 2007-2015 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.2.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2015-02-19 02:19+0200\n"
+"PO-Revision-Date: 2015-02-19 02:19+0200\n"
+"Last-Translator: NanFeng <nfgx@21cn.com>\n"
+"Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "衛星信號信息顯示(OSD)"
+
+msgid "Signal Information"
+msgstr "頻道信息瀏覽"
+
+msgid "Femon not available"
+msgstr "Femon插件無法使用"
+
+msgid "basic"
+msgstr "基本"
+
+msgid "transponder"
+msgstr "轉發器"
+
+msgid "stream"
+msgstr "數據流"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "經典"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "雙色調"
+
+msgid "SilverGreen"
+msgstr "銀綠"
+
+msgid "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 "音頻"
+
+msgid "Transponder Information"
+msgstr "轉發器信息"
+
+msgid "Apid"
+msgstr "Apid"
+
+msgid "Dpid"
+msgstr "Dpid"
+
+msgid "Spid"
+msgstr "Spid"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Coderate"
+msgstr "碼速率"
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "比特率"
+
+msgid "Stream Information"
+msgstr "流信息"
+
+msgid "Video Stream"
+msgstr "視頻流"
+
+msgid "Codec"
+msgstr "解碼模式"
+
+msgid "Aspect Ratio"
+msgstr "縱橫比"
+
+msgid "Frame Rate"
+msgstr "幀速率"
+
+msgid "Video Format"
+msgstr "視頻制式"
+
+msgid "Resolution"
+msgstr "分辨率"
+
+msgid "Audio Stream"
+msgstr "音頻流"
+
+msgid "Channel Mode"
+msgstr "聲道模式"
+
+msgid "Sampling Frequency"
+msgstr "採樣頻率"
+
+msgid "AC-3 Stream"
+msgstr "AC-3流"
+
+msgid "Bit Stream Mode"
+msgstr "比特流模式"
+
+msgid "Audio Coding Mode"
+msgstr "音頻編碼模式"
+
+msgid "Center Mix Level"
+msgstr "中心混合級別"
+
+msgid "Surround Mix Level"
+msgstr "環繞混合級別"
+
+msgid "Dolby Surround Mode"
+msgstr "杜比環繞聲模式"
+
+msgid "Low Frequency Effects"
+msgstr "低頻效果"
+
+msgid "Dialogue Normalization"
+msgstr "對話正常化"
+
+msgid "Fixed"
+msgstr "固定"
+
+msgid "Analog"
+msgstr "模擬"
+
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layer I"
+
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"
+
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"
+
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"
+
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"
+
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"
+
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
+
+msgid "stereo"
+msgstr "立體聲"
+
+msgid "joint Stereo"
+msgstr "聯合立體聲"
+
+msgid "dual"
+msgstr "雙重"
+
+msgid "mono"
+msgstr "單聲道"
+
+msgid "interlaced"
+msgstr "隔行掃描"
+
+msgid "progressive"
+msgstr "進步"
+
+msgid "reserved"
+msgstr "保留"
+
+msgid "extended"
+msgstr "擴展"
+
+msgid "unknown"
+msgstr "未知"
+
+msgid "component"
+msgstr "組件"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "赫茲"
+
+msgid "Complete Main (CM)"
+msgstr "完成主要(CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "音樂和效果(ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "視障(VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "聽障(HI)"
+
+msgid "Dialogue (D)"
+msgstr "對話(D)"
+
+msgid "Commentary (C)"
+msgstr "評論(C)"
+
+msgid "Emergency (E)"
+msgstr "緊急(E)"
+
+msgid "Voice Over (VO)"
+msgstr "旁白(VO)"
+
+msgid "Karaoke"
+msgstr "卡拉OK"
+
+msgid "Ch1"
+msgstr "Ch1"
+
+msgid "Ch2"
+msgstr "Ch2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "L"
+
+msgid "R"
+msgstr "R"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SL"
+
+msgid "SR"
+msgstr "SR"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "沒有說明"
+
+msgid "MHz"
+msgstr "兆赫茲"
+
+msgid "free"
+msgstr "免費"
+
+msgid "Mbit/s"
+msgstr "兆位/秒"
+
+msgid "kbit/s"
+msgstr "千字節/秒"

symbols/eight.xpm

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

symbols/format1080.xpm

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

symbols/format1080i.xpm

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

symbols/format1080p.xpm

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

symbols/format480.xpm

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

symbols/format480i.xpm

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

symbols/format480p.xpm

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

symbols/format576.xpm

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

symbols/format576i.xpm

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

symbols/format576p.xpm

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

symbols/format720.xpm

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

symbols/format720i.xpm

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

symbols/format720p.xpm

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