Updated vdr-femonclient.

Cleaned up compilation warnings.

HISTORY

@@ -427,3 +427,35 @@ 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).

Makefile

@@ -2,121 +2,134 @@
 # Makefile for Frontend Status Monitor plugin
 #
 
-# Debugging on/off 
+# Debugging on/off
+
 #FEMON_DEBUG = 1
 
 # Strip debug symbols?  Set eg. to /bin/true if not
+
 STRIP = strip
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = femon
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -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 --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+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 --enable=all -v -f $(OBJS:%.o=%.c)

README

@@ -97,9 +97,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

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 < 10737
+#error "VDR-1.7.37 API version or greater is required!"
 #endif
 
-static const char VERSION[]       = "1.7.12";
+#ifndef GITVERSION
+#define GITVERSION ""
+#endif
+
+static const char VERSION[]       = "1.7.18" GITVERSION;
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 
@@ -135,7 +139,7 @@ bool cPluginFemon::Service(const char *Id, void *Data)
         FemonService_v1_0 *data = (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,9 +198,9 @@ 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;
      }
@@ -311,6 +315,7 @@ cMenuFemonSetup::cMenuFemonSetup(void)
   themes[eFemonThemeEgalsTry]      = tr("EgalsTry");
   themes[eFemonThemeDuotone]       = tr("Duotone");
   themes[eFemonThemeSilverGreen]   = tr("SilverGreen");
+  themes[eFemonThemePearlHD]       = tr("PearlHD");
 
   data = femonConfig;
   Setup();

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
 };

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);

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},

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);

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
+  },
 };

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];

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
 };

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);

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

femonmpeg.h

@@ -16,9 +16,9 @@ private:
   cFemonVideoIf *m_VideoHandler;
   cFemonAudioIf *m_AudioHandler;
 
-  static unsigned int s_Bitrates[2][3][16];
-  static unsigned int s_Samplerates[2][4];
-  static eAudioCodec  s_Formats[2][4];
+  static int s_Bitrates[2][3][16];
+  static int s_Samplerates[2][4];
+  static eAudioCodec s_Formats[2][4];
 
 public:
   cFemonMPEG(cFemonVideoIf *videohandler, cFemonAudioIf *audiohandler);

femonosd.c

@@ -11,6 +11,7 @@
 
 #include <ctype.h>
 #include <math.h>
+#include "iptvservice.h"
 #include "femoncfg.h"
 #include "femonreceiver.h"
 #include "femontools.h"
@@ -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()));
@@ -433,10 +436,12 @@ void cFemonOsd::DrawInfoWindow(void)
                    OSDDRAWINFOLEFT( trVDR("System"),       *getSatelliteSystem(dtp.System()));
                    if (dtp.System())
                    OSDDRAWINFORIGHT(trVDR("RollOff"),      *getRollOff(dtp.RollOff()));
+                   }
                    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 +451,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()));
@@ -466,6 +473,25 @@ void cFemonOsd::DrawInfoWindow(void)
                    OSDDRAWINFOLEFT( trVDR("System"),       *getTerrestrialSystem(dtp.System()));
                    if (dtp.System())
                    OSDDRAWINFORIGHT(trVDR("PlpId"),        *cString::sprintf("%d", dtp.PlpId()));
+                   }
+                   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);
+                         offset += OSDROWHEIGHT;
+                         }
+                      }
+                   }
                    break;
 
               default:
@@ -549,76 +575,114 @@ void cFemonOsd::Action(void)
     m_SvdrpFrontend = -1;
     m_SvdrpVideoBitrate = -1.0;
     m_SvdrpAudioBitrate = -1.0;
-    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_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 (m_SvdrpConnection.handle >= 0) {
-       cmd.handle = m_SvdrpConnection.handle;
-       m_SvdrpPlugin->Service("SvdrpCommand-v1.0", &cmd);
-       if (cmd.responseCode == 900) {
-          m_StrengthValid = false;
-          m_QualityValid = false;
-          m_FrontendStatusValid = false;
-          m_SignalValid = false;
-          m_SNRValid = false;
-          m_BERValid = false;
-          m_UNCValid = false;
-          for (cLine *line = cmd.reply.First(); line; line = cmd.reply.Next(line)) {
-              const char *s = line->Text();
-	      if (!strncasecmp(s, "CARD:", 5))
-                 m_SvdrpFrontend = (int)strtol(s + 5, NULL, 10);
-              else if (!strncasecmp(s, "STRG:", 5)) {
-                 m_Strength = (int)strtol(s + 5, NULL, 10);
-                 m_StrengthValid = (m_Strength >= 0);
-                 }
-              else if (!strncasecmp(s, "QUAL:", 5)) {
-                 m_Quality = (int)strtol(s + 5, NULL, 10);
-                 m_QualityValid = (m_Quality >= 0);
-                 }
-              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));
-                 }
-              else if (!strncasecmp(s, "STAT:", 5)) {
-                 m_FrontendStatus = (fe_status_t)strtol(s + 5, NULL, 16);
-                 m_FrontendStatusValid = true;
-                 }
-              else if (!strncasecmp(s, "SGNL:", 5)) {
-                 m_Signal = (uint16_t)strtol(s + 5, NULL, 16);
-                 m_SignalValid = true;
-                 }
-              else if (!strncasecmp(s, "SNRA:", 5)) {
-                 m_SNR = (uint16_t)strtol(s + 5, NULL, 16);
-                 m_SNRValid = true;
-                 }
-              else if (!strncasecmp(s, "BERA:", 5)) {
-                 m_BER = (uint32_t)strtol(s + 5, NULL, 16);
-                 m_BERValid = true;
-                 }
-              else if (!strncasecmp(s, "UNCB:", 5)) {
-                 m_UNC = (uint32_t)strtol(s + 5, NULL, 16);
-                 m_UNCValid = true;
-                 }
-              else if (!strncasecmp(s, "VIBR:", 5))
-                 m_SvdrpVideoBitrate = (double)strtol(s + 5, NULL, 10);
-              else if (!strncasecmp(s, "AUBR:", 5))
-                 m_SvdrpAudioBitrate = (double)strtol(s + 5, NULL, 10);
+    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 (m_SvdrpConnection.handle >= 0) {
+              cmd.handle = m_SvdrpConnection.handle;
+              m_SvdrpPlugin->Service("SvdrpCommand-v1.0", &cmd);
+              if (cmd.responseCode == 900) {
+                 m_StrengthValid = false;
+                 m_QualityValid = false;
+                 m_FrontendStatusValid = false;
+                 m_SignalValid = false;
+                 m_SNRValid = false;
+                 m_BERValid = false;
+                 m_UNCValid = false;
+                 for (cLine *line = cmd.reply.First(); line; line = cmd.reply.Next(line)) {
+                     const char *s = line->Text();
+	             if (!strncasecmp(s, "CARD:", 5))
+                        m_SvdrpFrontend = (int)strtol(s + 5, NULL, 10);
+                     else if (!strncasecmp(s, "STRG:", 5)) {
+                        m_Strength = (int)strtol(s + 5, NULL, 10);
+                        m_StrengthValid = (m_Strength >= 0);
+                        }
+                     else if (!strncasecmp(s, "QUAL:", 5)) {
+                        m_Quality = (int)strtol(s + 5, NULL, 10);
+                        m_QualityValid = (m_Quality >= 0);
+                        }
+                     else if (!strncasecmp(s, "TYPE:", 5))
+                        m_FrontendInfo.type = (fe_type_t)strtol(s + 5, NULL, 10);
+                     else if (!strncasecmp(s, "NAME:", 5)) {
+                        m_FrontendName = s + 5;
+                        }
+                     else if (!strncasecmp(s, "STAT:", 5)) {
+                        m_FrontendStatus = (fe_status_t)strtol(s + 5, NULL, 16);
+                        m_FrontendStatusValid = true;
+                        }
+                     else if (!strncasecmp(s, "SGNL:", 5)) {
+                        m_Signal = (uint16_t)strtol(s + 5, NULL, 16);
+                        m_SignalValid = true;
+                        }
+                     else if (!strncasecmp(s, "SNRA:", 5)) {
+                        m_SNR = (uint16_t)strtol(s + 5, NULL, 16);
+                        m_SNRValid = true;
+                        }
+                     else if (!strncasecmp(s, "BERA:", 5)) {
+                        m_BER = (uint32_t)strtol(s + 5, NULL, 16);
+                        m_BERValid = true;
+                        }
+                     else if (!strncasecmp(s, "UNCB:", 5)) {
+                        m_UNC = (uint32_t)strtol(s + 5, NULL, 16);
+                        m_UNCValid = true;
+                        }
+                     else if (!strncasecmp(s, "VIBR:", 5))
+                        m_SvdrpVideoBitrate = (double)strtol(s + 5, NULL, 10);
+                     else if (!strncasecmp(s, "AUBR:", 5))
+                        m_SvdrpAudioBitrate = (double)strtol(s + 5, NULL, 10);
+                     }
+                 }
+              }
+           break;
+      }
+    DrawInfoWindow();
+    DrawStatusWindow();
     m_Sleep.Wait(max((int)(100 * femonConfig.updateinterval - t.Elapsed()), 3));
     }
 }
@@ -627,26 +691,40 @@ void cFemonOsd::Show(void)
 {
   debug("%s()\n", __PRETTY_FUNCTION__);
   eTrackType track = cDevice::PrimaryDevice()->GetCurrentAudioTrack();
-  cDvbDevice *dev = dynamic_cast<cDvbDevice*>(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) {
-        if (!femonConfig.usesvdrp)
-           error("cFemonOsd::Show() cannot read frontend info.");
-        close(m_Frontend);
-        m_Frontend = -1;
-        memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+  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) {
+           if (!femonConfig.usesvdrp)
+              error("cFemonOsd::Show() cannot read frontend info.");
+           close(m_Frontend);
+           m_Frontend = -1;
+           memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+           return;
+           }
+        }
+     else if (femonConfig.usesvdrp) {
+        if (!SvdrpConnect() || !SvdrpTune())
+           return;
+        }
+     else {
+        error("cFemonOsd::Show() cannot open frontend device.");
         return;
         }
      }
-  else if (femonConfig.usesvdrp) {
-     if (!SvdrpConnect() || !SvdrpTune())
-        return;
-     }
-  else {
-     error("cFemonOsd::Show() cannot open frontend device.");
-     return;
-     }
+  else
+     m_Frontend = -1;
 
   m_Osd = cOsdProvider::NewOsd(m_OsdLeft, m_OsdTop);
   if (m_Osd) {
@@ -667,55 +745,66 @@ 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));
-           cDevice::ActualDevice()->AttachReceiver(m_Receiver);
-           }
+     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;
-  close(m_Frontend);
-  cDvbDevice *dev = dynamic_cast<cDvbDevice*>(cDevice::ActualDevice());
-  m_Frontend = dev ? open(*cString::sprintf(FRONTEND_DEVICE, dev->Adapter(), dev->Frontend()), O_RDONLY | O_NONBLOCK) : -1;
+
+  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) {
-     if (ioctl(m_Frontend, FE_GET_INFO, &m_FrontendInfo) < 0) {
-        if (!femonConfig.usesvdrp)
-           error("cFemonOsd::ChannelSwitch() cannot read frontend info.");
-        close(m_Frontend);
-        m_Frontend = -1;
-        memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+     close(m_Frontend);
+     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) {
+           if (!femonConfig.usesvdrp)
+              error("cFemonOsd::ChannelSwitch() cannot read frontend info.");
+           close(m_Frontend);
+           m_Frontend = -1;
+           memset(&m_FrontendInfo, 0, sizeof(m_FrontendInfo));
+           return;
+           }
+        }
+     else if (femonConfig.usesvdrp) {
+        if (!SvdrpConnect() || !SvdrpTune())
+           return;
+        }
+     else {
+        error("cFemonOsd::ChannelSwitch() cannot open frontend device.");
         return;
         }
      }
-  else if (femonConfig.usesvdrp) {
-     if (!SvdrpConnect() || !SvdrpTune())
-        return;
-     }
-  else {
-     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));
-        cDevice::ActualDevice()->AttachReceiver(m_Receiver);
-        }
+  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);
      }
 }
 
@@ -728,9 +817,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);
         }
      }
@@ -755,13 +844,13 @@ bool cFemonOsd::DeviceSwitch(int direction)
               }
            if (cDevice::GetDevice(device)->ProvidesChannel(channel, 0)) {
               debug("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, direction, device);
-              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
+              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());
+              cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number(), true);
               return (true);
               }
            }

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:

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;

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);
 

femonsymbol.h

@@ -77,8 +77,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 * DEFAULT_SPACING);  }
+  int GetRounding() { return int(yFactorM * DEFAULT_ROUNDING); }
 };
 
 extern cFemonSymbolCache femonSymbols;

femontools.c

@@ -25,41 +25,41 @@ static cString getCA(int value)
   switch (value) {
     case 0x0000:            return cString::sprintf("%s (%X)", trVDR("Free To Air"), value);  // Reserved
     case 0x0001 ... 0x009F:
-    case 0x00A2 ... 0x00FF: return cString::sprintf("%s (%X)", tr("Fixed"),          value); // Standardized systems
-    case 0x00A0 ... 0x00A1: return cString::sprintf("%s (%X)", tr("Analog"),         value); // Analog signals
-    case 0x0100 ... 0x01FF: return cString::sprintf("%s (%X)", "SECA Mediaguard",    value); // Canal Plus
-    case 0x0464:            return cString::sprintf("%s (%X)", "EuroDec",            value); // EuroDec
-    case 0x0500 ... 0x05FF: return cString::sprintf("%s (%X)", "Viaccess",           value); // France Telecom
-    case 0x0600 ... 0x06FF: return cString::sprintf("%s (%X)", "Irdeto",             value); // Irdeto
-    case 0x0900 ... 0x09FF: return cString::sprintf("%s (%X)", "NDS Videoguard",     value); // News Datacom
-    case 0x0B00 ... 0x0BFF: return cString::sprintf("%s (%X)", "Conax",              value); // Norwegian Telekom
-    case 0x0D00 ... 0x0DFF: return cString::sprintf("%s (%X)", "CryptoWorks",        value); // Philips
-    case 0x0E00 ... 0x0EFF: return cString::sprintf("%s (%X)", "PowerVu",            value); // Scientific Atlanta
-    case 0x1000:            return cString::sprintf("%s (%X)", "RAS",                value); // Tandberg Television
-    case 0x1200 ... 0x12FF: return cString::sprintf("%s (%X)", "NagraVision",        value); // BellVu Express
-    case 0x1700 ... 0x17FF: return cString::sprintf("%s (%X)", "BetaCrypt",          value); // BetaTechnik
-    case 0x1800 ... 0x18FF: return cString::sprintf("%s (%X)", "NagraVision",        value); // Kudelski SA
-    case 0x22F0:            return cString::sprintf("%s (%X)", "Codicrypt",          value); // Scopus Network Technologies
-    case 0x2600:            return cString::sprintf("%s (%X)", "BISS",               value); // European Broadcasting Union
-    case 0x4347:            return cString::sprintf("%s (%X)", "CryptOn",            value); // CryptOn
-    case 0x4800:            return cString::sprintf("%s (%X)", "Accessgate",         value); // Telemann
-    case 0x4900:            return cString::sprintf("%s (%X)", "China Crypt",        value); // CryptoWorks
-    case 0x4A10:            return cString::sprintf("%s (%X)", "EasyCas",            value); // EasyCas
-    case 0x4A20:            return cString::sprintf("%s (%X)", "AlphaCrypt",         value); // AlphaCrypt
-    case 0x4A70:            return cString::sprintf("%s (%X)", "DreamCrypt",         value); // Dream Multimedia
-    case 0x4A60:            return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
-    case 0x4A61:            return cString::sprintf("%s (%X)", "Neotioncrypt",       value); // Neotion
-    case 0x4A62:            return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
-    case 0x4A63:            return cString::sprintf("%s (%X)", "Neotion SHL",        value); // Neotion
-    case 0x4A64 ... 0x4A6F: return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
-    case 0x4A80:            return cString::sprintf("%s (%X)", "ThalesCrypt",        value); // TPS
-    case 0x4AA1:            return cString::sprintf("%s (%X)", "KeyFly",             value); // SIDSA
-    case 0x4ABF:            return cString::sprintf("%s (%X)", "DG-Crypt",           value); // Beijing Compunicate Technology Inc.
-    case 0x4AD0 ... 0x4AD1: return cString::sprintf("%s (%X)", "X-Crypt",            value); // XCrypt Inc.
-    case 0x4AD4:            return cString::sprintf("%s (%X)", "OmniCrypt",          value); // Widevine Technologies, Inc.
-    case 0x4AE0:            return cString::sprintf("%s (%X)", "RossCrypt",          value); // Digi Raum Electronics Co. Ltd.
-    case 0x5500:            return cString::sprintf("%s (%X)", "Z-Crypt",            value); // Digi Raum Electronics Co. Ltd.
-    case 0x5501:            return cString::sprintf("%s (%X)", "Griffin",            value); // Griffin
+    case 0x00A2 ... 0x00FF: return cString::sprintf("%s (%X)", tr("Fixed"),  value); // Standardized systems
+    case 0x00A0 ... 0x00A1: return cString::sprintf("%s (%X)", tr("Analog"), value); // Analog signals
+    case 0x0100 ... 0x01FF: return cString::sprintf("SECA Mediaguard (%X)",  value); // Canal Plus
+    case 0x0464:            return cString::sprintf("EuroDec (%X)",          value); // EuroDec
+    case 0x0500 ... 0x05FF: return cString::sprintf("Viaccess (%X)",         value); // France Telecom
+    case 0x0600 ... 0x06FF: return cString::sprintf("Irdeto (%X)",           value); // Irdeto
+    case 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 +76,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 +107,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 +131,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)

femontools.h

@@ -26,6 +26,8 @@
 
 #define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"
 
+cDvbDevice *getDvbDevice(cDevice* device);
+
 cString getFrontendInfo(cDvbDevice *device);
 cString getFrontendName(cDvbDevice *device);
 cString getFrontendStatus(cDvbDevice *device);

iptvservice.h

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

po/de_DE.po

@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\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"
@@ -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"
 

po/es_ES.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\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"
@@ -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"
 

po/et_EE.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\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"
@@ -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"
 

po/fi_FI.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\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"
@@ -64,6 +64,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"
 
+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Piilota valinta päävalikosta"
 
@@ -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"
 
@@ -381,3 +387,9 @@ msgstr "Mbit/s"
 
 msgid "kbit/s"
 msgstr "kbit/s"
+
+#~ msgid "Information"
+#~ msgstr "Tiedot"
+
+#~ msgid "Statistics"
+#~ msgstr "Tilastot"

po/fr_FR.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\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"
@@ -64,6 +64,9 @@ msgstr "Duotone"
 msgid "SilverGreen"
 msgstr "SilverGreen"
 
+msgid "PearlHD"
+msgstr "PearlHD"
+
 msgid "Hide main menu entry"
 msgstr "Masquer dans le menu principal"
 
@@ -175,6 +178,12 @@ msgstr "Rid"
 msgid "Coderate"
 msgstr "Coderate"
 
+msgid "Protocol"
+msgstr ""
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
 msgid "Stream Information"
 msgstr "Information flux"
 
@@ -184,9 +193,6 @@ msgstr "Flux vid
 msgid "Codec"
 msgstr ""
 
-msgid "Bitrate"
-msgstr "Bitrate"
-
 msgid "Aspect Ratio"
 msgstr "Proportions d'image"
 

po/hu_HU.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-10-10 10:10+0200\n"
+"POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0200\n"
 "Last-Translator: F<>ley Istv<74>n <ifuley at tigercomp dot ro>\n"
 "Language-Team: Hungarian <ifuley at tigercomp dot ro>\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"
-

po/it_IT.po

@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\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"
@@ -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"
 

po/lt_LT.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\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"
@@ -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"
 

po/ru_RU.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\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"
@@ -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 ""
 

po/uk_UA.po

@@ -0,0 +1,399 @@
+# 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 1.7.18\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: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
+"Language-Team: Ukrainian <translation@linux.org.ua>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\\n\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "Монітор інформації про DVB сигнал"
+
+msgid "Signal Information"
+msgstr "Інформація про сигнал"
+
+msgid "Femon not available"
+msgstr "Femon не доступний"
+
+msgid "basic"
+msgstr "основне"
+
+msgid "transponder"
+msgstr "транспондер"
+
+msgid "stream"
+msgstr "потік"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Класичний"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "ST:TNG"
+msgstr "ST:TNG"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "PearlHD"
+msgstr "PearlHD"
+
+msgid "Hide main menu entry"
+msgstr "Сховати в головному меню"
+
+msgid "Define whether the main menu entry is hidden."
+msgstr "Визначення, чи приховувати в головному меню"
+
+msgid "Default display mode"
+msgstr "Типовий режим показу"
+
+msgid "Define the default display mode at startup."
+msgstr "Визначення типового режиму показу при запуску"
+
+msgid "Define the used OSD skin."
+msgstr "Визначення шкірки для повідомлень"
+
+msgid "Define the used OSD theme."
+msgstr "Визначення теми повідомлень"
+
+msgid "Position"
+msgstr "Позиція"
+
+msgid "Define the position of OSD."
+msgstr "Визначити позицію показу повідомлень"
+
+msgid "Downscale OSD size [%]"
+msgstr "Масштаб розміру повідомлень [%]"
+
+msgid "Define the downscale ratio for OSD size."
+msgstr "Визначити коефіцієнт масштабування розміру повідомлень"
+
+msgid "Red limit [%]"
+msgstr "Червона границя [%]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "Визначення границі червоної поділки, яка показує поганий сигнал."
+
+msgid "Green limit [%]"
+msgstr "Зелена границя [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "Визначення границі зеленої поділки, яка показує добрий сигнал."
+
+msgid "OSD update interval [0.1s]"
+msgstr "Інтервал оновлення повідомлень [0.1с]"
+
+msgid ""
+"Define an interval for OSD updates. The smaller interval generates higher "
+"CPU load."
+msgstr ""
+"Визначення інтервалу оновлення повідомлень. Малий інтервал спричинює більше "
+"завантаження процесора."
+
+msgid "Analyze stream"
+msgstr "Аналіз потоку"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "Визначення, чи проводити аналіз DVB потоку і обчислення бітрейту"
+
+msgid "Calculation interval [0.1s]"
+msgstr "Інтервал обчислення [0.1с]"
+
+msgid ""
+"Define an interval for calculation. The bigger interval generates more "
+"stable values."
+msgstr ""
+"Визначення інтервалу обчислення. Більший інтервал дає стабільніші значення."
+
+msgid "Use SVDRP service"
+msgstr "Використати SVDRP сервіс"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+"Визначення чи буде використовуватися SVDRP сервіс в налаштуваннях клієнта/"
+"сервера"
+
+msgid "SVDRP service port"
+msgstr "Порт SVDRP сервісу"
+
+msgid "Define the port number of SVDRP service."
+msgstr "Визначення номеру порту SVDRP сервісу"
+
+msgid "SVDRP service IP"
+msgstr "IP сервісу SVDRP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "Визначення IP адреси сервісу SVDRP."
+
+msgid "Help"
+msgstr "Допомога"
+
+msgid "Video"
+msgstr "Відео"
+
+msgid "Audio"
+msgstr "Аудіо"
+
+msgid "Transponder Information"
+msgstr "Інформація про транспондер"
+
+msgid "Apid"
+msgstr "Apid"
+
+msgid "Dpid"
+msgstr "Dpid"
+
+msgid "Spid"
+msgstr "Spid"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Coderate"
+msgstr "Шв. кодування"
+
+msgid "Protocol"
+msgstr "Протокол"
+
+msgid "Bitrate"
+msgstr "Бітрейт"
+
+msgid "Stream Information"
+msgstr "Інформація про потік"
+
+msgid "Video Stream"
+msgstr "Відео потік"
+
+msgid "Codec"
+msgstr "Кодек"
+
+msgid "Aspect Ratio"
+msgstr "Співвідношення сторін"
+
+msgid "Frame Rate"
+msgstr "Частота кадрів"
+
+msgid "Video Format"
+msgstr "Формат відео"
+
+msgid "Resolution"
+msgstr "Роздільна здатність"
+
+msgid "Audio Stream"
+msgstr "Аудіо потік"
+
+msgid "Channel Mode"
+msgstr "Режим каналу"
+
+msgid "Sampling Frequency"
+msgstr "Частота"
+
+msgid "AC-3 Stream"
+msgstr "AC-3 потік"
+
+msgid "Bit Stream Mode"
+msgstr "Режим бітового потоку:"
+
+msgid "Audio Coding Mode"
+msgstr "Режим кодування малюнка"
+
+msgid "Center Mix Level"
+msgstr "Рівень міксування в центрі"
+
+msgid "Surround Mix Level"
+msgstr "Рівень міксування заповнення"
+
+msgid "Dolby Surround Mode"
+msgstr "Режим Dolby Surround"
+
+msgid "Low Frequency Effects"
+msgstr "Ефекти низької частоти"
+
+msgid "Dialogue Normalization"
+msgstr "Нормалізація гучності"
+
+msgid "Fixed"
+msgstr "Фіксовано"
+
+msgid "Analog"
+msgstr "Аналог."
+
+msgid "MPEG-2"
+msgstr "MPEG-2"
+
+msgid "H.264"
+msgstr "H.264"
+
+msgid "MPEG-1 Layer I"
+msgstr "MPEG-1 Layer I"
+
+msgid "MPEG-1 Layer II"
+msgstr "MPEG-1 Layer II"
+
+msgid "MPEG-1 Layer III"
+msgstr "MPEG-1 Layer III"
+
+msgid "MPEG-2 Layer I"
+msgstr "MPEG-2 Layer I"
+
+msgid "MPEG-2 Layer II"
+msgstr "MPEG-2 Layer II"
+
+msgid "MPEG-2 Layer III"
+msgstr "MPEG-2 Layer III"
+
+msgid "HE-AAC"
+msgstr "HE-AAC"
+
+msgid "LATM"
+msgstr "LATM"
+
+msgid "stereo"
+msgstr "стерео"
+
+msgid "joint Stereo"
+msgstr "об’єднане стерео"
+
+msgid "dual"
+msgstr "дуальний"
+
+msgid "mono"
+msgstr "моно"
+
+msgid "interlaced"
+msgstr "черезрядкове"
+
+msgid "progressive"
+msgstr "прогресивне"
+
+msgid "reserved"
+msgstr "зарезервовано"
+
+msgid "extended"
+msgstr "розширено"
+
+msgid "unknown"
+msgstr "невідомо"
+
+msgid "component"
+msgstr "компонентно"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "SECAM"
+msgstr "SECAM"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Hz"
+msgstr "Гц"
+
+msgid "Complete Main (CM)"
+msgstr "Заповнення основного (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Музика і ефекти (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "Слабозорі (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "Погіршений слух (HI)"
+
+msgid "Dialogue (D)"
+msgstr "Діалог (D)"
+
+msgid "Commentary (C)"
+msgstr "Коментарі (C)"
+
+msgid "Emergency (E)"
+msgstr "Аварійне (E)"
+
+msgid "Voice Over (VO)"
+msgstr "Голос через (VO)"
+
+msgid "Karaoke"
+msgstr "Караоке"
+
+msgid "Ch1"
+msgstr "Кан.1"
+
+msgid "Ch2"
+msgstr "Кан.2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "L"
+
+msgid "R"
+msgstr "R"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SL"
+
+msgid "SR"
+msgstr "Симв.шв."
+
+msgid "dB"
+msgstr "дБ"
+
+msgid "not indicated"
+msgstr "не вказано"
+
+msgid "MHz"
+msgstr "МГц"
+
+msgid "free"
+msgstr "вільний"
+
+msgid "Mbit/s"
+msgstr "Мбіт/c"
+
+msgid "kbit/s"
+msgstr "кбіт/с"

po/zh_CN.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\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"
@@ -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 "纵横比"
 

po/zh_TW.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.12\n"
+"Project-Id-Version: vdr-femon 1.7.18\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"
@@ -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 "縱橫比"