Updated for vdr-2.1.6.

Refactored the SAT>IP support.
Added support for SAT>IP devices.
2023-10-10 11:36:53 +00:00 · 2014-03-16 17:04:28 +02:00 · 2014-03-15 12:35:49 +02:00 · 2014-03-08 13:28:31 +02:00 · 2014-01-19 00:14:13 +02:00 · 2014-01-12 22:27:23 +02:00
38 changed files with 1646 additions and 478 deletions
--- a/76
+++ b/76
@@ -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
 ===================================
@@ -427,3 +428,76 @@ VDR Plugin 'femon' Revision History
 - 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.
--- a/93
+++ b/93
@@ -3,120 +3,133 @@
 #

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

-### Make sure that necessary options are included:
+### The compiler options:

-include $(VDRDIR)/Make.global
+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 femonlatm.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 Makefile
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+%.o: %.c
+	$(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 --package-name='vdr-$(PLUGIN)' --package-version='$(VERSION)' --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`

 %.po: $(I18Npot)
-	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)
+$(SOFILE): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
 ifndef FEMON_DEBUG
 	@$(STRIP) $@
 endif
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+install-lib: $(SOFILE)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib install-i18n

 dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -127,7 +140,9 @@ dist: $(I18Npo) 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* *~

-cppcheck: $(OBJS)
-	@cppcheck --enable=information,style,unusedFunction -v -f $(OBJS:%.o=%.c)
+.PHONY: cppcheck
+cppcheck:
+	@cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)
--- a/10
+++ b/10
@@ -71,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:

@@ -97,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
--- a/femon.c
+++ b/femon.c
@@ -14,11 +14,15 @@
 #include "femonservice.h"
 #include "femontools.h"

-#if defined(APIVERSNUM) && APIVERSNUM < 10723
-#error "VDR-1.7.23 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 20106
+#error "VDR-2.1.6 API version or greater is required!"
 #endif

-static const char VERSION[]       = "1.7.12";
+#ifndef GITVERSION
+#define GITVERSION ""
+#endif
+
+static const char VERSION[]       = "2.1.0" GITVERSION;
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");

@@ -132,10 +136,10 @@ 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;
+        FemonService_v1_0 *data = reinterpret_cast<FemonService_v1_0*>(Data);
        if (!cDevice::ActualDevice())
           return false;
-        cDvbDevice *dev = dynamic_cast<cDvbDevice*>(cDevice::ActualDevice());
+        cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
        data->fe_name = getFrontendName(dev);
        data->fe_status = getFrontendStatus(dev);
        data->fe_snr = getSNR(dev);
@@ -194,17 +198,17 @@ const char **cPluginFemon::SVDRPHelpPages(void)

 cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
 {
-  cDvbDevice *dev = dynamic_cast<cDvbDevice*>(cDevice::ActualDevice());
+  cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
  if (*Option && isnumber(Option)) {
-     cDvbDevice *dev2 = dynamic_cast<cDvbDevice*>(cDevice::GetDevice(strtol(Option, NULL, 10)));
+     cDvbDevice *dev2 = dynamic_cast<cDvbDevice*>(cDevice::GetDevice(int(strtol(Option, NULL, 10))));
     if (dev2)
        dev = dev2;
     }
-  if (strcasecmp(Command, "OPEN") == 0) {
-     if (cReplayControl::NowReplaying()) {
+  if (cReplayControl::NowReplaying() || !dev) {
     ReplyCode = 550; // Requested action not taken
     return cString("Cannot open femon plugin while replaying");
     }
+  if (strcasecmp(Command, "OPEN") == 0) {
     if (!cFemonOsd::Instance())
        cRemote::CallPlugin(Name());
     return cString("Opening femon plugin");
@@ -311,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();
 }

--- a/femonaac.c
+++ b/femonaac.c
@@ -10,7 +10,7 @@

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

-unsigned int cFemonAAC::s_Samplerates[16] =
+int cFemonAAC::s_Samplerates[16] =
 {
  96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, -1, -1, -1, -1
 };
--- a/femonaac.h
+++ b/femonaac.h
@@ -14,7 +14,7 @@ class cFemonAAC {
 private:
  cFemonAudioIf *m_AudioHandler;

-  static unsigned int s_Samplerates[16];
+  static int s_Samplerates[16];

 public:
  cFemonAAC(cFemonAudioIf *audiohandler);
--- a/femonac3.c
+++ b/femonac3.c
@@ -9,17 +9,17 @@
 #include "femontools.h"
 #include "femonac3.h"

-unsigned int cFemonAC3::s_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
 };

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

-unsigned int cFemonAC3::s_Frames[3][32] =
+int cFemonAC3::s_Frames[3][32] =
 {
  {64, 80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768,  896,  1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
  {69, 87,  104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835,  975,  1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
--- a/femonac3.h
+++ b/femonac3.h
@@ -14,9 +14,9 @@ class cFemonAC3 {
 private:
  cFemonAC3If *m_AudioHandler;

-  static unsigned int s_Bitrates[32];
-  static unsigned int s_Frequencies[4];
-  static unsigned int s_Frames[3][32];
+  static int s_Bitrates[32];
+  static int s_Frequencies[4];
+  static int s_Frames[3][32];

 public:
  cFemonAC3(cFemonAC3If *audiohandler);
--- a/femoncfg.c
+++ b/femoncfg.c
@@ -138,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
+  },
 };
--- a/femoncfg.h
+++ b/femoncfg.h
@@ -59,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];
--- a/femonclient/vdr-femonclient-0.0.4.tgz
+++ b/femonclient/vdr-femonclient-0.0.4.tgz
--- a/femonclient/vdr-femonclient-0.0.6.tgz
+++ b/femonclient/vdr-femonclient-0.0.6.tgz
--- a/femonlatm.c
+++ b/femonlatm.c
@@ -8,14 +8,14 @@
 #include "femontools.h"
 #include "femonlatm.h"

-unsigned int cFemonLATM::s_Bitrates[3][16] =
+int cFemonLATM::s_Bitrates[3][16] =
 {
  {0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, -1}, // MPEG-2 Layer I
  {0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1}, // MPEG-2 Layer II/III
  {0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1}  // MPEG-2 Layer II/III
 };

-unsigned int cFemonLATM::s_Samplerates[4] =
+int cFemonLATM::s_Samplerates[4] =
 {
  22050, 24000, 16000, -1
 };
--- a/femonlatm.h
+++ b/femonlatm.h
@@ -14,8 +14,8 @@ class cFemonLATM {
 private:
  cFemonAudioIf *m_AudioHandler;

-  static unsigned int s_Bitrates[3][16];
-  static unsigned int s_Samplerates[4];
+  static int s_Bitrates[3][16];
+  static int s_Samplerates[4];

 public:
  cFemonLATM(cFemonAudioIf *audiohandler);
--- a/femonmpeg.c
+++ b/femonmpeg.c
@@ -10,7 +10,7 @@

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

-unsigned int cFemonMPEG::s_Bitrates[2][3][16] =
+int cFemonMPEG::s_Bitrates[2][3][16] =
 {
  {
    {0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, -1}, // MPEG-2 Layer I
@@ -24,7 +24,7 @@ unsigned int cFemonMPEG::s_Bitrates[2][3][16] =
  }
 };

-unsigned int cFemonMPEG::s_Samplerates[2][4] =
+int cFemonMPEG::s_Samplerates[2][4] =
 {
  {22050, 24000, 16000, -1}, // MPEG-2
  {44100, 48000, 32000, -1}  // MPEG-1
--- a/femonmpeg.h
+++ b/femonmpeg.h
@@ -16,8 +16,8 @@ private:
  cFemonVideoIf *m_VideoHandler;
  cFemonAudioIf *m_AudioHandler;

-  static unsigned int s_Bitrates[2][3][16];
-  static unsigned int s_Samplerates[2][4];
+  static int s_Bitrates[2][3][16];
+  static int s_Samplerates[2][4];
  static eAudioCodec s_Formats[2][4];

 public:
--- a/femonosd.c
+++ b/femonosd.c
@@ -11,6 +11,7 @@

 #include <ctype.h>
 #include <math.h>
+#include "iptvservice.h"
 #include "femoncfg.h"
 #include "femonreceiver.h"
 #include "femontools.h"
@@ -23,7 +24,7 @@
 #define OSDWIDTH                  m_OsdWidth              // in pixels
 #define OSDHEIGHT                 m_OsdHeight             // in pixels
 #define OSDROWHEIGHT              m_Font->Height()        // in pixels
-#define OSDINFOHEIGHT             (OSDROWHEIGHT * 13)     // in pixels (13 rows)
+#define OSDINFOHEIGHT             (OSDROWHEIGHT * 14)     // in pixels (14 rows)
 #define OSDSTATUSHEIGHT           (OSDROWHEIGHT * 6)      // in pixels (6 rows)
 #define OSDSYMBOL(id)             femonSymbols.Get(id)
 #define OSDSPACING                femonSymbols.GetSpacing()
@@ -183,7 +184,9 @@ cFemonOsd::cFemonOsd()
  m_BERValid(false),
  m_UNC(0),
  m_UNCValid(false),
+  m_FrontendName(""),
  m_FrontendStatusValid(false),
+  m_DeviceSource(DEVICESOURCE_DVBAPI),
  m_DisplayMode(femonConfig.displaymode),
  m_OsdWidth(cOsd::OsdWidth() * (100 - femonConfig.downscale) / 100),
  m_OsdHeight(cOsd::OsdHeight() * (100 - femonConfig.downscale) / 100),
@@ -199,7 +202,7 @@ cFemonOsd::cFemonOsd()
  memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
  m_SvdrpConnection.handle = -1;
  femonSymbols.Refresh();
-  m_Font = cFont::CreateFont(Setup.FontSml, min(max(Setup.FontSmlSize, MINFONTSIZE), MAXFONTSIZE));
+  m_Font = cFont::CreateFont(Setup.FontSml, constrain(Setup.FontSmlSize, MINFONTSIZE, MAXFONTSIZE));
  if (!m_Font || !m_Font->Height()) {
     m_Font = new cFemonDummyFont;
     error("cFemonOsd::cFemonOsd() cannot create required font.");
@@ -394,7 +397,6 @@ void cFemonOsd::DrawInfoWindow(void)
  if (m_Osd && channel) {
     int offset = 0;
     eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-     cDvbTransponderParameters dtp(channel->Parameters());

     switch (m_DisplayMode) {
       case eFemonModeTransponder:
@@ -418,8 +420,9 @@ void cFemonOsd::DrawInfoWindow(void)
            OSDDRAWINFOLEFT( trVDR("CA"),   *getCAids(channel));
            offset += OSDROWHEIGHT;
            switch (channel->Source() & cSource::st_Mask) {
-              case cSource::stSat:
-                   OSDDRAWINFOLINE(*cString::sprintf("%s #%d - %s", *getSatelliteSystem(dtp.System()), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
+              case cSource::stSat: {
+                   cDvbTransponderParameters dtp(channel->Parameters());
+                   OSDDRAWINFOLINE(*cString::sprintf("%s #%d - %s", *getSatelliteSystem(dtp.System()), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), *m_FrontendName));
                   offset += OSDROWHEIGHT;
                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
                   OSDDRAWINFORIGHT(trVDR("Source"),       *cSource::ToString(channel->Source()));
@@ -431,12 +434,17 @@ void cFemonOsd::DrawInfoWindow(void)
                   OSDDRAWINFORIGHT(trVDR("CoderateH"),    *getCoderate(dtp.CoderateH()));
                   offset += OSDROWHEIGHT;
                   OSDDRAWINFOLEFT( trVDR("System"),       *getSatelliteSystem(dtp.System()));
-                   if (dtp.System())
+                   if (dtp.System()) {
                      OSDDRAWINFORIGHT(trVDR("RollOff"),   *getRollOff(dtp.RollOff()));
+                      offset += OSDROWHEIGHT;
+                      OSDDRAWINFOLEFT( trVDR("Pilot"),     *getPilot(dtp.Pilot()));
+                      }
+                   }
                   break;

-              case cSource::stCable:
-                   OSDDRAWINFOLINE(*cString::sprintf("DVB-C #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
+              case cSource::stCable: {
+                   cDvbTransponderParameters dtp(channel->Parameters());
+                   OSDDRAWINFOLINE(*cString::sprintf("DVB-C #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), *m_FrontendName));
                   offset += OSDROWHEIGHT;
                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
                   OSDDRAWINFORIGHT(trVDR("Source"),       *cSource::ToString(channel->Source()));
@@ -446,10 +454,12 @@ void cFemonOsd::DrawInfoWindow(void)
                   offset += OSDROWHEIGHT;
                   OSDDRAWINFOLEFT( trVDR("Inversion"),    *getInversion(dtp.Inversion()));
                   OSDDRAWINFORIGHT(trVDR("CoderateH"),    *getCoderate(dtp.CoderateH()));
+                   }
                   break;

-              case cSource::stTerr:
-                   OSDDRAWINFOLINE(*cString::sprintf("%s #%d - %s", *getTerrestrialSystem(dtp.System()), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name));
+              case cSource::stTerr: {
+                   cDvbTransponderParameters dtp(channel->Parameters());
+                   OSDDRAWINFOLINE(*cString::sprintf("%s #%d - %s", *getTerrestrialSystem(dtp.System()), (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), *m_FrontendName));
                   offset += OSDROWHEIGHT;
                   OSDDRAWINFOLEFT( trVDR("Frequency"),    *getFrequencyMHz(channel->Frequency()));
                   OSDDRAWINFORIGHT(trVDR("Transmission"), *getTransmission(dtp.Transmission()));
@@ -464,8 +474,30 @@ void cFemonOsd::DrawInfoWindow(void)
                   OSDDRAWINFORIGHT(trVDR("Guard"),        *getGuard(dtp.Guard()));
                   offset += OSDROWHEIGHT;
                   OSDDRAWINFOLEFT( trVDR("System"),       *getTerrestrialSystem(dtp.System()));
-                   if (dtp.System())
-                   OSDDRAWINFORIGHT(trVDR("PlpId"),        *cString::sprintf("%d", dtp.PlpId()));
+                   if (dtp.System()) {
+                      OSDDRAWINFORIGHT(trVDR("StreamId"),  *cString::sprintf("%d", dtp.StreamId()));
+                      offset += OSDROWHEIGHT;
+                      OSDDRAWINFOLEFT( trVDR("T2SystemId"),*cString::sprintf("%d", dtp.T2SystemId()));
+                      OSDDRAWINFORIGHT(trVDR("SISO/MISO"), *cString::sprintf("%d", dtp.SisoMiso()));
+                      }
+                   }
+                   break;
+
+              case stIptv: {
+                   OSDDRAWINFOLINE(*cString::sprintf("IPTV #%d - %s", (m_SvdrpFrontend >= 0) ? m_SvdrpFrontend : cDevice::ActualDevice()->CardIndex(), *m_FrontendName));
+                   offset += OSDROWHEIGHT;
+                   if (m_SvdrpFrontend < 0) {
+                      cPlugin *p;
+                      IptvService_v1_0 data;
+                      data.cardIndex = cDevice::ActualDevice()->CardIndex();
+                      p = cPluginManager::CallFirstService("IptvService-v1.0", &data);
+                      if (p) {
+                         OSDDRAWINFOLEFT(tr("Protocol"),   *data.protocol);
+                         offset += OSDROWHEIGHT;
+                         OSDDRAWINFOLEFT(tr("Bitrate"),    *data.bitrate);
+                         }
+                      }
+                   }
                   break;

              default:
@@ -549,18 +581,71 @@ void cFemonOsd::Action(void)
    m_SvdrpFrontend = -1;
    m_SvdrpVideoBitrate = -1.0;
    m_SvdrpAudioBitrate = -1.0;
+    switch (m_DeviceSource) {
+      case DEVICESOURCE_PVRINPUT:
+           m_Quality = cDevice::ActualDevice()->SignalStrength();
+           m_QualityValid = (m_Quality >= 0);
+           m_Strength = cDevice::ActualDevice()->SignalStrength();
+           m_StrengthValid = (m_Strength >= 0);
+           m_FrontendName = cDevice::ActualDevice()->DeviceName();
+           m_FrontendStatus = (fe_status_t)(m_StrengthValid ? (FE_HAS_LOCK | FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC) : 0);
+           m_FrontendStatusValid = m_StrengthValid;
+           m_Signal = uint16_t(m_Strength * 0xFFFF / 100);
+           m_SignalValid = m_StrengthValid;
+           m_SNR = 0;
+           m_SNRValid = false;
+           m_BER = 0;
+           m_BERValid = false;
+           m_UNC = 0;
+           m_UNCValid = false;
+           break;
+      case DEVICESOURCE_IPTV:
+           m_Quality = cDevice::ActualDevice()->SignalQuality();
+           m_QualityValid = (m_Quality >= 0);
+           m_Strength = cDevice::ActualDevice()->SignalStrength();
+           m_StrengthValid = (m_Strength >= 0);
+           m_FrontendName = cDevice::ActualDevice()->DeviceName();
+           m_FrontendStatus = (fe_status_t)(m_StrengthValid ? (FE_HAS_LOCK | FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC) : 0);
+           m_FrontendStatusValid = m_StrengthValid;
+           m_Signal = uint16_t(m_Strength * 0xFFFF / 100);
+           m_SignalValid = m_StrengthValid;
+           m_SNR = uint16_t(m_Quality * 0xFFFF / 100);
+           m_SNRValid = m_QualityValid;
+           m_BER = 0;
+           m_BERValid = false;
+           m_UNC = 0;
+           m_UNCValid = false;
+           break;
+      default:
+      case DEVICESOURCE_DVBAPI:
           if (m_Frontend != -1) {
              m_Quality = cDevice::ActualDevice()->SignalQuality();
              m_QualityValid = (m_Quality >= 0);
              m_Strength = cDevice::ActualDevice()->SignalStrength();
              m_StrengthValid = (m_Strength >= 0);
+              m_FrontendName = cDevice::ActualDevice()->DeviceName();
              m_FrontendStatusValid = (ioctl(m_Frontend, FE_READ_STATUS, &m_FrontendStatus) >= 0);
              m_SignalValid = (ioctl(m_Frontend, FE_READ_SIGNAL_STRENGTH, &m_Signal) >= 0);
              m_SNRValid = (ioctl(m_Frontend, FE_READ_SNR, &m_SNR) >= 0);
              m_BERValid = (ioctl(m_Frontend, FE_READ_BER, &m_BER) >= 0);
              m_UNCValid = (ioctl(m_Frontend, FE_READ_UNCORRECTED_BLOCKS, &m_UNC) >= 0);
-       DrawInfoWindow();
-       DrawStatusWindow();
+              }
+           else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) {
+              m_Quality = cDevice::ActualDevice()->SignalQuality();
+              m_QualityValid = (m_Quality >= 0);
+              m_Strength = cDevice::ActualDevice()->SignalStrength();
+              m_StrengthValid = (m_Strength >= 0);
+              m_FrontendName = cDevice::ActualDevice()->DeviceName();
+              m_FrontendStatus = (fe_status_t)(cDevice::ActualDevice()->HasLock() ? (FE_HAS_LOCK | FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC) : 0);
+              m_FrontendStatusValid = m_StrengthValid;
+              m_Signal = uint16_t(m_Strength * 0xFFFF / 100);
+              m_SignalValid = m_StrengthValid;
+              m_SNR = uint16_t(m_Quality * 0xFFFF / 100);
+              m_SNRValid = m_QualityValid;
+              m_BER = 0;
+              m_BERValid = false;
+              m_UNC = 0;
+              m_UNCValid = false;
              }
           else if (m_SvdrpConnection.handle >= 0) {
              cmd.handle = m_SvdrpConnection.handle;
@@ -588,7 +673,7 @@ void cFemonOsd::Action(void)
                     else if (!strncasecmp(s, "TYPE:", 5))
                        m_FrontendInfo.type = (fe_type_t)strtol(s + 5, NULL, 10);
                     else if (!strncasecmp(s, "NAME:", 5)) {
-                 strn0cpy(m_FrontendInfo.name, s + 5, sizeof(m_FrontendInfo.name));
+                        m_FrontendName = s + 5;
                        }
                     else if (!strncasecmp(s, "STAT:", 5)) {
                        m_FrontendStatus = (fe_status_t)strtol(s + 5, NULL, 16);
@@ -616,9 +701,11 @@ void cFemonOsd::Action(void)
                        m_SvdrpAudioBitrate = (double)strtol(s + 5, NULL, 10);
                     }
                 }
+              }
+           break;
+      }
    DrawInfoWindow();
    DrawStatusWindow();
-       }
    m_Sleep.Wait(max((int)(100 * femonConfig.updateinterval - t.Elapsed()), 3));
    }
 }
@@ -627,7 +714,18 @@ void cFemonOsd::Show(void)
 {
  debug("%s()\n", __PRETTY_FUNCTION__);
  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-  cDvbDevice *dev = dynamic_cast<cDvbDevice*>(cDevice::ActualDevice());
+  const cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+
+  m_DeviceSource = DEVICESOURCE_DVBAPI;
+  if (channel) {
+     if (channel->IsSourceType('I'))
+        m_DeviceSource = DEVICESOURCE_IPTV;
+     else if (channel->IsSourceType('V'))
+        m_DeviceSource = DEVICESOURCE_PVRINPUT;
+     }
+
+  if (m_DeviceSource == DEVICESOURCE_DVBAPI) {
+     cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
     m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
     if (m_Frontend >= 0) {
        if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
@@ -639,6 +737,9 @@ void cFemonOsd::Show(void)
           return;
           }
        }
+     else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) {
+        // nop
+        }
     else if (femonConfig.usesvdrp) {
        if (!SvdrpConnect() || !SvdrpTune())
           return;
@@ -647,6 +748,9 @@ void cFemonOsd::Show(void)
        error("cFemonOsd::Show() cannot open frontend device.");
        return;
        }
+     }
+  else
+     m_Frontend = -1;

  m_Osd = cOsdProvider::NewOsd(m_OsdLeft, m_OsdTop);
  if (m_Osd) {
@@ -667,25 +771,38 @@ void cFemonOsd::Show(void)
        m_Receiver->Deactivate();
        DELETENULL(m_Receiver);
        }
-     if (femonConfig.analyzestream) {
-        cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-        if (channel) {
-           m_Receiver = new cFemonReceiver(channel->Vtype(), channel->Vpid(), channel->Apid(IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0), channel->Dpid(IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0));
+     if (femonConfig.analyzestream && channel) {
+        m_Receiver = new cFemonReceiver(channel, IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0, IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0);
        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
        }
-        }
     Start();
     }
 }

-void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
+void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber, bool liveView)
 {
  debug("%s(%d,%d)\n", __PRETTY_FUNCTION__, device->DeviceNumber(), channelNumber);
  eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-  if (!device->IsPrimaryDevice() || !channelNumber || cDevice::PrimaryDevice()->CurrentChannel() != channelNumber)
+  const cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+
+  if (!liveView || !channelNumber || !channel || channel->Number() != channelNumber)
     return;
+
+  m_DeviceSource = DEVICESOURCE_DVBAPI;
+  if (channel) {
+     if (channel->IsSourceType('I'))
+        m_DeviceSource = DEVICESOURCE_IPTV;
+     else if (channel->IsSourceType('V'))
+        m_DeviceSource = DEVICESOURCE_PVRINPUT;
+     }
+
+  if (m_Frontend >= 0) {
     close(m_Frontend);
-  cDvbDevice *dev = dynamic_cast<cDvbDevice*>(cDevice::ActualDevice());
+     m_Frontend = -1;
+     }
+
+  if (m_DeviceSource == DEVICESOURCE_DVBAPI) {
+     cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());
     m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
     if (m_Frontend >= 0) {
        if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
@@ -697,6 +814,9 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
           return;
           }
        }
+     else if (strstr(*cDevice::ActualDevice()->DeviceType(), SATIP_DEVICE)) {
+        // nop
+        }
     else if (femonConfig.usesvdrp) {
        if (!SvdrpConnect() || !SvdrpTune())
           return;
@@ -705,19 +825,17 @@ void cFemonOsd::ChannelSwitch(const cDevice * device, int channelNumber)
        error("cFemonOsd::ChannelSwitch() cannot open frontend device.");
        return;
        }
+     }

  if (m_Receiver) {
     m_Receiver->Deactivate();
     DELETENULL(m_Receiver);
     }
-  if (femonConfig.analyzestream) {
-     cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     if (channel) {
-        m_Receiver = new cFemonReceiver(channel->Vtype(), channel->Vpid(), channel->Apid(IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0), channel->Dpid(IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0));
+  if (femonConfig.analyzestream && channel) {
+     m_Receiver = new cFemonReceiver(channel, IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0, IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0);
     cDevice::ActualDevice()->AttachReceiver(m_Receiver);
     }
 }
-}

 void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks)
 {
@@ -728,9 +846,9 @@ void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks)
     DELETENULL(m_Receiver);
     }
  if (femonConfig.analyzestream) {
-     cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+     const cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
     if (channel) {
-        m_Receiver = new cFemonReceiver(channel->Vtype(), channel->Vpid(), channel->Apid(IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0), channel->Dpid(IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0));
+        m_Receiver = new cFemonReceiver(channel, IS_AUDIO_TRACK(track) ? int(track - ttAudioFirst) : 0, IS_DOLBY_TRACK(track) ? int(track - ttDolbyFirst) : 0);
        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
        }
     }
@@ -753,15 +871,72 @@ bool cFemonOsd::DeviceSwitch(int direction)
               if (--device < 0)
                  device = cDevice::NumDevices() - 1;
               }
-           if (cDevice::GetDevice(device)->ProvidesChannel(channel, 0)) {
+            // Collect the current priorities of all CAM slots that can decrypt the channel:
+            int NumCamSlots = CamSlots.Count();
+            int SlotPriority[NumCamSlots];
+            int NumUsableSlots = 0;
+            bool NeedsDetachAllReceivers = false;
+            bool InternalCamNeeded = false;
+            bool ValidDevice = false;
+            cCamSlot *s = NULL;
+            cDevice *d = cDevice::GetDevice(device);
+            if (channel->Ca() >= CA_ENCRYPTED_MIN) {
+               for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
+                   SlotPriority[CamSlot->Index()] = MAXPRIORITY + 1; // assumes it can't be used
+                   if (CamSlot->ModuleStatus() == msReady) {
+                      if (CamSlot->ProvidesCa(channel->Caids())) {
+                         if (!ChannelCamRelations.CamChecked(channel->GetChannelID(), CamSlot->SlotNumber())) {
+                            SlotPriority[CamSlot->Index()] = CamSlot->Priority();
+                            NumUsableSlots++;
+                            }
+                         }
+                      }
+                  }
+               if (!NumUsableSlots)
+                  InternalCamNeeded = true; // no CAM is able to decrypt this channel
+               }
+            for (int j = 0; j < NumCamSlots || !NumUsableSlots; ++j) {
+                if (NumUsableSlots && SlotPriority[j] > MAXPRIORITY)
+                   continue; // there is no CAM available in this slot
+                bool HasInternalCam = d->HasInternalCam();
+                if (InternalCamNeeded && !HasInternalCam)
+                   continue; // no CAM is able to decrypt this channel and the device uses vdr handled CAMs
+                if (NumUsableSlots && !HasInternalCam && !CamSlots.Get(j)->Assign(d, true))
+                   continue; // CAM slot can't be used with this device
+                if (d->ProvidesChannel(channel, 0, &NeedsDetachAllReceivers)) { // this device is basically able to do the job
                   debug("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, direction, device);
-              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
+                   if (NumUsableSlots && !HasInternalCam && d->CamSlot() && d->CamSlot() != CamSlots.Get(j))
+                      NeedsDetachAllReceivers = true; // using a different CAM slot requires detaching receivers
+                   if (NumUsableSlots && !HasInternalCam)
+                      s = CamSlots.Get(j);
+                   ValidDevice = true;
+                   break;
+                   }
+                if (!NumUsableSlots)
+                   break; // no CAM necessary, so just one loop over the devices
+                }
+            // Do the actual switch if valid device found
+            if (d && ValidDevice) {
+               cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0, true);
               cControl::Shutdown();
-              cDevice::GetDevice(device)->SwitchChannel(channel, true);
-              if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
-                 cDevice::GetDevice(device)->ForceTransferMode();
-              cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel));
-              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
+               if (NeedsDetachAllReceivers)
+                  d->DetachAllReceivers();
+               if (s) {
+                  if (s->Device() != d) {
+                     if (s->Device())
+                        s->Device()->DetachAllReceivers();
+                     if (d->CamSlot())
+                        d->CamSlot()->Assign(NULL);
+                     s->Assign(d);
+                     }
+                  }
+               else if (d->CamSlot() && !d->CamSlot()->IsDecrypting())
+                  d->CamSlot()->Assign(NULL);
+               d->SwitchChannel(channel, true);
+               if (d == cDevice::PrimaryDevice())
+                  d->ForceTransferMode();
+               cControl::Launch(new cTransferControl(d, channel));
+               cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number(), true);
               return (true);
               }
            }
--- a/femonosd.h
+++ b/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;
@@ -48,9 +55,11 @@ private:
  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;
@@ -71,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:
--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -10,8 +10,9 @@
 #include "femoncfg.h"
 #include "femonreceiver.h"

-cFemonReceiver::cFemonReceiver(int Vtype, int Vpid, int Apid, int Dpid)
-: cThread("femon receiver"),
+cFemonReceiver::cFemonReceiver(const cChannel *Channel, int ATrack, int DTrack)
+: cReceiver(Channel),
+  cThread("femon receiver"),
  m_Mutex(),
  m_Sleep(),
  m_Active(false),
@@ -21,24 +22,25 @@ cFemonReceiver::cFemonReceiver(int Vtype, int Vpid, int Apid, int Dpid)
  m_DetectLATM(this),
  m_DetectAC3(this),
  m_VideoBuffer(KILOBYTE(512), TS_SIZE, false, "Femon video"),
-  m_VideoType(Vtype),
-  m_VideoPid(Vpid),
+  m_VideoType(Channel ? Channel->Vtype(): 0),
+  m_VideoPid(Channel ? Channel->Vpid() : 0),
  m_VideoPacketCount(0),
  m_VideoBitrate(0.0),
  m_VideoValid(false),
  m_AudioBuffer(KILOBYTE(256), TS_SIZE, false, "Femon audio"),
-  m_AudioPid(Apid),
+  m_AudioPid(Channel ? Channel->Apid(ATrack) : 0),
  m_AudioPacketCount(0),
  m_AudioBitrate(0.0),
  m_AudioValid(false),
  m_AC3Buffer(KILOBYTE(256), TS_SIZE, false, "Femon AC3"),
-  m_AC3Pid(Dpid),
+  m_AC3Pid(Channel ? Channel->Dpid(DTrack) : 0),
  m_AC3PacketCount(0),
  m_AC3Bitrate(0),
  m_AC3Valid(false)
 {
  debug("%s()\n", __PRETTY_FUNCTION__);

+  SetPids(NULL);
  AddPid(m_VideoPid);
  AddPid(m_AudioPid);
  AddPid(m_AC3Pid);
@@ -79,12 +81,12 @@ cFemonReceiver::~cFemonReceiver(void)
 void cFemonReceiver::Deactivate(void)
 {
  debug("%s()\n", __PRETTY_FUNCTION__);
+  Detach();
  if (m_Active) {
     m_Active = false;
     m_Sleep.Signal();
     if (Running())
        Cancel(3);
-     Detach();
     }
 }

@@ -142,7 +144,7 @@ void cFemonReceiver::Action(void)
    bool processed = false;

    // process available video data
-    while (Data = m_VideoBuffer.Get(Length)) {
+    while ((Data = m_VideoBuffer.Get(Length))) {
      if (!m_Active || (Length < TS_SIZE))
         break;
      Length = TS_SIZE;
@@ -179,7 +181,7 @@ void cFemonReceiver::Action(void)
      }

    // process available audio data
-    while (Data = m_AudioBuffer.Get(Length)) {
+    while ((Data = m_AudioBuffer.Get(Length))) {
      if (!m_Active || (Length < TS_SIZE))
         break;
      Length = TS_SIZE;
@@ -204,7 +206,7 @@ void cFemonReceiver::Action(void)
      }

    // process available dolby data
-    while (Data = m_AC3Buffer.Get(Length)) {
+    while ((Data = m_AC3Buffer.Get(Length))) {
      if (!m_Active || (Length < TS_SIZE))
         break;
      Length = TS_SIZE;
--- a/femonreceiver.h
+++ b/femonreceiver.h
@@ -108,7 +108,7 @@ public:
                                                       m_AC3Info.lfe = onoff; }

 public:
-  cFemonReceiver(int Vtype, int Vpid, int Apid, int Dpid);
+  cFemonReceiver(const cChannel* Channel, int ATrack, int DTrack);
  virtual ~cFemonReceiver();
  void Deactivate(void);

--- a/femonsymbol.c
+++ b/femonsymbol.c
@@ -53,6 +53,7 @@
 #include "symbols/format480i.xpm"
 #include "symbols/format480p.xpm"

+static cBitmap bmOnePixel(1, 1, 1);
 static cBitmap bmStereo(stereo_xpm);
 static cBitmap bmMonoLeft(monoleft_xpm);
 static cBitmap bmMonoRight(monoright_xpm);
@@ -134,6 +135,7 @@ bool cFemonSymbolCache::Populate(void)
     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
@@ -197,7 +199,7 @@ bool cFemonSymbolCache::Flush(void)

 cBitmap& cFemonSymbolCache::Get(eSymbols symbolP)
 {
-  cBitmap *bitmapM = NULL;
+  cBitmap *bitmapM = cacheM[SYMBOL_ONEPIXEL];

  if (symbolP < cacheM.Size())
     bitmapM = cacheM[symbolP];
--- a/femonsymbol.h
+++ b/femonsymbol.h
@@ -12,6 +12,7 @@
 #include <vdr/osd.h>

 enum eSymbols {
+  SYMBOL_ONEPIXEL,
  SYMBOL_STEREO,
  SYMBOL_MONO_LEFT,
  SYMBOL_MONO_RIGHT,
@@ -77,8 +78,8 @@ public:
  ~cFemonSymbolCache();
  void Refresh();
  cBitmap& Get(eSymbols symbolP);
-  int GetSpacing()  { return yFactorM * DEFAULT_SPACING; }
-  int GetRounding() { return yFactorM * DEFAULT_ROUNDING; }
+  int GetSpacing()  { return int(yFactorM * cFemonSymbolCache::DEFAULT_SPACING);  }
+  int GetRounding() { return int(yFactorM * cFemonSymbolCache::DEFAULT_ROUNDING); }
 };

 extern cFemonSymbolCache femonSymbols;
--- a/femontools.c
+++ b/femontools.c
@@ -9,6 +9,7 @@
 #define __STDC_FORMAT_MACROS
 #endif

+#include <ctype.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -27,39 +28,39 @@ static cString getCA(int value)
    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 0x0100 ... 0x01FF: return cString::sprintf("SECA Mediaguard (%X)",  value); // Canal Plus
+    case 0x0464:            return cString::sprintf("EuroDec (%X)",          value); // EuroDec
+    case 0x0500 ... 0x05FF: return cString::sprintf("Viaccess (%X)",         value); // France Telecom
+    case 0x0600 ... 0x06FF: return cString::sprintf("Irdeto (%X)",           value); // Irdeto
+    case 0x0900 ... 0x09FF: return cString::sprintf("NDS Videoguard (%X)",   value); // News Datacom
+    case 0x0B00 ... 0x0BFF: return cString::sprintf("Conax (%X)",            value); // Norwegian Telekom
+    case 0x0D00 ... 0x0DFF: return cString::sprintf("CryptoWorks (%X)",      value); // Philips
+    case 0x0E00 ... 0x0EFF: return cString::sprintf("PowerVu (%X)",          value); // Scientific Atlanta
+    case 0x1000:            return cString::sprintf("RAS (%X)",              value); // Tandberg Television
+    case 0x1200 ... 0x12FF: return cString::sprintf("NagraVision (%X)",      value); // BellVu Express
+    case 0x1700 ... 0x17FF: return cString::sprintf("BetaCrypt (%X)",        value); // BetaTechnik
+    case 0x1800 ... 0x18FF: return cString::sprintf("NagraVision (%X)",      value); // Kudelski SA
+    case 0x22F0:            return cString::sprintf("Codicrypt (%X)",        value); // Scopus Network Technologies
+    case 0x2600:            return cString::sprintf("BISS (%X)",             value); // European Broadcasting Union
+    case 0x4347:            return cString::sprintf("CryptOn (%X)",          value); // CryptOn
+    case 0x4800:            return cString::sprintf("Accessgate (%X)",       value); // Telemann
+    case 0x4900:            return cString::sprintf("China Crypt (%X)",      value); // CryptoWorks
+    case 0x4A10:            return cString::sprintf("EasyCas (%X)",          value); // EasyCas
+    case 0x4A20:            return cString::sprintf("AlphaCrypt (%X)",       value); // AlphaCrypt
+    case 0x4A70:            return cString::sprintf("DreamCrypt (%X)",       value); // Dream Multimedia
+    case 0x4A60:            return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
+    case 0x4A61:            return cString::sprintf("Neotioncrypt (%X)",     value); // Neotion
+    case 0x4A62:            return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
+    case 0x4A63:            return cString::sprintf("Neotion SHL (%X)",      value); // Neotion
+    case 0x4A64 ... 0x4A6F: return cString::sprintf("SkyCrypt (%X)",         value); // @Sky
+    case 0x4A80:            return cString::sprintf("ThalesCrypt (%X)",      value); // TPS
+    case 0x4AA1:            return cString::sprintf("KeyFly (%X)",           value); // SIDSA
+    case 0x4ABF:            return cString::sprintf("DG-Crypt (%X)",         value); // Beijing Compunicate Technology Inc.
+    case 0x4AD0 ... 0x4AD1: return cString::sprintf("X-Crypt (%X)",          value); // XCrypt Inc.
+    case 0x4AD4:            return cString::sprintf("OmniCrypt (%X)",        value); // Widevine Technologies, Inc.
+    case 0x4AE0:            return cString::sprintf("RossCrypt (%X)",        value); // Digi Raum Electronics Co. Ltd.
+    case 0x5500:            return cString::sprintf("Z-Crypt (%X)",          value); // Digi Raum Electronics Co. Ltd.
+    case 0x5501:            return cString::sprintf("Griffin (%X)",          value); // Griffin
    default:                break;
    }
  return cString::sprintf("%X", value);
@@ -76,11 +77,21 @@ static const char *getUserString(int Value, const tDvbParameterMap *Map)
  return "---";
 }

+cDvbDevice *getDvbDevice(cDevice* device)
+{
+  cDvbDevice *dev = dynamic_cast<cDvbDevice*>(device);
+#ifdef __DYNAMIC_DEVICE_PROBE
+  if (!dev && device && device->HasSubDevice())
+     dev = dynamic_cast<cDvbDevice*>(device->SubDevice());
+#endif
+  return dev;
+}
+
 cString getFrontendInfo(cDvbDevice *device)
 {
-  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;
@@ -97,7 +108,7 @@ cString getFrontendInfo(cDvbDevice *device)
  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, value.name);
+     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)
@@ -121,19 +132,10 @@ cString getFrontendInfo(cDvbDevice *device)

 cString getFrontendName(cDvbDevice *device)
 {
-  struct dvb_frontend_info value;
-
  if (!device)
     return NULL;

-  int fe = open(*cString::sprintf(FRONTEND_DEVICE, device->Adapter(), device->Frontend()), O_RDONLY | O_NONBLOCK);
-  if (fe < 0)
-     return NULL;
-  memset(&value, 0, sizeof(value));
-  ioctl(fe, FE_GET_INFO, &value);
-  close(fe);
-
-  return (cString::sprintf("%s on device #%d", value.name, device->CardIndex()));
+  return (cString::sprintf("%s on device #%d", *device->DeviceName(), device->CardIndex()));
 }

 cString getFrontendStatus(cDvbDevice *device)
@@ -376,6 +378,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)) {
--- a/femontools.h
+++ b/femontools.h
@@ -26,6 +26,10 @@

 #define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"

+#define SATIP_DEVICE "SAT>IP"
+
+cDvbDevice *getDvbDevice(cDevice* device);
+
 cString getFrontendInfo(cDvbDevice *device);
 cString getFrontendName(cDvbDevice *device);
 cString getFrontendStatus(cDvbDevice *device);
@@ -55,6 +59,7 @@ cString getModulation(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);
--- a/iptvservice.h
+++ b/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
+
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -1,5 +1,5 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Peter Marquardt
 # Andreas Brachold
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0300\n"
-"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Christian Wieninger\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"
@@ -66,6 +66,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"

+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Hauptmen<65>eintrag verstecken"

@@ -177,6 +180,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
 msgid "Stream Information"
 msgstr "Streaminformation"

@@ -186,9 +195,6 @@ msgstr "Video Stream"
 msgid "Codec"
 msgstr ""

-msgid "Bitrate"
-msgstr "Bitrate"
-
 msgid "Aspect Ratio"
 msgstr "Seitenverh<72>ltnis"

--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Luis Palacios
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0300\n"
-"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Luis Palacios\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
 "Language: es\n"
@@ -64,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"

@@ -175,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"

@@ -184,9 +193,6 @@ msgstr "Flujo de video"
 msgid "Codec"
 msgstr ""

-msgid "Bitrate"
-msgstr "Tasa de bits"
-
 msgid "Aspect Ratio"
 msgstr "Proporciones de la imagen"

--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Arthur Konovalov
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0300\n"
-"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Arthur Konovalov\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
 "Language: et\n"
@@ -64,6 +64,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"

+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Peita valik peamen<65><6E>s"

@@ -175,6 +178,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitikiirus"
+
 msgid "Stream Information"
 msgstr "Vooinfo"

@@ -184,9 +193,6 @@ msgstr "Videovoog"
 msgid "Codec"
 msgstr "Koodek"

-msgid "Bitrate"
-msgstr "Bitikiirus"
-
 msgid "Aspect Ratio"
 msgstr "K<>lgsuhe"

--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Rolf Ahrenberg
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0300\n"
-"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"
@@ -64,6 +64,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"

+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Piilota valinta päävalikosta"

@@ -167,7 +170,7 @@ msgid "Nid"
 msgstr "Verkko-ID"

 msgid "Tid"
-msgstr "Lähete-ID"
+msgstr "TS-ID"

 msgid "Rid"
 msgstr "Radio-ID"
@@ -175,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"

@@ -184,9 +193,6 @@ msgstr "Kuvaraita"
 msgid "Codec"
 msgstr "Koodekki"

-msgid "Bitrate"
-msgstr "Bittinopeus"
-
 msgid "Aspect Ratio"
 msgstr "Kuvasuhde"

--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,26 +1,28 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 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: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0300\n"
-"PO-Revision-Date: 2010-10-10 10:10+0300\n"
-"Last-Translator: NIVAL Micha<68>l <mnival@club-internet.fr>\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+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"
@@ -64,95 +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 "Downscale OSD size [%]"
-msgstr ""
+msgstr "Réduit la taille de l'OSD (%)"

 msgid "Define the downscale ratio for OSD size."
-msgstr ""
+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"
@@ -175,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"
@@ -239,64 +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 ""
+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"
@@ -305,10 +313,10 @@ msgid "NTSC"
 msgstr "NTSC"

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

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

 msgid "Hz"
 msgstr "Hz"
@@ -368,7 +376,7 @@ msgid "dB"
 msgstr "dB"

 msgid "not indicated"
-msgstr "non indiqu<EFBFBD>"
+msgstr "non indiqué"

 msgid "MHz"
 msgstr "MHz"
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 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 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0200\n"
-"PO-Revision-Date: 2010-10-10 10:10+0200\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+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"
@@ -67,6 +67,9 @@ msgstr "K
 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"

@@ -178,6 +181,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitr<74>ta"
+
 msgid "Stream Information"
 msgstr "Adatfolyam inf<6E>"

@@ -187,9 +196,6 @@ msgstr "Vide
 msgid "Codec"
 msgstr "Kodek"

-msgid "Bitrate"
-msgstr "Bitr<74>ta"
-
 msgid "Aspect Ratio"
 msgstr "M<>retar<61>ny"

@@ -384,4 +390,3 @@ msgstr "Mbit/s"

 msgid "kbit/s"
 msgstr "kbit/s"
-
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,15 +1,15 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Sean Carlos
 # Diego Pierotto <vdr-italian@tiscali.it>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0300\n"
-"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
 "Language: it\n"
@@ -68,6 +68,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"

+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Nascondi voce menu principale"

@@ -179,6 +182,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
 msgid "Stream Information"
 msgstr "Informazioni flusso"

@@ -188,9 +197,6 @@ msgstr "Flusso video"
 msgid "Codec"
 msgstr "Codifica"

-msgid "Bitrate"
-msgstr "Bitrate"
-
 msgid "Aspect Ratio"
 msgstr "Formato immagine"

--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Valdemaras Pipiras
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0300\n"
-"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
 "Language: lt\n"
@@ -64,6 +64,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"

+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Paslėpti pagrindinio meniu įrašus"

@@ -175,6 +178,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Kodavimo dažnis"

+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Kokybė"
+
 msgid "Stream Information"
 msgstr "Srauto informacija"

@@ -184,9 +193,6 @@ msgstr "Video srautas"
 msgid "Codec"
 msgstr "Kodekas"

-msgid "Bitrate"
-msgstr "Kokybė"
-
 msgid "Aspect Ratio"
 msgstr "Proporcijos"

--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Vyacheslav Dikonov
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0300\n"
-"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: Vyacheslav Dikonov\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
 "Language: ru\n"
@@ -64,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>"

@@ -175,6 +178,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"

+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
 msgid "Stream Information"
 msgstr ""

@@ -184,9 +193,6 @@ msgstr ""
 msgid "Codec"
 msgstr ""

-msgid "Bitrate"
-msgstr ""
-
 msgid "Aspect Ratio"
 msgstr ""

--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -0,0 +1,389 @@
+# VDR plugin language source file.
+# Copyright (C) 2007-2014 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Milan Hrala
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr-femon 2.1.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+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"
--- a/po/uk_UA.po
+++ b/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.1.0\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+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 "кбіт/с"
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
+# Copyright (C) 2007-2014 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 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0300\n"
-"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
 "Language: zh_CN\n"
@@ -64,6 +64,9 @@ msgstr "双色调"
 msgid "SilverGreen"
 msgstr "银绿"

+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "隐藏主菜单条目."

@@ -175,6 +178,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "码速率"

+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "比特率"
+
 msgid "Stream Information"
 msgstr "流信息"

@@ -184,9 +193,6 @@ msgstr "视频流"
 msgid "Codec"
 msgstr "解码模式"

-msgid "Bitrate"
-msgstr "比特率"
-
 msgid "Aspect Ratio"
 msgstr "纵横比"

--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,14 +1,14 @@
 # VDR plugin language source file. 
-# Copyright (C) 2007 Rolf Ahrenberg 
+# Copyright (C) 2007-2014 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 1.7.12\n"
+"Project-Id-Version: vdr-femon 2.1.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0300\n"
-"PO-Revision-Date: 2010-10-10 10:10+0300\n"
+"POT-Creation-Date: 2014-03-16 03:16+0200\n"
+"PO-Revision-Date: 2014-03-16 03:16+0200\n"
 "Last-Translator: NanFeng <nfgx@21cn.com>\n"
 "Language-Team: Chinese (traditional) <vdr@linuxtv.org>\n"
 "Language: zh_TW\n"
@@ -64,6 +64,9 @@ msgstr "雙色調"
 msgid "SilverGreen"
 msgstr "銀綠"

+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "隱藏主菜單條目."

@@ -175,6 +178,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "碼速率"

+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "比特率"
+
 msgid "Stream Information"
 msgstr "流信息"

@@ -184,9 +193,6 @@ msgstr "視頻流"
 msgid "Codec"
 msgstr "解碼模式"

-msgid "Bitrate"
-msgstr "比特率"
-
 msgid "Aspect Ratio"
 msgstr "縱橫比"
Author	SHA1	Message	Date
Rolf Ahrenberg	2e5dad9ec5	Updated for vdr-2.1.6.	2014-03-16 17:04:28 +02:00
Rolf Ahrenberg	136c9fb73c	Refactored the SAT>IP support.	2014-03-15 12:35:49 +02:00
Rolf Ahrenberg	9ca1fcb378	Added support for SAT>IP devices.	2014-03-08 13:28:31 +02:00
Rolf Ahrenberg	1cfbd0b730	Updated translation files and HISTORY.	2014-01-19 00:14:13 +02:00
Rolf Ahrenberg	152e87d443	Updated version number.	2014-01-12 22:27:23 +02:00
Rolf Ahrenberg	08223cf6c4	Added initial support for CAMs.	2014-01-12 22:24:50 +02:00
Rolf Ahrenberg	84572d2187	Fixed indentation.	2014-01-12 01:02:03 +02:00
Rolf Ahrenberg	78554b53b6	Updated translation files and HISTORY.	2014-01-11 00:08:06 +02:00
Rolf Ahrenberg	11554a8d7e	Updated the femonclient package.	2014-01-06 22:40:31 +02:00
Rolf Ahrenberg	0d06635520	Fixed freeing memory.	2014-01-06 22:36:54 +02:00
Rolf Ahrenberg	eedab47c35	Updated Makefile.	2014-01-06 22:00:59 +02:00
Rolf Ahrenberg	cba5171a09	Fixed scan-build issues.	2014-01-02 21:33:34 +02:00
Rolf Ahrenberg	91d6cb4074	Fixed a crash in SVDRP (Thanks for Lothar Englisch for reporting).	2013-11-19 22:29:36 +02:00
Rolf Ahrenberg	bf222dc7ff	Updated for vdr-2.0.0.	2013-04-01 22:35:11 +03:00
Rolf Ahrenberg	33176e9a77	Updated French translation (Thanks to Bernard Jaulin).	2013-03-23 19:13:35 +02:00
Rolf Ahrenberg	0a4e5d912c	Added Slovak translation (Thanks to Milan Hrala).	2013-03-20 21:43:45 +02:00
Rolf Ahrenberg	3648b46fa2	Added SetMenuCategory(mcSetupPlugins).	2013-03-13 23:36:15 +02:00
Rolf Ahrenberg	c5267f5390	Updated HISTORY.	2013-03-10 21:18:23 +02:00
Rolf Ahrenberg	30d7eea514	Fixed Rolloff/StreamId layouts and updated Finnish translation.	2013-03-10 20:12:17 +02:00
Rolf Ahrenberg	09d17772d2	Updated for vdr-1.7.40.	2013-03-10 18:52:01 +02:00
Rolf Ahrenberg	ee43f5936f	Updated French translation (Thanks to Bernard Jaulin).	2013-03-09 13:19:03 +02:00
Rolf Ahrenberg	10b8463283	Fixed cppcheck warnings.	2013-03-06 09:28:16 +02:00
Rolf Ahrenberg	046c94d39c	Updated vdr-femonclient.	2013-02-10 17:23:49 +02:00
Rolf Ahrenberg	c3506e2279	Updated for vdr-1.7.37.	2013-02-10 16:51:51 +02:00
Rolf Ahrenberg	d0b6944292	Declared cppcheck as a PHONY target.	2013-01-22 22:11:23 +02:00
Rolf Ahrenberg	932f727e91	Removed OBJS dependency from cppcheck target.	2013-01-22 22:05:20 +02:00
Rolf Ahrenberg	e8fa85929a	Updated for vdr-1.7.36.	2013-01-20 21:30:51 +02:00
Rolf Ahrenberg	70cda8a640	Updated translation files.	2013-01-04 00:18:20 +02:00
Rolf Ahrenberg	655b5a1865	Updated for vdr-1.7.35. Modified how the receiver is detached. Updated the femonclient plugin.	2013-01-03 23:34:19 +02:00
Rolf Ahrenberg	2f6b971c92	Added Ukrainian translation (Thanks to Yarema aka Knedlyk).	2012-12-01 00:10:47 +02:00
Rolf Ahrenberg	379de93bee	Remove the obsolete notes.	2012-04-04 22:02:59 +03:00
Rolf Ahrenberg	5b5f704ea8	Removed cppcheck warnings and updated HISTORY.	2012-04-02 19:25:31 +03:00
Rolf Ahrenberg	2d849b4fb8	Added transponder info window support for IPTV devices.	2012-04-01 22:39:33 +03:00
Rolf Ahrenberg	0e6457ab42	Added an info line for IPTV devices.	2012-03-31 13:22:11 +03:00
Rolf Ahrenberg	0f8cc6c9ce	Modified cFemonReceiver constructor.	2012-03-31 11:47:57 +03:00
Rolf Ahrenberg	f1d9b112a4	Added a new theme: PearlHD (Thanks to Taipan @ VDRPortal).	2012-03-30 20:48:25 +03:00
Rolf Ahrenberg	4431cf57d9	Silenced error log messages when accessing pseudo devices.	2012-03-29 23:31:44 +03:00
Rolf Ahrenberg	18840de217	Added the dynamite compatibility patch (Thanks to Lars Hanisch).	2012-03-29 21:48:52 +03:00
Rolf Ahrenberg	315a3365ba	Updated for vdr-1.7.27.	2012-03-25 16:55:42 +03:00
Rolf Ahrenberg	8e1e025b0f	Updated default CXXFLAGS.	2012-03-25 16:02:16 +03:00
Rolf Ahrenberg	543accdd06	Cleaned up compilation warnings again.	2012-03-19 18:09:16 +02:00
Rolf Ahrenberg	66eca7f8b5	Fixed channel switching. Cleaned up compilation warnings.	2012-03-12 21:59:34 +02:00
Rolf Ahrenberg	905b7c0870	Updated for a new release version.	2012-03-10 23:07:03 +02:00
Rolf Ahrenberg	597425a271	Updated for vdr-1.7.26.	2012-03-10 23:05:38 +02:00
Rolf Ahrenberg	86210928b8	Updated for vdr-1.7.25.	2012-03-03 15:19:18 +02:00
Rolf Ahrenberg	c98fe8ca87	Added a GIT tag into the version string.	2012-02-26 22:54:18 +02:00
Rolf Ahrenberg	5598f7cc43	Silenced compilation warnings.	2012-02-19 18:54:19 +02:00
Rolf Ahrenberg	62f1f5f776	Updated Makefile.	2012-02-19 17:48:21 +02:00
Rolf Ahrenberg	8ba74bf5c4	Silenced compilation warnings - again.	2012-02-05 18:21:07 +02:00
Rolf Ahrenberg	38fbb2d47d	Updated translation files.	2012-02-05 14:08:01 +02:00
Rolf Ahrenberg	09cf40f215	Added initial support for PVRINPUT devices (Thanks to Winfried Köhler). Added initial support for IPTV devices.	2012-02-05 14:04:04 +02:00
Rolf Ahrenberg	d809e98052	Silenced a compilation warning.	2012-02-05 11:39:14 +02:00