Updated Italian translation (Thanks to Diego Pierotto).

Added '-Wno-parentheses' to the compiler options. Mapped 'kInfo' as help key in setup menu.
Added Spids support.
2023-10-10 11:36:53 +00:00 · 2008-01-20 04:20:00 +02:00 · 2007-10-14 04:20:00 +03:00 · 2007-08-19 04:20:00 +03:00 · 2007-08-14 04:20:00 +03:00 · 2007-05-15 04:20:00 +03:00
56 changed files with 4124 additions and 3426 deletions
--- a/18
+++ b/18
@@ -2,7 +2,7 @@
 		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA


 Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
--- a/104
+++ b/104
@@ -176,3 +176,107 @@ VDR Plugin 'femon' Revision History

 - Updated for vdr-1.3.31.
 - Added preliminary svdrp and service support.
+
+2005-10-04: Version 0.9.4
+
+- Updated for vdr-1.3.34.
+- Added Enigma theme (Thanks to Rolf Hoverath).
+- Added EgalsTry theme (Thanks to Uwe Hanke).
+- Added option to disable rounded corners.
+
+2005-11-13: Version 0.9.5
+
+- Updated for vdr-1.3.36.
+- Added french translation (Thanks to Nicolas Huillard).
+- Enabled bitrate commands via SVDRP.
+- Added new SVDRP commands.
+- Modified femon service without incrementing version number.
+- Added "Duotone" theme for 2bpp on screen displays.
+- Fixed crash bug in femonreceiver.
+- Fixed setup page bug (Thanks to Thomas G<>nther for reporting this one).
+
+2006-01-25: Version 0.9.6
+
+- Updated for vdr-1.3.40.
+- Fixed a translation bug (Thanks to Antti Hartikainen).
+- Fixed AC3 header parsing bug (Thanks to Axel Katzur for reporting this one).
+- Fixed EgalsTry theme (Thanks to Uwe Hanke).
+
+2006-02-06: Version 0.9.7
+
+- Updated for vdr-1.3.42.
+- Added "SilverGreen" theme (Thanks to Rififi77 @ VDRPortal).
+
+2006-03-08: Version 0.9.8
+
+- Updated for vdr-1.3.44.
+- Minor Makefile changes.
+- Made all symbol data 'const'.
+- Added spanish translation (Thanks to Luis Palacios).
+
+2006-04-20: Version 0.9.9
+
+- Updated for vdr-1.3.47.
+
+2006-04-23: Version 0.9.10
+
+- Added STRIP option for Makefile (Thanks to Ville Skytt<74>).
+- Modified APIVERSION code in Makefile.
+
+2006-04-30: Version 1.0.0
+
+- Updated for vdr-1.4.0.
+- Modified APIVERSION code in Makefile.
+- Updated german translation (Thanks to Andreas Brachold).
+
+2006-06-06: Version 1.0.1
+
+- Fixed device switching priority (Thanks to Andreas Brugger).
+- Fixed device switching back to the primary device.
+
+2006-09-17: Version 1.1.0
+
+- Added support for svdrpservice plugin (Thanks to Frank Schmirler).
+- Added INFO SVDRP command (partially based on patch by Herbert P<>tzl).
+- Removed system log option - use SVDRP instead.
+- Added --remove-destination to the 'cp' command in Makefile.
+
+2007-01-08: Version 1.1.1
+
+- Updated for vdr-1.5.0.
+
+2007-05-01: Version 1.1.2
+
+- Fixed opening while replaying (Thanks to Antti Sepp<70>l<EFBFBD> for reporting this one).
+
+2007-05-15: Version 1.1.3
+
+- Fixed a race condition in cFemonReceiver (Thanks to Reinhard Nissl).
+
+2007-10-14: Version 1.1.4
+
+- Backported from 1.2.2.
+
+2008-01-20: Version 1.1.5
+
+- Updated Italian translation (Thanks to Gringo).
+- Added '-Wno-parentheses' to the compiler options.
+
+2007-08-14: Version 1.2.0
+
+- Updated for vdr-1.5.7.
+
+2007-08-19: Version 1.2.1
+
+- Updated for vdr-1.5.8.
+
+2007-10-14: Version 1.2.2
+
+- Added Spids support.
+- Minor OSD layout changes.
+
+2008-01-20: Version 1.2.3
+
+- Updated Italian translation (Thanks to Gringo).
+- Added '-Wno-parentheses' to the compiler options.
+- Mapped 'kInfo' as help key in setup menu.
--- a/73
+++ b/73
@@ -3,28 +3,34 @@
 #
 # $Id$

+# Debugging on/off 
+#FEMON_DEBUG = 1
+
+# NTSC on/off 
+#FEMON_NTSC = 1
+
+# Strip debug symbols?  Set eg. to /bin/true if not
+STRIP = strip
+
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
+# IMPORTANT: the presence of this macro is important for the Make.config
+# file. So it must be defined, even if it is not used here!
 #
 PLUGIN = femon

 ### The version number of this plugin (taken from the main source file):

-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ print $$6 }' | sed -e 's/[";]//g')
+VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')

 ### The C++ compiler and options:

 CXX      ?= g++
-ifdef FEMON_DEBUG
-CXXFLAGS ?= -g -Wall -Woverloaded-virtual -fPIC
-else
-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -fPIC
-endif
+CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses

 ### The directory environment:

-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -33,9 +39,9 @@ TMPDIR = /tmp

 -include $(VDRDIR)/Make.config

-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):

-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)

 ### The name of the distribution archive:

@@ -44,16 +50,16 @@ PACKAGE = vdr-$(ARCHIVE)

 ### Includes and Defines (add further entries here):

-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+INCLUDES += -I$(VDRDIR)/include

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

 ifdef FEMON_NTSC
-DEFINES += -DFEMON_NTSC
+DEFINES += -DNTSC
 endif

 ifdef FEMON_DEBUG
-DEFINES += -DFEMON_DEBUG
+DEFINES += -DDEBUG
 endif

 .PHONY: all all-redirect
@@ -61,32 +67,59 @@ all-redirect: all

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

-OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femoni18n.o femontools.o
+OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femontools.o
+
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n

 ### Implicit rules:

 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<

-# Dependencies:
+### Dependencies:

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

 -include $(DEPFILE)

-### Targets:
+### Internationalization (I18N):

-all: libvdr-$(PLUGIN).so
+PODIR     = po
+LOCALEDIR = $(VDRDIR)/locale
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='Rolf Ahrenberg' -o $@ $^
+
+%.po: $(I18Npot)
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	@touch $@
+
+$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	@mkdir -p $(dir $@)
+	cp $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmsgs) $(I18Npot)
+
+### Targets:

 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
 ifndef FEMON_DEBUG
-	strip $(LIBDIR)/$@.$(VDRVERSION)
+	@$(STRIP) $@
 endif
+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -97,4 +130,4 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz

 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
--- a/41
+++ b/41
@@ -1,11 +1,16 @@
 This is a DVB Frontend Status Monitor plugin for the Video Disk Recorder (VDR).

-Written by:                  R o l f . A h r e n b e r g @ s c i . f i
+Written by:                  Rolf Ahrenberg
+                             < R o l f . A h r e n b e r g @ s c i . f i >

 Project's homepage:          http://www.saunalahti.fi/~rahrenbe/vdr/femon/

 Latest version available at: http://www.saunalahti.fi/~rahrenbe/vdr/femon/

+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 See the file COPYING for license information.

 Requirements:
@@ -28,7 +33,7 @@ the 'libdvb' library by Metzler Brothers.
 Terminology:

 --------------------------------------------------------------
-|## Channel Name ########################## [AR][VF][A/DD][D]|
+|## Channel Name ################### [SVDRP][AR][VF][A/DD][D]|
 |[=====Signal Strength in % ==============|=================]|
 |[=====Signal-to-Noise Ratio in % ========|=================]|
 | STR: #0000 (0%)       BER: #00000000       Video: 0 Mbit/s |
@@ -49,10 +54,11 @@ CARRIER - Found a DVB signal
 VITERBI - FEC (forward error correction) is stable
 SYNC    - Found sync bytes

+SVDRP   - SVDRP connection active (optional)
 AR      - Aspect Ratio: 1:1/4:3/16:9/2.21:1 (optional)
 VF      - Video format: PAL/NTSC (optional)
-A/DD    - Audio (0..5) / AC-3 track (optional)
-D       - Device number: 0..3 (optional)
+A/DD    - Audio (0..N) / AC-3 track (optional)
+D       - Device number: 0..N (optional)

 Controls:

@@ -75,11 +81,26 @@ make
 make plugins
 ./vdr -P femon

+Client-server architecture:
+
+The SVDRP service extension can be used in client-server configurations.
+A streamdev based VDR-to-VDR streaming client can retrieve frontend
+information from a server, if the SVDRP service has been activated and
+properly configured in femon. The svdrpservice plugin is required on the
+VDR client.
+
+If the client fails to open a DVB card frontend corresponding to the
+current receiving device, it will connect to the SVDRP server, look for
+the femon plugin and tune the channel on the server to the one currently
+viewed on the client. If one of these steps fails, the femon OSD won't
+open on the client. An SVDRP icon in the femon title bar indicates that
+the data source is SVDRP. The device number in the title bar is always
+the local device number.
+
 Notes:

- The plugin supports only those DVB cards with _one_ frontend (do any cards
-  with multiple frontends even exist?), because I haven't yet figured howto do
-  it without patching the VDR core.
+- 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.

@@ -92,4 +113,10 @@ Notes:
  any bug reports. NTSC users should use a shrinked default OSD height by
  compiling the plugin with: make FEMON_NTSC=1

+- If the SVDRP service is used: femon won't notice if the server is tuned
+  to a different channel and tuning the channel on the server might annoy
+  people watching live TV. In some situations the server will refuse
+  switching to the requested channel. On a headless server you can avoid
+  this by installing the dummydevice plugin.
+
 "Femon - A real womon who lives according to her natural feminine inclinations."
--- a/femon.c
+++ b/femon.c
@@ -6,28 +6,58 @@
 * $Id$
 */

+#include <vdr/menu.h>
+#include <vdr/remote.h>
+#include <vdr/menu.h>
 #include "femoncfg.h"
-#include "femoni18n.h"
 #include "femonreceiver.h"
 #include "femonosd.h"
 #include "femonservice.h"
 #include "femontools.h"
-#include "femon.h"

-#if VDRVERSNUM && VDRVERSNUM < 10331
-#error "You don't exist! Go away!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10508
+#error "VDR-1.5.8 API version or greater is required!"
 #endif

-cPluginFemon::cPluginFemon(void)
+static const char VERSION[]       = "1.2.3";
+static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
+static const char MAINMENUENTRY[] = trNOOP("Signal Information");
+
+class cPluginFemon : public cPlugin {
+public:
+  cPluginFemon(void);
+  virtual ~cPluginFemon();
+  virtual const char *Version(void) { return VERSION; }
+  virtual const char *Description(void) { return tr(DESCRIPTION); }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual bool Initialize(void);
+  virtual bool Start(void);
+  virtual void Stop(void);
+  virtual void Housekeeping(void);
+  virtual void MainThreadHook(void) {}
+  virtual cString Active(void) { return NULL; }
+  virtual const char *MainMenuEntry(void) { return (femonConfig.hidemenu ? NULL : tr(MAINMENUENTRY)); }
+  virtual cOsdObject *MainMenuAction(void);
+  virtual cMenuSetupPage *SetupMenu(void);
+  virtual bool SetupParse(const char *Name, const char *Value);
+  virtual bool Service(const char *Id, void *Data);
+  virtual const char **SVDRPHelpPages(void);
+  virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
+  };
+
+cPluginFemon::cPluginFemon()
 {
  // Initialize any member variables here.
  // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
  // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
 }

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

 const char *cPluginFemon::CommandLineHelp(void)
@@ -51,7 +81,6 @@ bool cPluginFemon::Initialize(void)
 bool cPluginFemon::Start(void)
 {
  // Start any background activities the plugin shall perform.
-  RegisterI18n(Phrases);
  return true;
 }

@@ -68,18 +97,23 @@ void cPluginFemon::Housekeeping(void)
 cOsdObject *cPluginFemon::MainMenuAction(void)
 {
  // Perform the action when selected from the main VDR menu.
-  return new cFemonOsd();
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  if (cReplayControl::NowReplaying())
+     Skins.Message(mtInfo, tr("Femon not available while replaying"));
+  else
+     return cFemonOsd::Instance(true);
+  return NULL;
 }

 bool cPluginFemon::SetupParse(const char *Name, const char *Value)
 {
  // Parse your own setup parameters and store their values.
  if      (!strcasecmp(Name, "HideMenu"))       femonConfig.hidemenu       = atoi(Value);
-  else if (!strcasecmp(Name, "SyslogOutput"))   femonConfig.syslogoutput   = atoi(Value);
  else if (!strcasecmp(Name, "DisplayMode"))    femonConfig.displaymode    = atoi(Value);
  else if (!strcasecmp(Name, "Position"))       femonConfig.position       = atoi(Value);
  else if (!strcasecmp(Name, "OSDHeight"))      femonConfig.osdheight      = atoi(Value);
  else if (!strcasecmp(Name, "OSDOffset"))      femonConfig.osdoffset      = atoi(Value);
+  else if (!strcasecmp(Name, "Skin"))           femonConfig.skin           = atoi(Value);
  else if (!strcasecmp(Name, "Theme"))          femonConfig.theme          = atoi(Value);
  else if (!strcasecmp(Name, "ShowCASystem"))   femonConfig.showcasystem   = atoi(Value);
  else if (!strcasecmp(Name, "RedLimit"))       femonConfig.redlimit       = atoi(Value);
@@ -87,6 +121,9 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)
  else if (!strcasecmp(Name, "UpdateInterval")) femonConfig.updateinterval = atoi(Value);
  else if (!strcasecmp(Name, "AnalStream"))     femonConfig.analyzestream  = atoi(Value);
  else if (!strcasecmp(Name, "CalcInterval"))   femonConfig.calcinterval   = atoi(Value);
+  else if (!strcasecmp(Name, "UseSvdrp"))       femonConfig.usesvdrp       = atoi(Value);
+  else if (!strcasecmp(Name, "ServerPort"))     femonConfig.svdrpport      = atoi(Value);
+  else if (!strcasecmp(Name, "ServerIp"))       strn0cpy(femonConfig.svdrpip, Value, sizeof(femonConfig.svdrpip));
  else
    return false;
  if (femonConfig.displaymode < 0 || femonConfig.displaymode >= eFemonModeMaxNumber) femonConfig.displaymode = 0;
@@ -105,8 +142,9 @@ bool cPluginFemon::Service(const char *Id, void *Data)
     data->fe_signal = getSignal(ndx);
     data->fe_ber = getBER(ndx);
     data->fe_unc = getUNC(ndx);
-     data->video_bitrate = getVideoBitrate();
-     data->audio_bitrate = getAudioBitrate();
+     data->video_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetVideoBitrate() : 0.0;
+     data->audio_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetAudioBitrate() : 0.0;
+     data->dolby_bitrate = cFemonOsd::Instance() ? cFemonOsd::Instance()->GetDolbyBitrate() : 0.0;
     return true;
     }

@@ -116,6 +154,16 @@ bool cPluginFemon::Service(const char *Id, void *Data)
 const char **cPluginFemon::SVDRPHelpPages(void)
 { 
  static const char *HelpPages[] = {
+    "OPEN\n"
+    "    Open femon plugin.",
+    "QUIT\n"
+    "    Close femon plugin.",
+    "NEXT\n"
+    "    Switch to next possible device.",
+    "PREV\n"
+    "    Switch to previous possible device.",
+    "INFO\n"
+    "    Print the current frontend information.",
    "NAME\n"
    "    Print the current frontend name.",
    "STAT\n"
@@ -127,11 +175,13 @@ const char **cPluginFemon::SVDRPHelpPages(void)
    "BERA\n"
    "    Print the current bit error rate.",
    "UNCB\n"
-    "    Print the current uncorrcted blocks rate.",
+    "    Print the current uncorrected blocks rate.",
    "VIBR\n"
-    "    Print the current video bitrate [Mbit/s].",
+    "    Print the actual device and current video bitrate [Mbit/s].",
    "AUBR\n"
-    "    Print the current audio bitrate [kbit/s].",
+    "    Print the actual device and current audio bitrate [kbit/s].",
+    "DDBR\n"
+    "    Print the actual device and current dolby bitrate [kbit/s].",
    NULL
    };
  return HelpPages;
@@ -139,45 +189,112 @@ const char **cPluginFemon::SVDRPHelpPages(void)

 cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
 {
-  if (strcasecmp(Command, "NAME") == 0) {
+  if (strcasecmp(Command, "OPEN") == 0) {
+     if (cReplayControl::NowReplaying()) {
+        ReplyCode = 550; // Requested action not taken
+        return cString("Cannot open femon plugin while replaying");
+        }
+     if (!cFemonOsd::Instance())
+        cRemote::CallPlugin("femon");
+     return cString("Opening femon plugin");
+     }
+  else if (strcasecmp(Command, "QUIT") == 0) {
+     if (cFemonOsd::Instance())
+        cRemote::Put(kBack);
+     return cString("Closing femon plugin");
+     }
+  else if (strcasecmp(Command, "NEXT") == 0) {
+     if (cFemonOsd::Instance())
+        return cString::sprintf("Switching to next device: %s", cFemonOsd::Instance()->DeviceSwitch(1) ? "ok" : "failed");
+     else
+        return cString("Cannot switch device");
+     }
+  else if (strcasecmp(Command, "PREV") == 0) {
+     if (cFemonOsd::Instance())
+        return cString::sprintf("Switching to previous device: %s", cFemonOsd::Instance()->DeviceSwitch(-1) ? "ok" : "failed");
+     else
+        return cString("Cannot switch device");
+     }
+  else if (strcasecmp(Command, "INFO") == 0) {
+     return getFrontendInfo(cDevice::ActualDevice()->CardIndex());
+     }
+  else if (strcasecmp(Command, "NAME") == 0) {
     return getFrontendName(cDevice::ActualDevice()->CardIndex());
     }
  else if (strcasecmp(Command, "STAT") == 0) {
     return getFrontendStatus(cDevice::ActualDevice()->CardIndex());
     }
  else if (strcasecmp(Command, "SGNL") == 0) {
-     return cString::sprintf("%04X", getSignal(cDevice::ActualDevice()->CardIndex()));
+     int value = getSignal(cDevice::ActualDevice()->CardIndex());
+     return cString::sprintf("%04X (%02d%%) on device #%d", value, value / 655, cDevice::ActualDevice()->CardIndex());
     }
  else if (strcasecmp(Command, "SNRA") == 0) {
-     return cString::sprintf("%04X", getSNR(cDevice::ActualDevice()->CardIndex()));
+     int value = getSNR(cDevice::ActualDevice()->CardIndex());
+     return cString::sprintf("%04X (%02d%%) on device #%d", value, value / 655, cDevice::ActualDevice()->CardIndex());
     }
  else if (strcasecmp(Command, "BERA") == 0) {
-     return cString::sprintf("%08X", getBER(cDevice::ActualDevice()->CardIndex()));
+     return cString::sprintf("%08X on device #%d", getBER(cDevice::ActualDevice()->CardIndex()), cDevice::ActualDevice()->CardIndex());
     }
  else if (strcasecmp(Command, "UNCB") == 0) {
-     return cString::sprintf("%08X", getUNC(cDevice::ActualDevice()->CardIndex()));
+     return cString::sprintf("%08X on device #%d", getUNC(cDevice::ActualDevice()->CardIndex()), cDevice::ActualDevice()->CardIndex());
     }
  else if (strcasecmp(Command, "VIBR") == 0) {
-     return cString::sprintf("%.2f", getVideoBitrate());
+     if (cFemonOsd::Instance())
+        return cString::sprintf("%s on device #%d", *getBitrateMbits(cFemonOsd::Instance()->GetVideoBitrate()), cDevice::ActualDevice()->CardIndex());
+     else
+        return cString::sprintf("--- Mbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
     }
  else if (strcasecmp(Command, "AUBR") == 0) {
-     return cString::sprintf("%.0f", getAudioBitrate());
+     if (cFemonOsd::Instance())
+        return cString::sprintf("%s on device #%d", *getBitrateKbits(cFemonOsd::Instance()->GetAudioBitrate()), cDevice::ActualDevice()->CardIndex());
+     else
+        return cString::sprintf("--- kbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
+     }
+  else if (strcasecmp(Command, "DDBR") == 0) {
+     if (cFemonOsd::Instance())
+        return cString::sprintf("%s on device #%d", *getBitrateKbits(cFemonOsd::Instance()->GetDolbyBitrate()), cDevice::ActualDevice()->CardIndex());
+     else
+        return cString::sprintf("--- kbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
     }
  return NULL;
 }

+class cMenuFemonSetup : public cMenuSetupPage {
+private:
+  const char *dispmodes[eFemonModeMaxNumber];
+  const char *skins[eFemonSkinMaxNumber];
+  const char *themes[eFemonThemeMaxNumber];
+  cFemonConfig data;
+  cVector<const char*> help;
+  void Setup(void);
+protected:
+  virtual eOSState ProcessKey(eKeys Key);
+  virtual void Store(void);
+public:
+  cMenuFemonSetup(void);
+  };
+
 cMenuFemonSetup::cMenuFemonSetup(void)
 {
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
  dispmodes[eFemonModeBasic]       = tr("basic");
  dispmodes[eFemonModeTransponder] = tr("transponder");
  dispmodes[eFemonModeStream]      = tr("stream");
  dispmodes[eFemonModeAC3]         = tr("AC-3");

+  skins[eFemonSkinClassic]         = tr("Classic");
+  skins[eFemonSkinElchi]           = tr("Elchi");
+
  themes[eFemonThemeClassic]       = tr("Classic");
  themes[eFemonThemeElchi]         = tr("Elchi");
  themes[eFemonThemeDeepBlue]      = tr("DeepBlue");
  themes[eFemonThemeMoronimo]      = tr("Moronimo");
+  themes[eFemonThemeEnigma]        = tr("Enigma");
+  themes[eFemonThemeEgalsTry]      = tr("EgalsTry");
+  themes[eFemonThemeDuotone]       = tr("Duotone");
+  themes[eFemonThemeSilverGreen]   = tr("SilverGreen");

+  data = femonConfig;
  Setup();
 }

@@ -186,20 +303,59 @@ void cMenuFemonSetup::Setup(void)
  int current = Current();

  Clear();
-  Add(new cMenuEditBoolItem(  tr("Hide main menu entry"),        &femonConfig.hidemenu,       tr("no"),            tr("yes")));
-  Add(new cMenuEditBoolItem(  tr("Use syslog output"),           &femonConfig.syslogoutput,   tr("no"),            tr("yes")));
-  Add(new cMenuEditStraItem(  tr("Default display mode"),        &femonConfig.displaymode,    eFemonModeMaxNumber, dispmodes));
-  Add(new cMenuEditStraItem(  tr("Theme"),                       &femonConfig.theme,          eFemonThemeMaxNumber,themes));
-  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"),        tr("top")));
-  Add(new cMenuEditIntItem(   tr("Height"),                      &femonConfig.osdheight,      400,                 500));
-  Add(new cMenuEditIntItem(   tr("Horizontal offset"),           &femonConfig.osdoffset,      -50,                 50));
-  Add(new cMenuEditBoolItem(  tr("Show CA system"),              &femonConfig.showcasystem,   tr("no"),            tr("yes")));
-  Add(new cMenuEditIntItem(   tr("Red limit [%]"),               &femonConfig.redlimit,       1,                   50));
-  Add(new cMenuEditIntItem(   tr("Green limit [%]"),             &femonConfig.greenlimit,     51,                  100));
-  Add(new cMenuEditIntItem(   tr("OSD update interval [0.1s]"),  &femonConfig.updateinterval, 1,                   100));
-  Add(new cMenuEditBoolItem(  tr("Analyze stream"),              &femonConfig.analyzestream,  tr("no"),            tr("yes")));
-  if (femonConfig.analyzestream)
-     Add(new cMenuEditIntItem(tr("Calculation interval [0.1s]"), &femonConfig.calcinterval,   1,                   100));
+  help.Clear();
+
+  Add(new cMenuEditBoolItem(tr("Hide main menu entry"), &data.hidemenu));
+  help.Append(tr("Define whether the main manu entry is hidden."));
+
+  Add(new cMenuEditStraItem(tr("Default display mode"), &data.displaymode, eFemonModeMaxNumber, dispmodes));
+  help.Append(tr("Define the default display mode at startup."));
+
+  Add(new cMenuEditStraItem(trVDR("Setup.OSD$Skin"), &data.skin, eFemonSkinMaxNumber, skins));
+  help.Append(tr("Define the used OSD skin."));
+
+  Add(new cMenuEditStraItem(trVDR("Setup.OSD$Theme"), &data.theme, eFemonThemeMaxNumber,themes));
+  help.Append(tr("Define the used OSD theme."));
+
+  Add(new cMenuEditBoolItem(tr("Position"), &data.position, trVDR("bottom"), trVDR("top")));
+  help.Append(tr("Define the position of OSD."));
+
+  Add(new cMenuEditIntItem(trVDR("Setup.OSD$Height"), &data.osdheight, 400, 500));
+  help.Append(tr("Define the height of OSD."));
+
+  Add(new cMenuEditIntItem(tr("Horizontal offset"), &data.osdoffset, -50, 50));
+  help.Append(tr("Define the horizontal offset of OSD."));
+
+  Add(new cMenuEditBoolItem(tr("Show CA system"), &data.showcasystem));
+  help.Append(tr("Define whether the CA system is shown as text."));
+
+  Add(new cMenuEditIntItem(tr("Red limit [%]"), &data.redlimit, 1, 50));
+  help.Append(tr("Define a limit for red bar, which is used to indicate a bad signal."));
+
+  Add(new cMenuEditIntItem(tr("Green limit [%]"), &data.greenlimit, 51, 100));
+  help.Append(tr("Define a limit for green bar, which is used to indicate a good signal."));
+
+  Add(new cMenuEditIntItem(tr("OSD update interval [0.1s]"), &data.updateinterval, 1, 100));
+  help.Append(tr("Define an interval for OSD updates. The smaller interval generates higher CPU load."));
+
+  Add(new cMenuEditBoolItem(tr("Analyze stream"), &data.analyzestream));
+  help.Append(tr("Define whether the DVB stream is analyzed and bitrates calculated."));
+
+  if (femonConfig.analyzestream) {
+     Add(new cMenuEditIntItem(tr("Calculation interval [0.1s]"), &data.calcinterval, 1, 100));
+     help.Append(tr("Define an interval for calculation. The bigger interval generates more stable values."));
+     }
+
+  Add(new cMenuEditBoolItem(tr("Use SVDRP service"), &data.usesvdrp));
+  help.Append(tr("Define whether the SVDRP service is used in client/server setups."));
+
+  if (data.usesvdrp) {
+     Add(new cMenuEditIntItem(tr("SVDRP service port"), &data.svdrpport, 1, 65535));
+     help.Append(tr("Define the port number of SVDRP service."));
+
+     Add(new cMenuEditStrItem(tr("SVDRP service IP"), data.svdrpip, MaxSvdrpIp, ".1234567890"));
+     help.Append(tr("Define the IP address of SVDRP service."));
+     }

  SetCurrent(Get(current));
  Display();
@@ -207,9 +363,11 @@ void cMenuFemonSetup::Setup(void)

 void cMenuFemonSetup::Store(void)
 {
+  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  femonConfig = data;
  SetupStore("HideMenu",       femonConfig.hidemenu);
-  SetupStore("SyslogOutput",   femonConfig.syslogoutput);
  SetupStore("DisplayMode",    femonConfig.displaymode);
+  SetupStore("Skin",           femonConfig.skin);
  SetupStore("Theme",          femonConfig.theme);
  SetupStore("Position",       femonConfig.position);
  SetupStore("OSDHeight",      femonConfig.osdheight);
@@ -220,17 +378,23 @@ void cMenuFemonSetup::Store(void)
  SetupStore("UpdateInterval", femonConfig.updateinterval);
  SetupStore("AnalStream",     femonConfig.analyzestream);
  SetupStore("CalcInterval",   femonConfig.calcinterval);
+  SetupStore("UseSvdrp",       femonConfig.usesvdrp);
+  SetupStore("ServerPort",     femonConfig.svdrpport);
+  SetupStore("ServerIp",       femonConfig.svdrpip);
 }

 eOSState cMenuFemonSetup::ProcessKey(eKeys Key)
 {
-  int oldAnalyzestream = femonConfig.analyzestream;
+  int oldUsesvdrp = data.usesvdrp;
+  int oldAnalyzestream = data.analyzestream;

  eOSState state = cMenuSetupPage::ProcessKey(Key);

-  if (Key != kNone && (femonConfig.analyzestream != oldAnalyzestream)) {
+  if (Key != kNone && (data.analyzestream != oldAnalyzestream || data.usesvdrp != oldUsesvdrp))
     Setup();
-     }
+
+  if ((Key == kInfo) && (state == osUnknown) && (Current() < help.Size()))
+     return AddSubMenu(new cMenuText(cString::sprintf("%s - %s '%s'", tr("Help"), trVDR("Plugin"), PLUGIN_NAME_I18N), help[Current()]));

  return state;
 }
--- a/femon.h
+++ b/femon.h
@@ -1,54 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id$
- */
-
-#ifndef __FEMON_H
-#define __FEMON_H
-
-#include <vdr/plugin.h>
-
-static const char *VERSION        = "0.9.3";
-static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
-static const char *MAINMENUENTRY  = "Signal Information";
-
-class cPluginFemon : public cPlugin {
-private:
-  // Add any member variables or functions you may need here.
-public:
-  cPluginFemon(void);
-  virtual ~cPluginFemon();
-  virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return tr(DESCRIPTION); }
-  virtual const char *CommandLineHelp(void);
-  virtual bool ProcessArgs(int argc, char *argv[]);
-  virtual bool Initialize(void);
-  virtual bool Start(void);
-  virtual void Stop(void);
-  virtual void Housekeeping(void);
-  virtual const char *MainMenuEntry(void) { return (femonConfig.hidemenu ? NULL : tr(MAINMENUENTRY)); }
-  virtual cOsdObject *MainMenuAction(void);
-  virtual cMenuSetupPage *SetupMenu(void);
-  virtual bool SetupParse(const char *Name, const char *Value);
-  virtual bool Service(const char *Id, void *Data);
-  virtual const char **SVDRPHelpPages(void);
-  virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
-  };
-
-class cMenuFemonSetup : public cMenuSetupPage {
-  private:
-    const char *dispmodes[eFemonModeMaxNumber];
-    const char *themes[eFemonThemeMaxNumber];
-    virtual void Setup(void);
-  protected:
-    virtual eOSState ProcessKey(eKeys Key);
-    virtual void Store(void);
-  public:
-    cMenuFemonSetup(void);
-  };
-
-#endif //__FEMON_H
-
--- a/femoncfg.c
+++ b/femoncfg.c
@@ -6,6 +6,7 @@
 * $Id$
 */

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

 cFemonConfig femonConfig;
@@ -14,6 +15,7 @@ cFemonConfig::cFemonConfig(void)
 {
  hidemenu       = 0;
  displaymode    = 0;
+  skin           = 0;
  theme          = 0;
  position       = 1;
  redlimit       = 33;
@@ -21,20 +23,23 @@ cFemonConfig::cFemonConfig(void)
  updateinterval = 5;
  analyzestream  = 1;
  calcinterval   = 20;
-  syslogoutput   = 0;
  showcasystem   = 0;
-#ifdef FEMON_NTSC
+#ifdef NTSC
  osdheight      = 420;
 #else
  osdheight      = 480;
 #endif
  osdoffset      = 0;
+  usesvdrp       = 0;
+  svdrpport      = 2001;
+  strncpy(svdrpip, "0.0.0.0", sizeof(svdrpip));
 }

 const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
 {
  {
    // eFemonThemeClassic
+    4,          // bpp
    0x7F000000, // clrBackground
    0xFFFCFCFC, // clrTitleBackground
    0xFF000000, // clrTitleText
@@ -46,6 +51,7 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
  },
  {
    // eFemonThemeElchi
+    4,          // bpp
    0xC8000066, // clrBackground
    0xC833AAEE, // clrTitleBackground
    0xFF000000, // clrTitleText
@@ -57,6 +63,7 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
  },
  {
    // eFemonThemeDeepBlue
+    4,          // bpp
    0xC80C0C0C, // clrBackground
    0xC832557A, // clrTitleBackground
    0xFF000000, // clrTitleText
@@ -68,6 +75,7 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
  },
  {
    // eFemonThemeMoronimo
+    4,          // bpp
    0xDF294A6B, // clrBackground
    0xDF3E5578, // clrTitleBackground
    0xFF9BBAD7, // clrTitleText
@@ -77,5 +85,52 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
    0xFFCE7B00, // clrYellow
    0xFF336600, // clrGreen
  },
+  {
+    // eFemonThemeEnigma
+    4,          // bpp
+    0xB8DEE5FA, // clrBackground
+    0xB84158BC, // clrTitleBackground
+    0xFFFFFFFF, // clrTitleText
+    0xFF000000, // clrActiveText
+    0xFF000000, // clrInactiveText
+    0xB8C40000, // clrRed
+    0xB8C4C400, // clrYellow
+    0xB800C400, // clrGreen
+  },
+  {
+    // eFemonThemeEgalsTry
+    4,          // bpp
+    0xCA2B1B9E, // clrBackground
+    0xDFBEBAC3, // clrTitleBackground
+    0xFF280249, // clrTitleText
+    0xFFD4D7DB, // clrActiveText
+    0xDFCFCFCF, // clrInactiveText
+    0xFFFF0000, // clrRed
+    0xFFFCC024, // clrYellow
+    0xFF20980B, // clrGreen
+  },
+  {
+    // eFemonThemeDuotone
+    2,          // bpp
+    0x7F000000, // clrBackground
+    0xFFFCFCFC, // clrTitleBackground
+    0x7F000000, // clrTitleText
+    0xFFFCFCFC, // clrActiveText
+    0xFFFCFCFC, // clrInactiveText
+    0xFFFC1414, // clrRed
+    0xFFFCFCFC, // clrYellow
+    0xFFFCFCFC, // clrGreen
+  },
+  {
+    // eFemonThemeSilverGreen
+    4,          // bpp
+    0xD9526470, // clrBackground
+    0xD9293841, // clrTitleBackground
+    0xFFB3BDCA, // clrTitleText
+    0xFFCE7B00, // clrActiveText
+    0xFFB3BDCA, // clrInactiveText
+    0xFF992900, // clrRed
+    0xFFCE7B00, // clrYellow
+    0xFF336600, // clrGreen
+  },
 };
-
--- a/femoncfg.h
+++ b/femoncfg.h
@@ -9,6 +9,8 @@
 #ifndef __FEMONCFG_H
 #define __FEMONCFG_H

+#define MaxSvdrpIp 15 // xxx.xxx.xxx.xxx
+
 enum eFemonModes
 {
  eFemonModeBasic,
@@ -24,6 +26,7 @@ public:
  cFemonConfig(void);
  int hidemenu;
  int displaymode;
+  int skin;
  int theme;
  int position;
  int redlimit;
@@ -31,25 +34,39 @@ public:
  int updateinterval;
  int analyzestream;
  int calcinterval;
-  int syslogoutput;
  int showcasystem;
  int osdheight;
  int osdoffset;
+  int usesvdrp;
+  int svdrpport;
+  char svdrpip[MaxSvdrpIp + 1]; // must end with additional null
 };

 extern cFemonConfig femonConfig;

+enum eFemonSkins
+{
+  eFemonSkinClassic,
+  eFemonSkinElchi,
+  eFemonSkinMaxNumber
+};
+
 enum eFemonThemes
 {
  eFemonThemeClassic,
  eFemonThemeElchi,
  eFemonThemeDeepBlue,
  eFemonThemeMoronimo,
+  eFemonThemeEnigma,
+  eFemonThemeEgalsTry,
+  eFemonThemeDuotone,
+  eFemonThemeSilverGreen,
  eFemonThemeMaxNumber
 };

 struct cFemonTheme
 {
+  int bpp;
  int clrBackground;
  int clrTitleBackground;
  int clrTitleText;
--- a/femonclient/COPYING
+++ b/femonclient/COPYING
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
--- a/femonclient/HISTORY
+++ b/femonclient/HISTORY
@@ -1,6 +0,0 @@
-VDR Plugin 'femonclient' Revision History
-----------------------------------------
-
-2005-08-28: Version 0.0.1
-
- Initial revision.
--- a/femonclient/Makefile
+++ b/femonclient/Makefile
@@ -1,82 +0,0 @@
-#
-# Makefile for a Video Disk Recorder plugin
-#
-# $Id: Makefile 1.1 2005/08/21 10:43:12 kls Exp $
-
-# 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.
-#
-PLUGIN = femonclient
-
-### 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 ?= -O2 -Wall -Woverloaded-virtual -fPIC
-
-### The directory environment:
-
-DVBDIR = ../../../../DVB
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
-
-### Allow user defined options to overwrite defaults:
-
-include $(VDRDIR)/Make.config
-
-### The version number of VDR (taken from VDR's "config.h"):
-
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-
-### The name of the distribution archive:
-
-ARCHIVE = svcintf-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### Includes and Defines (add further entries here):
-
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR)/PLUGINS/src/femon/
-
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o
-
-### Implicit rules:
-
-%.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
-
-# Dependencies:
-
-MAKEDEP = g++ -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-
-include $(DEPFILE)
-
-### Targets:
-
-all: libvdr-$(PLUGIN).so
-
-libvdr-$(PLUGIN).so: $(PLUGIN).o
-	$(CXX) $(CXXFLAGS) -shared $(PLUGIN).o -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
-
-dist: clean
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@mkdir $(TMPDIR)/$(ARCHIVE)
-	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution package created as $(PACKAGE).tgz
-
-clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
--- a/femonclient/README
+++ b/femonclient/README
@@ -1,14 +0,0 @@
-This is a "plugin" for the Video Disk Recorder (VDR).
-
-Written by:                  R o l f . A h r e n b e r g @ s c i . f i
-
-Project's homepage:          http://www.saunalahti.fi/~rahrenbe/vdr/femon/
-
-Latest version available at: http://www.saunalahti.fi/~rahrenbe/vdr/femon/
-
-See the file COPYING for license information.
-
-Description:
-
-Demo client for the service interface of the Femon plugin.
-
--- a/femonclient/femonclient.c
+++ b/femonclient/femonclient.c
@@ -1,50 +0,0 @@
-/*
- * femonclient.c: Demo femon service client plugin
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: $
- */
-
-#include <stdlib.h>
-#include <vdr/interface.h>
-#include <vdr/plugin.h>
-#include "femonservice.h"
-
-static const char *VERSION        = "0.0.1";
-static const char *DESCRIPTION    = "Femon client";
-static const char *MAINMENUENTRY  = "Show frontend statistic on console";
-
-class cPluginFemonClient : public cPlugin {
-public:
-  virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return DESCRIPTION; }
-  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
-  virtual cOsdObject *MainMenuAction(void);
-  };
-
-// --- cPluginFemonClient ----------------------------------------------------------
-
-cOsdObject *cPluginFemonClient::MainMenuAction(void)
-{
-  FemonService_v1_0 femon;
-  cPlugin *p;
-
-  p = cPluginManager::CallFirstService("FemonService-v1.0", &femon);
-  if (p) {
-     printf("Device : %s\n", *femon.fe_name);
-     printf("Status : %s\n", *femon.fe_status);
-     printf("Signal : %04X (%2d%%)\n", femon.fe_signal, femon.fe_signal / 655);
-     printf("SNR    : %04X (%2d%%)\n", femon.fe_snr, femon.fe_snr / 655);
-     printf("BER    : %08X\n", femon.fe_ber);
-     printf("UNC    : %08X\n", femon.fe_unc);
-     printf("Video  : %.2f Mbit/s\n", femon.video_bitrate);
-     printf("Audio  : %.0f kbit/s\n", femon.audio_bitrate);
-     }
-  else
-     printf("\n--- No support for FemonService-v1.0 found ---\n");
-
-  return NULL;
-}
-
-VDRPLUGINCREATOR(cPluginFemonClient); // Don't touch this!
--- a/femonclient/vdr-femonclient-0.0.3.tgz
+++ b/femonclient/vdr-femonclient-0.0.3.tgz
--- a/femoni18n.c
+++ b/femoni18n.c
--- a/femoni18n.h
+++ b/femoni18n.h
@@ -1,16 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id$
- */
-
-#ifndef __FEMONI18N_H
-#define __FEMONI18N_H
-
-#include <vdr/i18n.h>
-
-extern const tI18nPhrase Phrases[];
-
-#endif // __FEMONI18N_H
--- a/femonosd.c
+++ b/femonosd.c
--- a/femonosd.h
+++ b/femonosd.h
@@ -15,15 +15,26 @@
 #include <vdr/osd.h>
 #include <vdr/thread.h>
 #include <vdr/status.h>
+#include <vdr/plugin.h>
 #include <vdr/channels.h>
 #include <vdr/transfer.h>
 #include <vdr/tools.h>
+#include "svdrpservice.h"
+
+#define MAX_BM_NUMBER 5

 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
+  enum { MAX_BMNUMBERS = 6 };
+  static cFemonOsd *pInstance;
  cOsd *m_Osd;
  cFemonReceiver *m_Receiver;
  int m_Frontend;
+  int m_SvdrpFrontend;
+  double m_SvdrpVideoBitrate;
+  double m_SvdrpAudioBitrate;
+  SvdrpConnection_v1_0 m_SvdrpConnection;
+  cPlugin *m_SvdrpPlugin;
  struct dvb_frontend_info m_FrontendInfo;
  int m_Number;
  int m_OldNumber;
@@ -37,23 +48,34 @@ private:
  cTimeMs m_InputTime;
  cMutex* m_Mutex;
  static cBitmap bmStereo, bmMonoLeft, bmMonoRight, bmDD, bmDD20, bmDD51;
-  static cBitmap bmZero, bmDevice, bmPAL, bmNTSC, bmOne, bmTwo, bmThree, bmFour, bmFive;
+  static cBitmap bmNumbers[MAX_BMNUMBERS];
+  static cBitmap bmDevice, bmPAL, bmNTSC, bmSVDRP;
  static cBitmap bmAspectRatio_1_1, bmAspectRatio_16_9, bmAspectRatio_2_21_1, bmAspectRatio_4_3;
  static cBitmap bmLock, bmSignal, bmCarrier, bmViterbi, bmSync;
  void DrawStatusWindow(void);
  void DrawInfoWindow(void);
+  bool SvdrpConnect(void);
+  bool SvdrpTune(void);

 protected:
+  cFemonOsd();
+  cFemonOsd(const cFemonOsd&);
+  cFemonOsd& operator= (const cFemonOsd&);
  virtual void Action(void);
  virtual void ChannelSwitch(const cDevice * device, int channelNumber);
  virtual void SetAudioTrack(int Index, const char * const *Tracks);

 public:
-  cFemonOsd(void);
+  static cFemonOsd *Instance(bool create = false);
  ~cFemonOsd();

  virtual void Show(void);
  virtual eOSState ProcessKey(eKeys Key);
+
+  bool DeviceSwitch(int direction);
+  double GetVideoBitrate(void);
+  double GetAudioBitrate(void);
+  double GetDolbyBitrate(void);
 };

 #endif //__FEMONOSD_H
--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -17,8 +17,8 @@
 #define PAYLOAD       0x10
 #define PTS_DTS_FLAGS 0xC0

-cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[])
-:cReceiver(Ca, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
+cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[])
+:cReceiver(ChannelID, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
 {
  Dprintf("%s()\n", __PRETTY_FUNCTION__);
  m_VideoPid = Vpid;
@@ -58,9 +58,9 @@ cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[])
 cFemonReceiver::~cFemonReceiver(void)
 {
  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  Detach();
  if (Running())
-     Cancel();
+     Cancel(3);
+  Detach();
 }

 /* The following function originates from libdvbmpeg: */
@@ -142,7 +142,7 @@ void cFemonReceiver::GetVideoInfo(uint8_t *mbuf, int count)
      m_VideoFormat = VF_UNKNOWN;
      break;
    }
-  m_VideoStreamBitrate = 400 * (((headr[4] << 10) & 0x0003FC00UL) | ((headr[5] << 2) & 0x000003FCUL) | (((headr[6] & 0xC0) >> 6) & 0x00000003UL)) / 1000000.0;
+  m_VideoStreamBitrate = 400.0 * (((headr[4] << 10) & 0x0003FC00UL) | ((headr[5] << 2) & 0x000003FCUL) | (((headr[6] & 0xC0) >> 6) & 0x00000003UL));
 }

 static unsigned int bitrates[3][16] =
@@ -180,7 +180,7 @@ void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count)
  else if (tmp == 0xf)
     m_AudioStreamBitrate = (double)FR_RESERVED;
  else
-     m_AudioStreamBitrate = tmp / 1000.0;
+     m_AudioStreamBitrate = tmp;
  tmp = samplerates[((headr[2] & 0x0c) >> 2)] * 100;
  if (tmp == 3)
     m_AudioSamplingFreq = FR_RESERVED;
@@ -223,7 +223,7 @@ void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count)
  m_AC3Valid = true;
  headr = mbuf + c + 2;
  frame = (headr[2] & 0x3f);
-  m_AC3StreamBitrate = ac3_bitrates[frame >> 1];
+  m_AC3StreamBitrate = ac3_bitrates[frame >> 1] * 1000;
  int fr = (headr[2] & 0xc0 ) >> 6;
  m_AC3SamplingFreq = ac3_freq[fr] * 100;
  m_AC3FrameSize = ac3_frames[fr][frame >> 1];
@@ -231,20 +231,71 @@ void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count)
     m_AC3FrameSize <<= 1;
  m_AC3BitStreamMode = (headr[3] & 7);
  m_AC3AudioCodingMode = (headr[4] & 0xE0) >> 5;
-  if ((m_AC3AudioCodingMode & 0x01) && (m_AC3AudioCodingMode != 0x01)) // if 3 front channels
+  if ((m_AC3AudioCodingMode & 0x01) && (m_AC3AudioCodingMode != 0x01)) {
+     // 3 front channels
     m_AC3CenterMixLevel = (headr[4] & 0x18) >> 3;
-  else
+     if (m_AC3AudioCodingMode & 0x04) {
+        // a surround channel exists
+        m_AC3SurroundMixLevel = (headr[4] & 0x06) >> 1;
+        if (m_AC3AudioCodingMode == 0x02) {
+           // if in 2/0 mode
+           m_AC3DolbySurroundMode = ((headr[4] & 0x01) << 1) | ((headr[5] & 0x80) >> 7);
+           m_AC3LfeOn = (headr[5] & 0x40) >> 6;
+           m_AC3DialogLevel = (headr[5] & 0x3e) >> 1;
+           }
+        else {
+           m_AC3DolbySurroundMode = FR_NOTVALID;
+           m_AC3LfeOn = (headr[4] & 0x01);
+           m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
+           }
+        }
+     else {
+        m_AC3SurroundMixLevel = FR_NOTVALID;
+        if (m_AC3AudioCodingMode == 0x02) {
+           // if in 2/0 mode
+            m_AC3DolbySurroundMode = (headr[4] & 0x06) >> 1;
+            m_AC3LfeOn = (headr[4] & 0x01);
+            m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
+           }
+        else {
+           m_AC3DolbySurroundMode = FR_NOTVALID;
+           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
+           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
+           }
+        }
+     }
+  else {
     m_AC3CenterMixLevel = FR_NOTVALID;
-  if (m_AC3AudioCodingMode & 0x04) //  if a surround channel exists
-     m_AC3SurroundMixLevel = (headr[4] & 0x06) >> 1;
-  else
-     m_AC3SurroundMixLevel = FR_NOTVALID;
-  if (m_AC3AudioCodingMode == 0x02) // if in 2/0 mode
-     m_AC3DolbySurroundMode = ((headr[4] & 1) << 1) | ((headr[5] & 0x80) >> 7);
-  else 
-     m_AC3DolbySurroundMode = FR_NOTVALID;
-  m_AC3LfeOn = (headr[5] & 0x40) >> 6;
-  m_AC3DialogLevel = (headr[5] & 0x3e) >> 1;
+     if (m_AC3AudioCodingMode & 0x04) {
+        // a surround channel exists
+        m_AC3SurroundMixLevel = (headr[4] & 0x18) >> 3;
+        if (m_AC3AudioCodingMode == 0x02) {
+           // if in 2/0 mode
+           m_AC3DolbySurroundMode = (headr[4] & 0x06) >> 1;
+           m_AC3LfeOn = (headr[4] & 0x01);
+           m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
+           }
+        else {
+           m_AC3DolbySurroundMode = FR_NOTVALID;
+           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
+           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
+           }
+        }
+     else {
+        m_AC3SurroundMixLevel = FR_NOTVALID;
+        if (m_AC3AudioCodingMode == 0x02) {
+           // if in 2/0 mode
+           m_AC3DolbySurroundMode = (headr[4] & 0x18) >> 3;
+           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
+           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
+           }
+        else {
+           m_AC3DolbySurroundMode = FR_NOTVALID;
+           m_AC3LfeOn = (headr[4] & 0x10) >> 4;
+           m_AC3DialogLevel = ((headr[4] & 0x0F) << 1) | ((headr[5] & 0x80) >> 7);
+           }
+        }
+     }
 }

 void cFemonReceiver::Activate(bool On)
@@ -305,11 +356,11 @@ void cFemonReceiver::Action(void)
  while (Running()) {
        t.Set(0);
        // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
-        m_VideoBitrate = (8.0 * 184.0 * m_VideoPacketCount) / (femonConfig.calcinterval * 100000.0);
+        m_VideoBitrate = (10.0 * 8.0 * 184.0 * m_VideoPacketCount) / femonConfig.calcinterval;
        m_VideoPacketCount = 0;
-        m_AudioBitrate = (8.0 * 184.0 * m_AudioPacketCount) / (femonConfig.calcinterval * 100.0);
+        m_AudioBitrate = (10.0 * 8.0 * 184.0 * m_AudioPacketCount) / femonConfig.calcinterval;
        m_AudioPacketCount = 0;
-        m_AC3Bitrate   = (8.0 * 184.0 * m_AC3PacketCount)   / (femonConfig.calcinterval * 100.0);
+        m_AC3Bitrate   = (10.0 * 8.0 * 184.0 * m_AC3PacketCount)   / femonConfig.calcinterval;
        m_AC3PacketCount = 0;
        cCondWait::SleepMs(100 * femonConfig.calcinterval - t.Elapsed());
    }
--- a/femonreceiver.h
+++ b/femonreceiver.h
@@ -47,9 +47,11 @@ enum eDolbySurroundMode {
  DSM_RESERVED          = 3,
  };

-#define FR_RESERVED    -1
-#define FR_FREE        -2
-#define FR_NOTVALID    -3
+enum eReveiverCodes {
+  FR_RESERVED = -1,
+  FR_FREE     = -2,
+  FR_NOTVALID = -3
+  };

 class cFemonReceiver : public cReceiver, public cThread {
 private:
@@ -94,7 +96,7 @@ protected:
  virtual void Action(void);

 public:
-  cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[]);
+  cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[]);
  virtual ~cFemonReceiver();

  bool VideoValid(void)           { return m_VideoValid; };          // boolean
@@ -103,19 +105,19 @@ public:
  int VideoAspectRatio(void)      { return m_VideoAspectRatio; };    // eAspectRatio
  int VideoFormat(void)           { return m_VideoFormat; };         // eVideoFormat
  double VideoFrameRate(void)     { return m_VideoFrameRate; };      // Hz
-  double VideoStreamBitrate(void) { return m_VideoStreamBitrate; };  // Mbit/s
-  double VideoBitrate(void)       { return m_VideoBitrate; };        // Mbit/s
+  double VideoStreamBitrate(void) { return m_VideoStreamBitrate; };  // bit/s
+  double VideoBitrate(void)       { return m_VideoBitrate; };        // bit/s

  bool AudioValid(void)           { return m_AudioValid; };          // boolean
  int AudioMPEGLayer(void)        { return m_AudioMPEGLayer; };      // layer number
  int AudioSamplingFreq(void)     { return m_AudioSamplingFreq; };   // Hz
-  double AudioStreamBitrate(void) { return m_AudioStreamBitrate; };  // kbit/s
-  double AudioBitrate(void)       { return m_AudioBitrate; };        // kbit/s
+  double AudioStreamBitrate(void) { return m_AudioStreamBitrate; };  // bit/s
+  double AudioBitrate(void)       { return m_AudioBitrate; };        // bit/s

  bool AC3Valid(void)             { return m_AC3Valid; };                // boolean
  int AC3SamplingFreq(void)       { return m_AC3SamplingFreq; };         // Hz
-  double AC3StreamBitrate(void)   { return m_AC3StreamBitrate; };        // kbit/s
-  double AC3Bitrate(void)         { return m_AC3Bitrate; };              // kbit/s
+  double AC3StreamBitrate(void)   { return m_AC3StreamBitrate; };        // bit/s
+  double AC3Bitrate(void)         { return m_AC3Bitrate; };              // bit/s
  int AC3FrameSize(void)          { return m_AC3FrameSize; };            // Bytes
  int AC3BitStreamMode(void)      { return m_AC3BitStreamMode; };        // 0..7
  int AC3AudioCodingMode(void)    { return m_AC3AudioCodingMode; };      // 0..7
--- a/femonservice.h
+++ b/femonservice.h
@@ -20,6 +20,7 @@ struct FemonService_v1_0 {
  uint32_t fe_unc;
  double video_bitrate;
  double audio_bitrate;
+  double dolby_bitrate;
  };

 #endif //__FEMONSERVICE_H
--- a/femontools.c
+++ b/femontools.c
@@ -10,8 +10,46 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <linux/dvb/frontend.h>
+#include "femonreceiver.h"
+#include "femonosd.h"
 #include "femontools.h"

+cString getFrontendInfo(int cardIndex)
+{
+  cString info;
+  struct dvb_frontend_info value;
+  fe_status_t status;
+  uint16_t signal = 0;
+  uint16_t snr = 0;
+  uint32_t ber = 0;
+  uint32_t unc = 0;
+  char *dev = NULL;
+  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
+
+  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
+  int fe = open(dev, O_RDONLY | O_NONBLOCK);
+  free(dev); 
+  if (fe < 0)
+     return NULL;
+  CHECK(ioctl(fe, FE_GET_INFO, &value));
+  CHECK(ioctl(fe, FE_READ_STATUS, &status));
+  CHECK(ioctl(fe, FE_READ_SIGNAL_STRENGTH, &signal));
+  CHECK(ioctl(fe, FE_READ_SNR, &snr));
+  CHECK(ioctl(fe, FE_READ_BER, &ber));
+  CHECK(ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &unc));
+  close(fe);
+
+  info = cString::sprintf("CARD:%d\nTYPE:%d\nNAME:%s\nSTAT:%02X\nSGNL:%04X\nSNRA:%04X\nBERA:%08X\nUNCB:%08X", cardIndex, value.type, value.name, status, signal, snr, ber, unc);
+
+  if (cFemonOsd::Instance())
+     info = cString::sprintf("%s\nVIBR:%.0f\nAUBR:%.0f\nDDBR:%.0f", *info, cFemonOsd::Instance()->GetVideoBitrate(), cFemonOsd::Instance()->GetAudioBitrate(), cFemonOsd::Instance()->GetDolbyBitrate());
+
+  if (channel)
+     info  = cString::sprintf("%s\nCHAN:%s", *info, *channel->ToText());
+
+  return info;
+}
+
 cString getFrontendName(int cardIndex)
 {
  struct dvb_frontend_info value;
@@ -22,10 +60,10 @@ cString getFrontendName(int cardIndex)
  free(dev);
  if (fe < 0)
     return NULL;
-  ioctl(fe, FE_GET_INFO, &value);
+  CHECK(ioctl(fe, FE_GET_INFO, &value));
  close(fe);

-  return (cString::sprintf("#%d %s", cardIndex, value.name));
+  return (cString::sprintf("%s on device #%d", value.name, cardIndex));
 }

 cString getFrontendStatus(int cardIndex)
@@ -41,7 +79,7 @@ cString getFrontendStatus(int cardIndex)
  CHECK(ioctl(fe, FE_READ_STATUS, &value));
  close(fe);

-  return (cString::sprintf("%s:%s:%s:%s:%s", (value & FE_HAS_LOCK) ? "LOCKED" : "-", (value & FE_HAS_SIGNAL) ? "SIGNAL" : "-", (value & FE_HAS_CARRIER) ? "CARRIER" : "-", (value & FE_HAS_VITERBI) ? "VITERBI" : "-", (value & FE_HAS_SYNC) ? "SYNC" : "-"));
+  return (cString::sprintf("Status %s:%s:%s:%s:%s on device #%d", (value & FE_HAS_LOCK) ? "LOCKED" : "-", (value & FE_HAS_SIGNAL) ? "SIGNAL" : "-", (value & FE_HAS_CARRIER) ? "CARRIER" : "-", (value & FE_HAS_VITERBI) ? "VITERBI" : "-", (value & FE_HAS_SYNC) ? "SYNC" : "-", cardIndex));
 }

 uint16_t getSignal(int cardIndex)
@@ -108,20 +146,289 @@ uint32_t getUNC(int cardIndex)
  return (value);
 }

-double getVideoBitrate(void)
+cString getApids(const cChannel *channel)
 {
-  double value = 0.0;
-
-  // Not yet implemented.
-
-  return (value);
+  int value = 0;
+  cString apids = cString::sprintf("%d", channel->Apid(value));
+  while (channel->Apid(++value) && (value < MAXAPIDS))
+    apids = cString::sprintf("%s, %d", *apids, channel->Apid(value));
+  return apids;
 }

-double getAudioBitrate(void)
+cString getDpids(const cChannel *channel)
 {
-  double value = 0.0;
-
-  // Not yet implemented.
-
-  return (value);
+  int value = 0;
+  cString dpids = cString::sprintf("%d", channel->Dpid(value));
+  while (channel->Dpid(++value) && (value < MAXDPIDS))
+    dpids = cString::sprintf("%s, %d", *dpids, channel->Dpid(value));
+  return dpids;
+}
+
+cString getSpids(const cChannel *channel)
+{
+  int value = 0;
+  cString spids = cString::sprintf("%d", channel->Spid(value));
+  while (channel->Spid(++value) && (value < MAXSPIDS))
+    spids = cString::sprintf("%s, %d", *spids, channel->Spid(value));
+  return spids;
+}
+
+cString getCAids(const cChannel *channel, bool identify)
+{
+  cString caids;
+  int value = 0;
+
+  if (identify) {
+     caids = cString::sprintf("%s", *getCA(channel->Ca(value)));
+     while (channel->Ca(++value) && (value < MAXCAIDS))
+       caids = cString::sprintf("%s, %s", *caids, *getCA(channel->Ca(value)));
+     }
+  else {
+     caids = cString::sprintf("%04x", channel->Ca(value));
+     while (channel->Ca(++value) && (value < MAXCAIDS))
+       caids = cString::sprintf("%s, %04x", *caids, channel->Ca(value));
+     }
+  return caids;
+}
+
+cString getCA(int value)
+{
+  /* http://www.dvb.org/index.php?id=174 */
+  switch (value) {
+    case 0x0000:            return cString::sprintf("%s", trVDR("Free To Air")); /* Reserved */
+    case 0x0001 ... 0x009F:
+    case 0x00A2 ... 0x00FF: return cString::sprintf("%s", tr("Fixed")); /* Standardized systems */
+    case 0x00A0 ... 0x00A1: return cString::sprintf("%s", tr("Analog")); /* Analog signals */
+    case 0x0100 ... 0x01FF: return cString::sprintf("%s", tr("SECA/Mediaguard")); /* Canal Plus */
+    case 0x0500 ... 0x05FF: return cString::sprintf("%s", tr("Viaccess")); /* France Telecom */
+    case 0x0600 ... 0x06FF: return cString::sprintf("%s", tr("Irdeto")); /* Irdeto */
+    case 0x0900 ... 0x09FF: return cString::sprintf("%s", tr("NDS/Videoguard")); /* News Datacom */
+    case 0x0B00 ... 0x0BFF: return cString::sprintf("%s", tr("Conax")); /* Norwegian Telekom */
+    case 0x0D00 ... 0x0DFF: return cString::sprintf("%s", tr("CryptoWorks")); /* Philips */
+    case 0x0E00 ... 0x0EFF: return cString::sprintf("%s", tr("PowerVu")); /* Scientific Atlanta */
+    case 0x1200 ... 0x12FF: return cString::sprintf("%s", tr("NagraVision")); /* BellVu Express */
+    case 0x1700 ... 0x17FF: return cString::sprintf("%s", tr("BetaCrypt")); /* BetaTechnik */
+    case 0x1800 ... 0x18FF: return cString::sprintf("%s", tr("NagraVision")); /* Kudelski SA */
+    case 0x4A60 ... 0x4A6F: return cString::sprintf("%s", tr("SkyCrypt")); /* @Sky */
+    }
+  return cString::sprintf("%X", value);
+}
+
+cString getCoderate(int value)
+{
+  switch (value) {
+    case FEC_NONE: return cString::sprintf("%s", tr("none"));
+    case FEC_1_2:  return cString::sprintf("1/2");
+    case FEC_2_3:  return cString::sprintf("2/3");
+    case FEC_3_4:  return cString::sprintf("3/4");
+    case FEC_4_5:  return cString::sprintf("4/5");
+    case FEC_5_6:  return cString::sprintf("5/6");
+    case FEC_6_7:  return cString::sprintf("6/7");
+    case FEC_7_8:  return cString::sprintf("7/8");
+    case FEC_8_9:  return cString::sprintf("8/9");
+    case FEC_AUTO: return cString::sprintf("%s", tr("auto"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getTransmission(int value)
+{
+  switch (value) {
+    case TRANSMISSION_MODE_2K:   return cString::sprintf("2K");
+    case TRANSMISSION_MODE_8K:   return cString::sprintf("8K");
+    case TRANSMISSION_MODE_AUTO: return cString::sprintf("%s", tr("auto"));
+    }
+  return cString::sprintf("---");
+}
+ 
+cString getBandwidth(int value)
+{
+  switch (value) {
+    case BANDWIDTH_8_MHZ: return cString::sprintf("8 %s", tr("MHz"));
+    case BANDWIDTH_7_MHZ: return cString::sprintf("7 %s", tr("MHz"));
+    case BANDWIDTH_6_MHZ: return cString::sprintf("6 %s", tr("MHz"));
+    case BANDWIDTH_AUTO:  return cString::sprintf("%s", tr("auto"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getInversion(int value)
+{
+  switch (value) {
+    case INVERSION_OFF:  return cString::sprintf("%s", tr("off"));
+    case INVERSION_ON:   return cString::sprintf("%s", tr("on"));
+    case INVERSION_AUTO: return cString::sprintf("%s", tr("auto"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getHierarchy(int value)
+{
+  switch (value) {
+    case HIERARCHY_NONE: return cString::sprintf("%s", tr("none"));
+    case HIERARCHY_1:    return cString::sprintf("1");
+    case HIERARCHY_2:    return cString::sprintf("2");
+    case HIERARCHY_4:    return cString::sprintf("4");
+    case HIERARCHY_AUTO: cString::sprintf("%s", tr("auto"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getGuard(int value)
+{
+  switch (value) {
+    case GUARD_INTERVAL_1_32: return cString::sprintf("1/32");
+    case GUARD_INTERVAL_1_16: return cString::sprintf("1/16");
+    case GUARD_INTERVAL_1_8:  return cString::sprintf("1/8");
+    case GUARD_INTERVAL_1_4:  return cString::sprintf("1/4");
+    case GUARD_INTERVAL_AUTO: cString::sprintf("%s", tr("auto"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getModulation(int value)
+{
+  switch (value) {
+    case QPSK:     return cString::sprintf("QPSK");
+    case QAM_16:   return cString::sprintf("QAM 16");
+    case QAM_32:   return cString::sprintf("QAM 32");
+    case QAM_64:   return cString::sprintf("QAM 64");
+    case QAM_128:  return cString::sprintf("QAM 128");
+    case QAM_256:  return cString::sprintf("QAM 256");
+    case QAM_AUTO: return cString::sprintf("QAM %s", tr("auto"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getAspectRatio(int value)
+{
+  switch (value) {
+    case AR_RESERVED: return cString::sprintf("%s", tr("reserved"));
+    case AR_1_1:      return cString::sprintf("1:1");
+    case AR_4_3:      return cString::sprintf("4:3");
+    case AR_16_9:     return cString::sprintf("16:9");
+    case AR_2_21_1:   return cString::sprintf("2.21:1");
+    }
+  return cString::sprintf("---");
+}
+
+cString getVideoFormat(int value)
+{
+  switch (value) {
+    case VF_UNKNOWN: return cString::sprintf("%s", tr("unknown"));
+    case VF_PAL:     return cString::sprintf("%s", tr("PAL"));
+    case VF_NTSC:    return cString::sprintf("%s", tr("NTSC"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getAC3BitStreamMode(int value, int coding)
+{
+  switch (value) {
+    case 0: return cString::sprintf("%s", tr("Complete Main (CM)"));
+    case 1: return cString::sprintf("%s", tr("Music and Effects (ME)"));
+    case 2: return cString::sprintf("%s", tr("Visually Impaired (VI)"));
+    case 3: return cString::sprintf("%s", tr("Hearing Impaired (HI)"));
+    case 4: return cString::sprintf("%s", tr("Dialogue (D)"));
+    case 5: return cString::sprintf("%s", tr("Commentary (C)"));
+    case 6: return cString::sprintf("%s", tr("Emergency (E)"));
+    case 7: return cString::sprintf("%s", (coding == 1) ? tr("Voice Over (VO)") : tr("Karaoke"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getAC3AudioCodingMode(int value, int stream)
+{
+  if (stream != 7) {
+     switch (value) {
+       case 0: return cString::sprintf("1+1 - %s, %s", tr("Ch1"), tr("Ch2"));
+       case 1: return cString::sprintf("1/0 - %s", tr("C"));
+       case 2: return cString::sprintf("2/0 - %s, %s", tr("L"), tr("R"));
+       case 3: return cString::sprintf("3/0 - %s, %s, %s", tr("L"), tr("C"), tr("R"));
+       case 4: return cString::sprintf("2/1 - %s, %s, %s", tr("L"), tr("R"), tr("S"));
+       case 5: return cString::sprintf("3/1 - %s, %s, %s, %s", tr("L"), tr("C"), tr("R"), tr("S"));
+       case 6: return cString::sprintf("2/2 - %s, %s, %s, %s", tr("L"), tr("R"), tr("SL"), tr("SR"));
+       case 7: return cString::sprintf("3/2 - %s, %s, %s, %s, %s", tr("L"), tr("C"), tr("R"), tr("SL"), tr("SR"));
+       }
+     }
+  return cString::sprintf("---");
+}
+
+cString getAC3CenterMixLevel(int value)
+{
+  switch (value) {
+    case CML_MINUS_3dB:   return cString::sprintf("-3.0 %s", tr("dB"));
+    case CML_MINUS_4_5dB: return cString::sprintf("-4.5 %s", tr("dB"));
+    case CML_MINUS_6dB:   return cString::sprintf("-6.0 %s", tr("dB"));
+    case CML_RESERVED:    return cString::sprintf("%s", tr("reserved"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getAC3SurroundMixLevel(int value)
+{
+  switch (value) {
+    case SML_MINUS_3dB: return cString::sprintf("-3 %s", tr("dB"));
+    case SML_MINUS_6dB: return cString::sprintf("-6 %s", tr("dB"));
+    case SML_0_dB:      return cString::sprintf("0 %s", tr("dB"));
+    case SML_RESERVED:  return cString::sprintf("%s", tr("reserved"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getAC3DolbySurroundMode(int value)
+{
+  switch (value) {
+    case DSM_NOT_INDICATED:     return cString::sprintf("%s", tr("not indicated"));
+    case DSM_NOT_DOLBYSURROUND: return cString::sprintf("%s", trVDR("no"));
+    case DSM_DOLBYSURROUND:     return cString::sprintf("%s", trVDR("yes"));
+    case DSM_RESERVED:          return cString::sprintf("%s", tr("reserved"));
+    }
+  return cString::sprintf("---");
+}
+
+cString getAC3DialogLevel(int value)
+{
+  if (value > 0)
+     return cString::sprintf("-%d %s", value, tr("dB"));
+  return cString::sprintf("---");
+}
+
+cString getFrequencyMHz(int value)
+{
+   while (value > 20000) value /= 1000;
+   return cString::sprintf("%d %s", value, tr("MHz"));
+}
+
+cString getAudioSamplingFreq(int value)
+{
+  switch (value) {
+    case FR_NOTVALID: return cString::sprintf("---");
+    case FR_RESERVED: return cString::sprintf("%s", tr("reserved"));
+    }
+  return cString::sprintf("%.1f %s", ((double)value / 1000.0), tr("kHz"));
+}
+
+cString getAudioBitrate(double value, double stream)
+{
+  switch ((int)stream) {
+    case FR_NOTVALID: return cString::sprintf("---");
+    case FR_RESERVED: return cString::sprintf("%s (%s)", tr("reserved"), *getBitrateKbits(value));
+    case FR_FREE:     return cString::sprintf("%s (%s)", tr("free"), *getBitrateKbits(value));
+    }
+  return cString::sprintf("%s (%s)", *getBitrateKbits(stream), *getBitrateKbits(value));
+}
+
+cString getBitrateMbits(double value)
+{
+  if (value >= 0)
+     return cString::sprintf("%.2f %s", value / 1000000.0, tr("Mbit/s"));
+  return cString::sprintf("--- %s", tr("Mbit/s"));
+}
+
+cString getBitrateKbits(double value)
+{
+  if (value >= 0) 
+     return cString::sprintf("%.0f %s", value / 1000.0, tr("kbit/s"));
+  return cString::sprintf("--- %s", tr("kbit/s"));
 }
--- a/femontools.h
+++ b/femontools.h
@@ -10,9 +10,10 @@
 #define __FEMONTOOLS_H

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

-#ifdef FEMON_DEBUG
+#ifdef DEBUG
 #define Dprintf(x...) printf(x);
 #else
 #define Dprintf(x...) ;
@@ -20,13 +21,40 @@

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

+cString getFrontendInfo(int cardIndex = 0);
 cString getFrontendName(int cardIndex = 0);
 cString getFrontendStatus(int cardIndex = 0);
+
 uint16_t getSNR(int cardIndex = 0);
 uint16_t getSignal(int cardIndex = 0);
+
 uint32_t getBER(int cardIndex = 0);
 uint32_t getUNC(int cardIndex = 0);
-double getVideoBitrate(void);
-double getAudioBitrate(void);
+
+cString getApids(const cChannel *channel);
+cString getDpids(const cChannel *channel);
+cString getSpids(const cChannel *channel);
+cString getCAids(const cChannel *channel, bool identify = false);
+cString getCA(int value);
+cString getCoderate(int value);
+cString getTransmission(int value);
+cString getBandwidth(int value);
+cString getInversion(int value);
+cString getHierarchy(int value);
+cString getGuard(int value);
+cString getModulation(int value);
+cString getAspectRatio(int value);
+cString getVideoFormat(int value);
+cString getAC3BitStreamMode(int value, int coding);
+cString getAC3AudioCodingMode(int value, int stream);
+cString getAC3CenterMixLevel(int value);
+cString getAC3SurroundMixLevel(int value);
+cString getAC3DolbySurroundMode(int value);
+cString getAC3DialogLevel(int value);
+cString getFrequencyMHz(int value);
+cString getAudioSamplingFreq(int value);
+cString getAudioBitrate(double value, double stream);
+cString getBitrateMbits(double value);
+cString getBitrateKbits(double value);

 #endif // __FEMONTOOLS_H
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -0,0 +1,384 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Peter Marquardt
+# Andreas Brachold
+# Christian Wieninger 
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: femon 1.2.3\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2008-01-20 01:23+0200\n"
+"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Last-Translator: Christian Wieninger\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "DVB Signal Informationsanzeige (OSD)"
+
+msgid "Signal Information"
+msgstr "Signalinformationen"
+
+msgid "Femon not available while replaying"
+msgstr "Femon w<>hrend Wiedergabe nicht verf<72>gbar"
+
+msgid "basic"
+msgstr "Standard"
+
+msgid "transponder"
+msgstr "Transponder"
+
+msgid "stream"
+msgstr "Stream"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Klassischer"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "Hide main menu entry"
+msgstr "Hauptmen<65>eintrag verstecken"
+
+msgid "Define whether the main manu entry is hidden."
+msgstr ""
+
+msgid "Default display mode"
+msgstr "Standard Anzeigemodus"
+
+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 "Position"
+
+msgid "Define the position of OSD."
+msgstr ""
+
+msgid "Define the height of OSD."
+msgstr ""
+
+msgid "Horizontal offset"
+msgstr "Horizontaler Offset"
+
+msgid "Define the horizontal offset of OSD."
+msgstr ""
+
+msgid "Show CA system"
+msgstr "CA System anzeigen"
+
+msgid "Define whether the CA system is shown as text."
+msgstr ""
+
+msgid "Red limit [%]"
+msgstr "Grenze Rot [%]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
+msgid "Green limit [%]"
+msgstr "Grenze Gr<47>n [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr ""
+
+msgid "OSD update interval [0.1s]"
+msgstr "OSD Updateintervall [0.1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
+msgid "Analyze stream"
+msgstr "Stream analysieren"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
+msgid "Calculation interval [0.1s]"
+msgstr "Berechnungsintervall [0.1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
+msgid "Use SVDRP service"
+msgstr "SVDRP Service verwenden"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
+msgid "SVDRP service port"
+msgstr "SVDRP Service Port"
+
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
+msgid "SVDRP service IP"
+msgstr "SVDRP Service IP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr "Hilfe"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Transponder Information"
+msgstr "Transponderinformation"
+
+msgid "Apid"
+msgstr "Apid"
+
+msgid "Dpid"
+msgstr "Dpid"
+
+msgid "Spid"
+msgstr "Spid"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Satellite Card"
+msgstr "Satellitenkarte"
+
+msgid "Cable Card"
+msgstr "Kabelkarte"
+
+msgid "Terrestrial Card"
+msgstr "Terrestrische Karte"
+
+msgid "Coderate"
+msgstr "Coderate"
+
+msgid "Stream Information"
+msgstr "Streaminformation"
+
+msgid "Video Stream"
+msgstr "Video Stream"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Aspect Ratio"
+msgstr "Seitenverh<72>ltnis"
+
+msgid "Frame Rate"
+msgstr "Bildrate"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Video Format"
+msgstr "Bildformat"
+
+msgid "Resolution"
+msgstr "Aufl<66>sung"
+
+msgid "Audio Stream"
+msgstr "Audio Stream"
+
+msgid "MPEG Layer"
+msgstr "MPEG Layer"
+
+msgid "Sampling Frequency"
+msgstr "Abtastrate"
+
+msgid "AC-3 Stream"
+msgstr "AC-3 Stream"
+
+msgid "kHz"
+msgstr "kHz"
+
+msgid "Frame Size"
+msgstr "Frame Gr<47><72>e"
+
+msgid "Bit Stream Mode"
+msgstr "Bitstream Modus"
+
+msgid "Audio Coding Mode"
+msgstr "Audiokodierung"
+
+msgid "Center Mix Level"
+msgstr "Center Mix Pegel"
+
+msgid "Surround Mix Level"
+msgstr "Surround Mix Pegel"
+
+msgid "Dolby Surround Mode"
+msgstr "Dolby Surround Modus"
+
+msgid "Low Frequency Effects"
+msgstr "Tieft<66>ner Effekte"
+
+msgid "on"
+msgstr "Ein"
+
+msgid "off"
+msgstr "Aus"
+
+msgid "Dialogue Normalization"
+msgstr "Dialog Normalisierung"
+
+msgid "Fixed"
+msgstr "Fest"
+
+msgid "Analog"
+msgstr "Analog"
+
+msgid "SECA/Mediaguard"
+msgstr "SECA/Mediaguard"
+
+msgid "Viaccess"
+msgstr "Viaccess"
+
+msgid "Irdeto"
+msgstr "Irdeto"
+
+msgid "NDS/Videoguard"
+msgstr "NDS/Videoguard"
+
+msgid "Conax"
+msgstr "Conax"
+
+msgid "CryptoWorks"
+msgstr "CryptoWorks"
+
+msgid "PowerVu"
+msgstr "PowerVu"
+
+msgid "NagraVision"
+msgstr "NagraVision"
+
+msgid "BetaCrypt"
+msgstr "BetaCrypt"
+
+msgid "SkyCrypt"
+msgstr "SkyCrypt"
+
+msgid "none"
+msgstr "Nichts"
+
+msgid "auto"
+msgstr "Auto"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "reserved"
+msgstr "belegt"
+
+msgid "unknown"
+msgstr "unbekannt"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "Complete Main (CM)"
+msgstr "Complete Main (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Musik und Effekte (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "Sehbehindert (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "H<>rbehindert (HI)"
+
+msgid "Dialogue (D)"
+msgstr "Dialog (D)"
+
+msgid "Commentary (C)"
+msgstr "Kommentar (C)"
+
+msgid "Emergency (E)"
+msgstr "Notfall (E)"
+
+msgid "Voice Over (VO)"
+msgstr "<22>berlagerte Stimme (VO)"
+
+msgid "Karaoke"
+msgstr "Karaoke"
+
+msgid "Ch1"
+msgstr "Kan1"
+
+msgid "Ch2"
+msgstr "Kan2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "L"
+
+msgid "R"
+msgstr "R"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SL"
+
+msgid "SR"
+msgstr "SR"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "nicht angegeben"
+
+msgid "free"
+msgstr "frei"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -0,0 +1,382 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Luis Palacios
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: femon 1.2.3\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2008-01-20 01:23+0200\n"
+"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Last-Translator: Luis Palacios\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "Monitorizaci<63>n de la se<73>al DVB"
+
+msgid "Signal Information"
+msgstr "Monitorizaci<63>n de la se<73>al DVB"
+
+msgid "Femon not available while replaying"
+msgstr ""
+
+msgid "basic"
+msgstr "B<>sico"
+
+msgid "transponder"
+msgstr "Transpondedor"
+
+msgid "stream"
+msgstr "Flujo"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Cl<43>sico"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "Hide main menu entry"
+msgstr "Ocultar en el men<65> principal"
+
+msgid "Define whether the main manu entry is hidden."
+msgstr ""
+
+msgid "Default display mode"
+msgstr "Modo de visualizaci<63>n estandar"
+
+msgid "Define the default display mode at startup."
+msgstr ""
+
+msgid "Define the used OSD skin."
+msgstr ""
+
+msgid "Define the used OSD theme."
+msgstr ""
+
+msgid "Position"
+msgstr "Posici<63>n"
+
+msgid "Define the position of OSD."
+msgstr ""
+
+msgid "Define the height of OSD."
+msgstr ""
+
+msgid "Horizontal offset"
+msgstr "Desplazamiento horizontal"
+
+msgid "Define the horizontal offset of OSD."
+msgstr ""
+
+msgid "Show CA system"
+msgstr "Mostrar sistema CA"
+
+msgid "Define whether the CA system is shown as text."
+msgstr ""
+
+msgid "Red limit [%]"
+msgstr "L<>mite de rojo [%s]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
+msgid "Green limit [%]"
+msgstr "L<>mite verde [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr ""
+
+msgid "OSD update interval [0.1s]"
+msgstr "Intervalo de actualizaci<63>n (0,1)"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
+msgid "Analyze stream"
+msgstr "Analizar el flujo"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
+msgid "Calculation interval [0.1s]"
+msgstr "Intervalo de c<>lculo (0,1s)"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
+msgid "Use SVDRP service"
+msgstr ""
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
+msgid "SVDRP service port"
+msgstr ""
+
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
+msgid "SVDRP service IP"
+msgstr ""
+
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr "Ayuda"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Transponder Information"
+msgstr "Informaci<63>n del transpondedor"
+
+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 "Satellite Card"
+msgstr "Tarjeta Sat<61>lite"
+
+msgid "Cable Card"
+msgstr "Tarjeta Cable"
+
+msgid "Terrestrial Card"
+msgstr "Tarjeta TDT"
+
+msgid "Coderate"
+msgstr "Coderate"
+
+msgid "Stream Information"
+msgstr "Informaci<63>n del flujo"
+
+msgid "Video Stream"
+msgstr "Flujo de video"
+
+msgid "Bitrate"
+msgstr "Tasa de bits"
+
+msgid "Aspect Ratio"
+msgstr "Proporciones de la imagen"
+
+msgid "Frame Rate"
+msgstr "Tasa de frames"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Video Format"
+msgstr "Formato de video"
+
+msgid "Resolution"
+msgstr "Resoluci<63>n"
+
+msgid "Audio Stream"
+msgstr "Flujo de audio"
+
+msgid "MPEG Layer"
+msgstr "Nivel MPEG"
+
+msgid "Sampling Frequency"
+msgstr "Frecuencia de muestreo"
+
+msgid "AC-3 Stream"
+msgstr "Flujo AC-3"
+
+msgid "kHz"
+msgstr "kHz"
+
+msgid "Frame Size"
+msgstr "Tama<6D>o de frame"
+
+msgid "Bit Stream Mode"
+msgstr "Modo bitstream"
+
+msgid "Audio Coding Mode"
+msgstr "Modo de codificaci<63>n de audio"
+
+msgid "Center Mix Level"
+msgstr "Nivel sonoro central"
+
+msgid "Surround Mix Level"
+msgstr "Nivel sonoro surround"
+
+msgid "Dolby Surround Mode"
+msgstr "Nivel sonoro Dolby Surround"
+
+msgid "Low Frequency Effects"
+msgstr "Efectos de baja frecuencia"
+
+msgid "on"
+msgstr "on"
+
+msgid "off"
+msgstr "off"
+
+msgid "Dialogue Normalization"
+msgstr "Normalizaci<63>n del di<64>logo"
+
+msgid "Fixed"
+msgstr "Fijo"
+
+msgid "Analog"
+msgstr "Anal<61>gico"
+
+msgid "SECA/Mediaguard"
+msgstr "SECA/Mediguard"
+
+msgid "Viaccess"
+msgstr "Viaccess"
+
+msgid "Irdeto"
+msgstr "Irdeto"
+
+msgid "NDS/Videoguard"
+msgstr "NDS/Videoguard"
+
+msgid "Conax"
+msgstr "Conax"
+
+msgid "CryptoWorks"
+msgstr "CryptoWorks"
+
+msgid "PowerVu"
+msgstr "PowerVu"
+
+msgid "NagraVision"
+msgstr "NagraVision"
+
+msgid "BetaCrypt"
+msgstr "BetaCrypt"
+
+msgid "SkyCrypt"
+msgstr "SkyCrypt"
+
+msgid "none"
+msgstr "ninguno"
+
+msgid "auto"
+msgstr "auto"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "reserved"
+msgstr "reservado"
+
+msgid "unknown"
+msgstr "desconocido"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "Complete Main (CM)"
+msgstr "Principal (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "M<>sica y efectos (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "Imagen deteriorada (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "Hearing deteriorado"
+
+msgid "Dialogue (D)"
+msgstr "Di<44>logo (D)"
+
+msgid "Commentary (C)"
+msgstr "Comentario (C)"
+
+msgid "Emergency (E)"
+msgstr "Emergencia (E)"
+
+msgid "Voice Over (VO)"
+msgstr "Voz off (VO)"
+
+msgid "Karaoke"
+msgstr "Karaoke"
+
+msgid "Ch1"
+msgstr "Can. 1"
+
+msgid "Ch2"
+msgstr "Can. 2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "I"
+
+msgid "R"
+msgstr "D"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SI"
+
+msgid "SR"
+msgstr "SD"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "no indicado"
+
+msgid "free"
+msgstr "libre"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -0,0 +1,382 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Arthur Konovalov
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: femon 1.2.3\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2008-01-20 01:23+0200\n"
+"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Last-Translator: Arthur Konovalov\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-13\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "DVB Signaalmonitor (OSD)"
+
+msgid "Signal Information"
+msgstr "Signaaliinfo"
+
+msgid "Femon not available while replaying"
+msgstr ""
+
+msgid "basic"
+msgstr "standard"
+
+msgid "transponder"
+msgstr "transponder"
+
+msgid "stream"
+msgstr "voog"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Klassikaline"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "Hide main menu entry"
+msgstr "Peida valik peamen<65><6E>s"
+
+msgid "Define whether the main manu entry is hidden."
+msgstr ""
+
+msgid "Default display mode"
+msgstr "Vaikimisi displei moodus"
+
+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 "Positsioon"
+
+msgid "Define the position of OSD."
+msgstr ""
+
+msgid "Define the height of OSD."
+msgstr ""
+
+msgid "Horizontal offset"
+msgstr "Horisontaalne nihe"
+
+msgid "Define the horizontal offset of OSD."
+msgstr ""
+
+msgid "Show CA system"
+msgstr "N<>ita CA s<>steemi"
+
+msgid "Define whether the CA system is shown as text."
+msgstr ""
+
+msgid "Red limit [%]"
+msgstr "Punase limiit [%]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
+msgid "Green limit [%]"
+msgstr "Rohelise limiit [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr ""
+
+msgid "OSD update interval [0.1s]"
+msgstr "Uuendusintervall [0,1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
+msgid "Analyze stream"
+msgstr "Voo anal<61><6C>s"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
+msgid "Calculation interval [0.1s]"
+msgstr "Kalkulatsiooni intervall [0,1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
+msgid "Use SVDRP service"
+msgstr ""
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
+msgid "SVDRP service port"
+msgstr ""
+
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
+msgid "SVDRP service IP"
+msgstr ""
+
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Transponder Information"
+msgstr "Transponderi info"
+
+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 "Satellite Card"
+msgstr "Satelliidikaart"
+
+msgid "Cable Card"
+msgstr "Kaablikaart"
+
+msgid "Terrestrial Card"
+msgstr "Terrestiaalkaart"
+
+msgid "Coderate"
+msgstr "Coderate"
+
+msgid "Stream Information"
+msgstr "Voo info"
+
+msgid "Video Stream"
+msgstr "Videovoog"
+
+msgid "Bitrate"
+msgstr "Bitikiirus"
+
+msgid "Aspect Ratio"
+msgstr "K<>lgsuhe"
+
+msgid "Frame Rate"
+msgstr "Kaadrisagedus"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Video Format"
+msgstr "Videoformaat"
+
+msgid "Resolution"
+msgstr "Resolutsioon"
+
+msgid "Audio Stream"
+msgstr "Audiovoog"
+
+msgid "MPEG Layer"
+msgstr "MPEG tase"
+
+msgid "Sampling Frequency"
+msgstr "S<>mplimissagedus"
+
+msgid "AC-3 Stream"
+msgstr "AC-3 voog"
+
+msgid "kHz"
+msgstr "kHz"
+
+msgid "Frame Size"
+msgstr "Kaadri suurus"
+
+msgid "Bit Stream Mode"
+msgstr "Bitivoo t<><74>p"
+
+msgid "Audio Coding Mode"
+msgstr "Audiokodeering"
+
+msgid "Center Mix Level"
+msgstr "Keskmise kanali tase"
+
+msgid "Surround Mix Level"
+msgstr "Surround kanali tase"
+
+msgid "Dolby Surround Mode"
+msgstr "Dolby Surround'i t<><74>p"
+
+msgid "Low Frequency Effects"
+msgstr "LFE kanal"
+
+msgid "on"
+msgstr "Sees"
+
+msgid "off"
+msgstr "V<>ljas"
+
+msgid "Dialogue Normalization"
+msgstr "Dialoogi normalisatsioon"
+
+msgid "Fixed"
+msgstr "Fikseeritud"
+
+msgid "Analog"
+msgstr ""
+
+msgid "SECA/Mediaguard"
+msgstr "SECA/Mediaguard"
+
+msgid "Viaccess"
+msgstr "Viaccess"
+
+msgid "Irdeto"
+msgstr "Irdeto"
+
+msgid "NDS/Videoguard"
+msgstr "NDS/Videoguard"
+
+msgid "Conax"
+msgstr "Conax"
+
+msgid "CryptoWorks"
+msgstr "CryptoWorks"
+
+msgid "PowerVu"
+msgstr "PowerVu"
+
+msgid "NagraVision"
+msgstr "NagraVision"
+
+msgid "BetaCrypt"
+msgstr "BetaCrypt"
+
+msgid "SkyCrypt"
+msgstr "SkyCrypt"
+
+msgid "none"
+msgstr "ei"
+
+msgid "auto"
+msgstr "auto"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "reserved"
+msgstr "reserveeritud"
+
+msgid "unknown"
+msgstr "tundmatu"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "Complete Main (CM)"
+msgstr "T<>iskomplekt (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Muusika ja efektid (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "Vaegn<67>gemine (VE)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "Vaegkuulmine (HI)"
+
+msgid "Dialogue (D)"
+msgstr "Dialoog (D)"
+
+msgid "Commentary (C)"
+msgstr "Kommentaar (C)"
+
+msgid "Emergency (E)"
+msgstr "H<>dateade (E)"
+
+msgid "Voice Over (VO)"
+msgstr "Pealer<65><72>kimine (VO)"
+
+msgid "Karaoke"
+msgstr "Karaoke"
+
+msgid "Ch1"
+msgstr "Kan. 1"
+
+msgid "Ch2"
+msgstr "Kan. 2"
+
+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 "m<>rkimata"
+
+msgid "free"
+msgstr "vaba"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -0,0 +1,382 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Rolf Ahrenberg
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: femon 1.2.3\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2008-01-20 00:50+0200\n"
+"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Last-Translator: Rolf Ahrenberg\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "Signaalimittari (OSD)"
+
+msgid "Signal Information"
+msgstr "Signaalimittari"
+
+msgid "Femon not available while replaying"
+msgstr "Signaalimittari ei ole k<>ytett<74>viss<73> toiston aikana"
+
+msgid "basic"
+msgstr "perus"
+
+msgid "transponder"
+msgstr "transponderi"
+
+msgid "stream"
+msgstr "l<>hete"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Klassinen"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "Hide main menu entry"
+msgstr "Piilota valinta p<><70>valikosta"
+
+msgid "Define whether the main manu entry is hidden."
+msgstr "M<><4D>rittele, n<>ytet<65><74>nk<6E> laajennoksen valinta p<><70>valikossa."
+
+msgid "Default display mode"
+msgstr "Oletusn<73>ytt<74>tila"
+
+msgid "Define the default display mode at startup."
+msgstr "M<><4D>rittele k<>ytett<74>v<EFBFBD> n<>ytt<74>tila k<>ynnistett<74>ess<73>."
+
+msgid "Define the used OSD skin."
+msgstr "M<><4D>rittele k<>ytett<74>v<EFBFBD> ulkoasu n<>yt<79>lle."
+
+msgid "Define the used OSD theme."
+msgstr "M<><4D>rittele k<>ytett<74>v<EFBFBD> v<>riteema n<>yt<79>lle."
+
+msgid "Position"
+msgstr "Sijainti"
+
+msgid "Define the position of OSD."
+msgstr "M<><4D>rittele n<>yt<79>n sijainti."
+
+msgid "Define the height of OSD."
+msgstr "M<><4D>rittele n<>yt<79>n korkeus."
+
+msgid "Horizontal offset"
+msgstr "Vaakakeskitys"
+
+msgid "Define the horizontal offset of OSD."
+msgstr "M<><4D>rittele n<>yt<79>n vaakakeskitys."
+
+msgid "Show CA system"
+msgstr "N<>yt<79> salausj<73>rjestelm<6C>"
+
+msgid "Define whether the CA system is shown as text."
+msgstr "M<><4D>rittele, n<>ytet<65><74>n salausj<73>rjestelm<6C> tekstin<69>."
+
+msgid "Red limit [%]"
+msgstr "Punaisen taso [%]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr "M<><4D>rittele taso punaiselle palkille, jota k<>ytet<65><74>n huonon signaalin ilmaisimena."
+
+msgid "Green limit [%]"
+msgstr "Vihre<72>n taso [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr "M<><4D>rittele taso vihre<72>lle palkille, jota k<>ytet<65><74>n hyv<79>n signaalin ilmaisimena."
+
+msgid "OSD update interval [0.1s]"
+msgstr "N<>yt<79>n p<>ivitysv<73>li [0.1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr "M<><4D>rittele n<>yt<79>nvirkistystaajuus. Mit<69> pienempi arvo, sit<69> suurempi CPU-kuorma."
+
+msgid "Analyze stream"
+msgstr "L<>hetteen analysointi"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr "M<><4D>rittele, analysoidaanko DVB-l<>hetett<74> ja lasketaanko bittinopeuksia."
+
+msgid "Calculation interval [0.1s]"
+msgstr "Laskennan p<>ivitysv<73>li [0.1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr "M<><4D>rittele laskentaikkunan koko. Mit<69> suurempi laskentaikkuna, sit<69> todenmukaisemmat lopputulokset."
+
+msgid "Use SVDRP service"
+msgstr "K<>yt<79> SVDRP-palvelua"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr "M<><4D>rittele k<>ytet<65><74>nk<6E> SVDRP-palvelua asiakas/palvelin-kokoonpanoissa."
+
+msgid "SVDRP service port"
+msgstr "SVDRP-palvelun portti"
+
+msgid "Define the port number of SVDRP service."
+msgstr "M<><4D>rittele SVDRP-palvelun k<>ytt<74>m<EFBFBD> portti."
+
+msgid "SVDRP service IP"
+msgstr "SVDRP-palvelun IP-osoite"
+
+msgid "Define the IP address of SVDRP service."
+msgstr "M<><4D>rittele SVDRP-palvelun k<>ytt<74>m<EFBFBD> IP-osoite."
+
+msgid "Help"
+msgstr "Opaste"
+
+msgid "Video"
+msgstr "Kuva"
+
+msgid "Audio"
+msgstr "<22><>ni"
+
+msgid "Transponder Information"
+msgstr "Transponderin tiedot"
+
+msgid "Apid"
+msgstr "<22><>ni-PID"
+
+msgid "Dpid"
+msgstr "Dolby-PID"
+
+msgid "Spid"
+msgstr "Tekstitys-PID"
+
+msgid "Nid"
+msgstr "Verkko-ID"
+
+msgid "Tid"
+msgstr "L<>hete-ID"
+
+msgid "Rid"
+msgstr "Radio-ID"
+
+msgid "Satellite Card"
+msgstr "Satelliittikortti"
+
+msgid "Cable Card"
+msgstr "Kaapelikortti"
+
+msgid "Terrestrial Card"
+msgstr "Terrestriaalikortti"
+
+msgid "Coderate"
+msgstr "Suojaustaso"
+
+msgid "Stream Information"
+msgstr "L<>hetteen tiedot"
+
+msgid "Video Stream"
+msgstr "Kuvaraita"
+
+msgid "Bitrate"
+msgstr "Bittinopeus"
+
+msgid "Aspect Ratio"
+msgstr "Kuvasuhde"
+
+msgid "Frame Rate"
+msgstr "Ruudunp<6E>ivitystaajuus"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Video Format"
+msgstr "Kuvaformaatti"
+
+msgid "Resolution"
+msgstr "Resoluutio"
+
+msgid "Audio Stream"
+msgstr "<22><>niraita"
+
+msgid "MPEG Layer"
+msgstr "MPEG-taso"
+
+msgid "Sampling Frequency"
+msgstr "N<>ytteenottotaajuus"
+
+msgid "AC-3 Stream"
+msgstr "AC-3-<2D><>niraita"
+
+msgid "kHz"
+msgstr "kHz"
+
+msgid "Frame Size"
+msgstr "Kehyksen koko"
+
+msgid "Bit Stream Mode"
+msgstr "L<>hetteen tyyppi"
+
+msgid "Audio Coding Mode"
+msgstr "<22><>nikoodaus"
+
+msgid "Center Mix Level"
+msgstr "Keskikanavan taso"
+
+msgid "Surround Mix Level"
+msgstr "Tehostekanavien taso"
+
+msgid "Dolby Surround Mode"
+msgstr "Dolby Surround -tehoste"
+
+msgid "Low Frequency Effects"
+msgstr "LFE-kanava"
+
+msgid "on"
+msgstr "p<><70>ll<6C>"
+
+msgid "off"
+msgstr "poissa"
+
+msgid "Dialogue Normalization"
+msgstr "Dialogin normalisointi"
+
+msgid "Fixed"
+msgstr "kiinte<74>"
+
+msgid "Analog"
+msgstr "analoginen"
+
+msgid "SECA/Mediaguard"
+msgstr "SECA/Mediaguard"
+
+msgid "Viaccess"
+msgstr "Viaccess"
+
+msgid "Irdeto"
+msgstr "Irdeto"
+
+msgid "NDS/Videoguard"
+msgstr "NDS/Videoguard"
+
+msgid "Conax"
+msgstr "Conax"
+
+msgid "CryptoWorks"
+msgstr "CryptoWorks"
+
+msgid "PowerVu"
+msgstr "PowerVu"
+
+msgid "NagraVision"
+msgstr "NagraVision"
+
+msgid "BetaCrypt"
+msgstr "BetaCrypt"
+
+msgid "SkyCrypt"
+msgstr "SkyCrypt"
+
+msgid "none"
+msgstr "ei"
+
+msgid "auto"
+msgstr "auto"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "reserved"
+msgstr "varattu"
+
+msgid "unknown"
+msgstr "tuntematon"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "Complete Main (CM)"
+msgstr "P<><50>asiallinen (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Musiikki ja tehosteet (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "N<>k<EFBFBD>rajoitteinen (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "Kuulorajoitteinen (HI)"
+
+msgid "Dialogue (D)"
+msgstr "Vuoropuhelu (D)"
+
+msgid "Commentary (C)"
+msgstr "Kommentointi (C)"
+
+msgid "Emergency (E)"
+msgstr "H<>t<EFBFBD>tiedote (E)"
+
+msgid "Voice Over (VO)"
+msgstr "P<><50>lle puhuttu (VO)"
+
+msgid "Karaoke"
+msgstr "Karaoke"
+
+msgid "Ch1"
+msgstr "kan. 1"
+
+msgid "Ch2"
+msgstr "kan. 2"
+
+msgid "C"
+msgstr "K"
+
+msgid "L"
+msgstr "V"
+
+msgid "R"
+msgstr "O"
+
+msgid "S"
+msgstr "T"
+
+msgid "SL"
+msgstr "TV"
+
+msgid "SR"
+msgstr "TO"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "ei ilmaistu"
+
+msgid "free"
+msgstr "vapaa"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -0,0 +1,382 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Nicolas Huillard
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: femon 1.2.3\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2008-01-20 01:23+0200\n"
+"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Last-Translator: Nicolas Huillard\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "Affiche les informations du signal DVB"
+
+msgid "Signal Information"
+msgstr "Signal DVB"
+
+msgid "Femon not available while replaying"
+msgstr ""
+
+msgid "basic"
+msgstr "basique"
+
+msgid "transponder"
+msgstr "transpondeur"
+
+msgid "stream"
+msgstr "flux"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Classique"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "Hide main menu entry"
+msgstr "Masquer dans le menu principal"
+
+msgid "Define whether the main manu entry is hidden."
+msgstr ""
+
+msgid "Default display mode"
+msgstr "Affichage par d<>faut"
+
+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 "Position"
+
+msgid "Define the position of OSD."
+msgstr ""
+
+msgid "Define the height of OSD."
+msgstr ""
+
+msgid "Horizontal offset"
+msgstr "D<>placement horizontal"
+
+msgid "Define the horizontal offset of OSD."
+msgstr ""
+
+msgid "Show CA system"
+msgstr "Syst<73>me CA"
+
+msgid "Define whether the CA system is shown as text."
+msgstr ""
+
+msgid "Red limit [%]"
+msgstr "Limite du rouge (%)"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
+msgid "Green limit [%]"
+msgstr "Limite du vert (%)"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr ""
+
+msgid "OSD update interval [0.1s]"
+msgstr "Intervalle de mise <20> jour (0,1s)"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
+msgid "Analyze stream"
+msgstr "Analyser le flux"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
+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 ""
+
+msgid "Use SVDRP service"
+msgstr ""
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
+msgid "SVDRP service port"
+msgstr ""
+
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
+msgid "SVDRP service IP"
+msgstr ""
+
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr "Aide"
+
+msgid "Video"
+msgstr "Vid<69>o"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Transponder Information"
+msgstr "Information transpondeur"
+
+msgid "Apid"
+msgstr "Apid"
+
+msgid "Dpid"
+msgstr "Dpid"
+
+msgid "Spid"
+msgstr "Spid"
+
+msgid "Nid"
+msgstr "Nid"
+
+msgid "Tid"
+msgstr "Tid"
+
+msgid "Rid"
+msgstr "Rid"
+
+msgid "Satellite Card"
+msgstr "Carte Satellite"
+
+msgid "Cable Card"
+msgstr "Carte C<>ble"
+
+msgid "Terrestrial Card"
+msgstr "Carte TNT"
+
+msgid "Coderate"
+msgstr "Coderate"
+
+msgid "Stream Information"
+msgstr "Information flux"
+
+msgid "Video Stream"
+msgstr "Flux vid<69>o"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Aspect Ratio"
+msgstr "Proportions d'image"
+
+msgid "Frame Rate"
+msgstr "Rafra<72>chissement"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Video Format"
+msgstr "Standard vid<69>o"
+
+msgid "Resolution"
+msgstr "R<>solution"
+
+msgid "Audio Stream"
+msgstr "Flux audio"
+
+msgid "MPEG Layer"
+msgstr "MPEG Layer"
+
+msgid "Sampling Frequency"
+msgstr "Fr<46>quence d'<27>chantillonage"
+
+msgid "AC-3 Stream"
+msgstr "Flux AC-3"
+
+msgid "kHz"
+msgstr "kHz"
+
+msgid "Frame Size"
+msgstr "Taille de paquet"
+
+msgid "Bit Stream Mode"
+msgstr "Mode bitstream"
+
+msgid "Audio Coding Mode"
+msgstr "Mode de codage audio"
+
+msgid "Center Mix Level"
+msgstr "Niveau sonore milieu"
+
+msgid "Surround Mix Level"
+msgstr "Niveau sonore surround"
+
+msgid "Dolby Surround Mode"
+msgstr "Mode Dolby Surround"
+
+msgid "Low Frequency Effects"
+msgstr "Effets de basses"
+
+msgid "on"
+msgstr "Oui"
+
+msgid "off"
+msgstr "Non"
+
+msgid "Dialogue Normalization"
+msgstr "Normalisation des dialogues"
+
+msgid "Fixed"
+msgstr "Fixe"
+
+msgid "Analog"
+msgstr "Analogique"
+
+msgid "SECA/Mediaguard"
+msgstr "SECA/Mediaguard"
+
+msgid "Viaccess"
+msgstr "Viaccess"
+
+msgid "Irdeto"
+msgstr "Irdeto"
+
+msgid "NDS/Videoguard"
+msgstr "NDS/Videoguard"
+
+msgid "Conax"
+msgstr "Conax"
+
+msgid "CryptoWorks"
+msgstr "CryptoWorks"
+
+msgid "PowerVu"
+msgstr "PowerVu"
+
+msgid "NagraVision"
+msgstr "NagraVision"
+
+msgid "BetaCrypt"
+msgstr "BetaCrypt"
+
+msgid "SkyCrypt"
+msgstr "SkyCrypt"
+
+msgid "none"
+msgstr "Aucun"
+
+msgid "auto"
+msgstr "Auto"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "reserved"
+msgstr "r<>serv<72>"
+
+msgid "unknown"
+msgstr "inconnu"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "Complete Main (CM)"
+msgstr "Principal (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Musique et effets (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "Malvoyants (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "Malentendants (HI)"
+
+msgid "Dialogue (D)"
+msgstr "Dialogue (D)"
+
+msgid "Commentary (C)"
+msgstr "Commentaires (C)"
+
+msgid "Emergency (E)"
+msgstr "Urgence (E)"
+
+msgid "Voice Over (VO)"
+msgstr "Voix off (VO)"
+
+msgid "Karaoke"
+msgstr "Karaoke"
+
+msgid "Ch1"
+msgstr "Can. 1"
+
+msgid "Ch2"
+msgstr "Can. 2"
+
+msgid "C"
+msgstr "Centre"
+
+msgid "L"
+msgstr "Gauche"
+
+msgid "R"
+msgstr "Droite"
+
+msgid "S"
+msgstr "Surround"
+
+msgid "SL"
+msgstr "Surround gauche"
+
+msgid "SR"
+msgstr "Surround droit"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "non indiqu<71>"
+
+msgid "free"
+msgstr "libre"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -0,0 +1,383 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the VDR package.
+# Sean Carlos
+# Gringo <vdr-italian@tiscali.it>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: femon 1.2.3\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2008-01-20 01:23+0200\n"
+"PO-Revision-Date: 2007-12-26 19:38+0100\n"
+"Last-Translator: Gringo <vdr-italian@tiscali.it>\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "Visualizza informazioni segnale DVB"
+
+msgid "Signal Information"
+msgstr "Informazioni segnale"
+
+msgid "Femon not available while replaying"
+msgstr "Femon non disponibile durante la riproduzione"
+
+msgid "basic"
+msgstr "base"
+
+msgid "transponder"
+msgstr "transponder"
+
+msgid "stream"
+msgstr "flusso"
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr "Classico"
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "Hide main menu entry"
+msgstr "Nascondi voce menu principale"
+
+msgid "Define whether the main manu entry is hidden."
+msgstr ""
+
+msgid "Default display mode"
+msgstr "Modalit<69> visualizz. standard"
+
+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 "Posizione"
+
+msgid "Define the position of OSD."
+msgstr ""
+
+msgid "Define the height of OSD."
+msgstr ""
+
+msgid "Horizontal offset"
+msgstr "Limite orizzontale"
+
+msgid "Define the horizontal offset of OSD."
+msgstr ""
+
+msgid "Show CA system"
+msgstr "Mostra sistema CA"
+
+msgid "Define whether the CA system is shown as text."
+msgstr ""
+
+msgid "Red limit [%]"
+msgstr "Limite rosso [%]"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
+msgid "Green limit [%]"
+msgstr "Limite verde [%]"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr ""
+
+msgid "OSD update interval [0.1s]"
+msgstr "Intervallo aggiornamento OSD [0.1s]"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
+msgid "Analyze stream"
+msgstr "Analizza flusso"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
+msgid "Calculation interval [0.1s]"
+msgstr "Intervallo calcolo [0.1s]"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
+msgid "Use SVDRP service"
+msgstr "Utilizza servizio SVDRP"
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
+msgid "SVDRP service port"
+msgstr "Porta servizio SVDRP"
+
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
+msgid "SVDRP service IP"
+msgstr "IP servizio SVDRP"
+
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr "Aiuto"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Audio"
+msgstr "Audio"
+
+msgid "Transponder Information"
+msgstr "Informazioni transponder"
+
+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 "Satellite Card"
+msgstr "Scheda satellitare"
+
+msgid "Cable Card"
+msgstr "Scheda via cavo"
+
+msgid "Terrestrial Card"
+msgstr "Scheda terrestre"
+
+msgid "Coderate"
+msgstr "Coderate"
+
+msgid "Stream Information"
+msgstr "Informazione flusso"
+
+msgid "Video Stream"
+msgstr "Flusso video"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Aspect Ratio"
+msgstr "Dimensione immagine"
+
+msgid "Frame Rate"
+msgstr "Frame rate"
+
+msgid "Hz"
+msgstr "Hz"
+
+msgid "Video Format"
+msgstr "Formato video"
+
+msgid "Resolution"
+msgstr "Risoluzione"
+
+msgid "Audio Stream"
+msgstr "Flusso audio"
+
+msgid "MPEG Layer"
+msgstr "Formato MPEG"
+
+msgid "Sampling Frequency"
+msgstr "Frequenza campionamento"
+
+msgid "AC-3 Stream"
+msgstr "Flusso AC-3"
+
+msgid "kHz"
+msgstr "kHz"
+
+msgid "Frame Size"
+msgstr "Dimensione frame"
+
+msgid "Bit Stream Mode"
+msgstr "Modalit<69> bitstream"
+
+msgid "Audio Coding Mode"
+msgstr "Modalit<69> codifica audio"
+
+msgid "Center Mix Level"
+msgstr "Livello sonoro centrale"
+
+msgid "Surround Mix Level"
+msgstr "Livello sonoro surround"
+
+msgid "Dolby Surround Mode"
+msgstr "Modalit<69> Dolby Surround"
+
+msgid "Low Frequency Effects"
+msgstr "Effetti bassa frequenza"
+
+msgid "on"
+msgstr "Attivo"
+
+msgid "off"
+msgstr "Disattivo"
+
+msgid "Dialogue Normalization"
+msgstr "Normalizzazione dialoghi"
+
+msgid "Fixed"
+msgstr "Fisso"
+
+msgid "Analog"
+msgstr "Analogico"
+
+msgid "SECA/Mediaguard"
+msgstr "SECA/Mediaguard"
+
+msgid "Viaccess"
+msgstr "Viaccess"
+
+msgid "Irdeto"
+msgstr "Irdeto"
+
+msgid "NDS/Videoguard"
+msgstr "NDS/Videoguard"
+
+msgid "Conax"
+msgstr "Conax"
+
+msgid "CryptoWorks"
+msgstr "CryptoWorks"
+
+msgid "PowerVu"
+msgstr "PowerVu"
+
+msgid "NagraVision"
+msgstr "NagraVision"
+
+msgid "BetaCrypt"
+msgstr "BetaCrypt"
+
+msgid "SkyCrypt"
+msgstr "SkyCrypt"
+
+msgid "none"
+msgstr "Nessuno"
+
+msgid "auto"
+msgstr "Auto"
+
+msgid "MHz"
+msgstr "MHz"
+
+msgid "reserved"
+msgstr "riservato"
+
+msgid "unknown"
+msgstr "sconosciuto"
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "Complete Main (CM)"
+msgstr "Principale (CM)"
+
+msgid "Music and Effects (ME)"
+msgstr "Musica ed effetti (ME)"
+
+msgid "Visually Impaired (VI)"
+msgstr "Immagine alterata (VI)"
+
+msgid "Hearing Impaired (HI)"
+msgstr "Suono deteriorato (HI)"
+
+msgid "Dialogue (D)"
+msgstr "Dialogo (D)"
+
+msgid "Commentary (C)"
+msgstr "Commenti (C)"
+
+msgid "Emergency (E)"
+msgstr "Emergenza (E)"
+
+msgid "Voice Over (VO)"
+msgstr "Voce off (VO)"
+
+msgid "Karaoke"
+msgstr "Karaoke"
+
+msgid "Ch1"
+msgstr "Can. 1"
+
+msgid "Ch2"
+msgstr "Can. 2"
+
+msgid "C"
+msgstr "C"
+
+msgid "L"
+msgstr "S"
+
+msgid "R"
+msgstr "D"
+
+msgid "S"
+msgstr "S"
+
+msgid "SL"
+msgstr "SS"
+
+msgid "SR"
+msgstr "SD"
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr "non indicato"
+
+msgid "free"
+msgstr "libero"
+
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+msgid "kbit/s"
+msgstr "kbit/s"
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -0,0 +1,382 @@
+# VDR plugin language source file.
+# Copyright (C) 2007 Rolf Ahrenberg
+# This file is distributed under the same license as the femon package.
+# Vyacheslav Dikonov
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: femon 1.2.3\n"
+"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
+"POT-Creation-Date: 2008-01-20 01:23+0200\n"
+"PO-Revision-Date: 2007-08-12 23:22+0300\n"
+"Last-Translator: Vyacheslav Dikonov\n"
+"Language-Team: <vdr@linuxtv.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-5\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "DVB Signal Information Monitor (OSD)"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Signal Information"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Femon not available while replaying"
+msgstr ""
+
+msgid "basic"
+msgstr ""
+
+msgid "transponder"
+msgstr ""
+
+msgid "stream"
+msgstr ""
+
+msgid "AC-3"
+msgstr "AC-3"
+
+msgid "Classic"
+msgstr ""
+
+msgid "Elchi"
+msgstr "Elchi"
+
+msgid "DeepBlue"
+msgstr "DeepBlue"
+
+msgid "Moronimo"
+msgstr "Moronimo"
+
+msgid "Enigma"
+msgstr "Enigma"
+
+msgid "EgalsTry"
+msgstr "EgalsTry"
+
+msgid "Duotone"
+msgstr "Duotone"
+
+msgid "SilverGreen"
+msgstr "SilverGreen"
+
+msgid "Hide main menu entry"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
+
+msgid "Define whether the main manu entry is hidden."
+msgstr ""
+
+msgid "Default display mode"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+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 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
+
+msgid "Define the position of OSD."
+msgstr ""
+
+msgid "Define the height of OSD."
+msgstr ""
+
+msgid "Horizontal offset"
+msgstr ""
+
+msgid "Define the horizontal offset of OSD."
+msgstr ""
+
+msgid "Show CA system"
+msgstr ""
+
+msgid "Define whether the CA system is shown as text."
+msgstr ""
+
+msgid "Red limit [%]"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)"
+
+msgid "Define a limit for red bar, which is used to indicate a bad signal."
+msgstr ""
+
+msgid "Green limit [%]"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (%)"
+
+msgid "Define a limit for green bar, which is used to indicate a good signal."
+msgstr ""
+
+msgid "OSD update interval [0.1s]"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)"
+
+msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
+msgstr ""
+
+msgid "Analyze stream"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Define whether the DVB stream is analyzed and bitrates calculated."
+msgstr ""
+
+msgid "Calculation interval [0.1s]"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (0,1 <20><><EFBFBD>)"
+
+msgid "Define an interval for calculation. The bigger interval generates more stable values."
+msgstr ""
+
+msgid "Use SVDRP service"
+msgstr ""
+
+msgid "Define whether the SVDRP service is used in client/server setups."
+msgstr ""
+
+msgid "SVDRP service port"
+msgstr ""
+
+msgid "Define the port number of SVDRP service."
+msgstr ""
+
+msgid "SVDRP service IP"
+msgstr ""
+
+msgid "Define the IP address of SVDRP service."
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
+msgid "Video"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Audio"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Transponder Information"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+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 "Satellite Card"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Cable Card"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Terrestrial Card"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+
+msgid "Coderate"
+msgstr "Coderate"
+
+msgid "Stream Information"
+msgstr ""
+
+msgid "Video Stream"
+msgstr ""
+
+msgid "Bitrate"
+msgstr ""
+
+msgid "Aspect Ratio"
+msgstr ""
+
+msgid "Frame Rate"
+msgstr ""
+
+msgid "Hz"
+msgstr "<22><>"
+
+msgid "Video Format"
+msgstr ""
+
+msgid "Resolution"
+msgstr ""
+
+msgid "Audio Stream"
+msgstr ""
+
+msgid "MPEG Layer"
+msgstr ""
+
+msgid "Sampling Frequency"
+msgstr ""
+
+msgid "AC-3 Stream"
+msgstr ""
+
+msgid "kHz"
+msgstr "ڳ<>"
+
+msgid "Frame Size"
+msgstr ""
+
+msgid "Bit Stream Mode"
+msgstr ""
+
+msgid "Audio Coding Mode"
+msgstr ""
+
+msgid "Center Mix Level"
+msgstr ""
+
+msgid "Surround Mix Level"
+msgstr ""
+
+msgid "Dolby Surround Mode"
+msgstr ""
+
+msgid "Low Frequency Effects"
+msgstr ""
+
+msgid "on"
+msgstr "<22><><EFBFBD>"
+
+msgid "off"
+msgstr "<22><><EFBFBD><EFBFBD>"
+
+msgid "Dialogue Normalization"
+msgstr ""
+
+msgid "Fixed"
+msgstr ""
+
+msgid "Analog"
+msgstr ""
+
+msgid "SECA/Mediaguard"
+msgstr ""
+
+msgid "Viaccess"
+msgstr ""
+
+msgid "Irdeto"
+msgstr ""
+
+msgid "NDS/Videoguard"
+msgstr ""
+
+msgid "Conax"
+msgstr ""
+
+msgid "CryptoWorks"
+msgstr ""
+
+msgid "PowerVu"
+msgstr ""
+
+msgid "NagraVision"
+msgstr ""
+
+msgid "BetaCrypt"
+msgstr ""
+
+msgid "SkyCrypt"
+msgstr ""
+
+msgid "none"
+msgstr "<22><><EFBFBD>"
+
+msgid "auto"
+msgstr "<22><><EFBFBD><EFBFBD>"
+
+msgid "MHz"
+msgstr "<22><><EFBFBD>"
+
+msgid "reserved"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "PAL"
+msgstr "PAL"
+
+msgid "NTSC"
+msgstr "NTSC"
+
+msgid "Complete Main (CM)"
+msgstr ""
+
+msgid "Music and Effects (ME)"
+msgstr ""
+
+msgid "Visually Impaired (VI)"
+msgstr ""
+
+msgid "Hearing Impaired (HI)"
+msgstr ""
+
+msgid "Dialogue (D)"
+msgstr ""
+
+msgid "Commentary (C)"
+msgstr ""
+
+msgid "Emergency (E)"
+msgstr ""
+
+msgid "Voice Over (VO)"
+msgstr ""
+
+msgid "Karaoke"
+msgstr ""
+
+msgid "Ch1"
+msgstr ""
+
+msgid "Ch2"
+msgstr ""
+
+msgid "C"
+msgstr ""
+
+msgid "L"
+msgstr ""
+
+msgid "R"
+msgstr ""
+
+msgid "S"
+msgstr ""
+
+msgid "SL"
+msgstr ""
+
+msgid "SR"
+msgstr ""
+
+msgid "dB"
+msgstr "dB"
+
+msgid "not indicated"
+msgstr ""
+
+msgid "free"
+msgstr ""
+
+msgid "Mbit/s"
+msgstr "<22><><EFBFBD><EFBFBD>/<2F>"
+
+msgid "kbit/s"
+msgstr "<22><><EFBFBD><EFBFBD>/<2F>"
--- a/svdrpservice.h
+++ b/svdrpservice.h
@@ -0,0 +1,39 @@
+/*
+ * svdrpservice.h: Public interface of the plugin's services
+ *
+ * See the README file for copyright information and how to reach the author.
+ */
+
+#ifndef _SVDRPSERVICE__H
+#define _SVDRPSERVICE__H
+
+#include <vdr/tools.h>
+
+class cLine: public cListObject {
+private:
+  char *Line;
+public:
+  const char *Text()   { return Line; }
+  cLine(const char *s) { Line = s ? strdup(s) : NULL; };
+  virtual ~cLine()     { if (Line) free(Line); };
+};
+
+struct SvdrpConnection_v1_0 {
+  // in
+  cString        serverIp;
+  unsigned short serverPort;
+  bool           shared;
+  // in+out
+  int            handle;
+};
+
+struct SvdrpCommand_v1_0 {
+  // in
+  cString        command;
+  int            handle;
+  // out
+  cList<cLine>   reply;
+  unsigned short responseCode;
+};
+
+#endif //_SVDRPSERVICE__H
--- a/symbols/ar11.xpm
+++ b/symbols/ar11.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ar11_xpm[] = {
+static const char *const ar11_xpm[] = {
 "26 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/ar169.xpm
+++ b/symbols/ar169.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ar169_xpm[] = {
+static const char *const ar169_xpm[] = {
 "38 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/ar2211.xpm
+++ b/symbols/ar2211.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ar2211_xpm[] = {
+static const char *const ar2211_xpm[] = {
 "52 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/ar43.xpm
+++ b/symbols/ar43.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ar43_xpm[] = {
+static const char *const ar43_xpm[] = {
 "31 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/carrier.xpm
+++ b/symbols/carrier.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * carrier_xpm[] = {
+static const char *const carrier_xpm[] = {
 "96 19 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/device.xpm
+++ b/symbols/device.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * device_xpm[] = {
+static const char *const device_xpm[] = {
 "14 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/dolbydigital.xpm
+++ b/symbols/dolbydigital.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dolbydigital_xpm[] = {
+static const char *const dolbydigital_xpm[] = {
 "31 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/dolbydigital20.xpm
+++ b/symbols/dolbydigital20.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dolbydigital20_xpm[] = {
+static const char *const dolbydigital20_xpm[] = {
 "55 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/dolbydigital51.xpm
+++ b/symbols/dolbydigital51.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dolbydigital51_xpm[] = {
+static const char *const dolbydigital51_xpm[] = {
 "51 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/five.xpm
+++ b/symbols/five.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * five_xpm[] = {
+static const char *const five_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/four.xpm
+++ b/symbols/four.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * four_xpm[] = {
+static const char *const four_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/lock.xpm
+++ b/symbols/lock.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lock_xpm[] = {
+static const char *const lock_xpm[] = {
 "96 19 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/monoleft.xpm
+++ b/symbols/monoleft.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * monoleft_xpm[] = {
+static const char *const monoleft_xpm[] = {
 "17 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/monoright.xpm
+++ b/symbols/monoright.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * monoright_xpm[] = {
+static const char *const monoright_xpm[] = {
 "17 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/ntsc.xpm
+++ b/symbols/ntsc.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ntsc_xpm[] = {
+static const char *const ntsc_xpm[] = {
 "19 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/one.xpm
+++ b/symbols/one.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * one_xpm[] = {
+static const char *const one_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/pal.xpm
+++ b/symbols/pal.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pal_xpm[] = {
+static const char *const pal_xpm[] = {
 "18 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/signal.xpm
+++ b/symbols/signal.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * signal_xpm[] = {
+static const char *const signal_xpm[] = {
 "96 19 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/stereo.xpm
+++ b/symbols/stereo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * stereo_xpm[] = {
+static const char *const stereo_xpm[] = {
 "17 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/svdrp.xpm
+++ b/symbols/svdrp.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static const char *const svdrp_xpm[] = {
+"60 18 2 1",
+".	c #FFFFFF",
+"+	c #000000",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"+..........................................................+",
+"+.....+++++....++....++...++++++.....++++++.....++++++.....+",
+"+....+++++++...++....++...+++++++....+++++++....+++++++....+",
+"+...+++...++...++....++...++...+++...++...+++...++...+++...+",
+"+...++....++...++....++...++....++...++....++...++....++...+",
+"+...++.........++....++...++....++...++....++...++....++...+",
+"+...+++.........++..++....++....++...++...+++...++...+++...+",
+"+....+++++......++..++....++....++...+++++++....+++++++....+",
+"+.....+++++.....++..++....++....++...++++++.....++++++.....+",
+"+........+++....++..++....++....++...++...++....++.........+",
+"+.........++.....++++.....++....++...++...++....++.........+",
+"+...++....++.....++++.....++....++...++...++....++.........+",
+"+...++...+++......++......++...+++...++....++...++.........+",
+"+...+++++++.......++......+++++++....++....++...++.........+",
+"+....+++++........++......++++++.....++....++...++.........+",
+"+..........................................................+",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"};
--- a/symbols/sync.xpm
+++ b/symbols/sync.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sync_xpm[] = {
+static const char *const sync_xpm[] = {
 "96 19 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/three.xpm
+++ b/symbols/three.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * three_xpm[] = {
+static const char *const three_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/two.xpm
+++ b/symbols/two.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * two_xpm[] = {
+static const char *const two_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/viterbi.xpm
+++ b/symbols/viterbi.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * viterbi_xpm[] = {
+static const char *const viterbi_xpm[] = {
 "96 19 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/zero.xpm
+++ b/symbols/zero.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * zero_xpm[] = {
+static const char *const zero_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
Author	SHA1	Message	Date
Rolf Ahrenberg	71b2993345	Updated Italian translation (Thanks to Diego Pierotto). Added '-Wno-parentheses' to the compiler options. Mapped 'kInfo' as help key in setup menu.	2008-01-20 04:20:00 +02:00
Rolf Ahrenberg	d6e5a01ada	Added Spids support. Minor OSD layout changes.	2007-10-14 04:20:00 +03:00
Rolf Ahrenberg	c8c639be62	Updated for vdr-1.5.8.	2007-08-19 04:20:00 +03:00
Rolf Ahrenberg	bf02f334f6	Updated for vdr-1.5.7.	2007-08-14 04:20:00 +03:00
Rolf Ahrenberg	64e56af6dc	Fixed a race condition in cFemonReceiver (Thanks to Reinhard Nissl).	2007-05-15 04:20:00 +03:00
Rolf Ahrenberg	830aa73e1a	Fixed opening while replaying (Thanks to Antti Seppälä for reporting this one).	2007-05-01 04:20:00 +03:00
Rolf Ahrenberg	78048d8ea0	Updated for vdr-1.5.0.	2007-01-08 04:20:00 +02:00
Rolf Ahrenberg	42c6b69490	Added support for svdrpservice plugin (Thanks to Frank Schmirler). Added INFO SVDRP command (partially based on patch by Herbert Pötzl). Removed system log option - use SVDRP instead. Added --remove-destination to the 'cp' command in Makefile.	2006-09-17 04:20:00 +03:00
Rolf Ahrenberg	6ce0ca32bd	Fixed device switching priority (Thanks to Andreas Brugger). Fixed device switching back to the primary device.	2006-06-06 04:20:00 +03:00
Rolf Ahrenberg	74a2a1bbe7	Updated for vdr-1.4.0. Modified APIVERSION code in Makefile. Updated german translation (Thanks to Andreas Brachold).	2006-04-30 04:20:00 +03:00
Rolf Ahrenberg	bf85e32d0d	Added STRIP option for Makefile (Thanks to Ville Skyttä). Modified APIVERSION code in Makefile.	2006-04-23 04:20:00 +03:00
Rolf Ahrenberg	caf42f7ace	Updated for vdr-1.3.47.	2006-04-20 04:20:00 +03:00
Rolf Ahrenberg	c2b1e5a187	Updated for vdr-1.3.44. Minor Makefile changes. Made all symbol data 'const'. Added spanish translation (Thanks to Luis Palacios).	2006-03-08 04:20:00 +02:00
Rolf Ahrenberg	e90fe6065c	Updated for vdr-1.3.42. Added "SilverGreen" theme (Thanks to Rififi77 @ VDRPortal).	2006-02-06 04:20:00 +02:00
Rolf Ahrenberg	7ee255830a	Updated for vdr-1.3.40. Fixed a translation bug (Thanks to Antti Hartikainen). Fixed AC3 header parsing bug (Thanks to Axel Katzur for reporting this one). Fixed EgalsTry theme (Thanks to Uwe Hanke).	2006-01-25 04:20:00 +02:00
Rolf Ahrenberg	7da8cb2110	Updated for vdr-1.3.36. Added french translation (Thanks to Nicolas Huillard). Enabled bitrate commands via SVDRP. Added new SVDRP commands. Modified femon service without incrementing version number. Added "Duotone" theme for 2bpp on screen displays. Fixed crash bug in femonreceiver. Fixed setup page bug (Thanks to Thomas Günther for reporting this one).	2005-11-13 04:20:00 +02:00
Rolf Ahrenberg	e2fb9e994a	Updated for vdr-1.3.34. Added Enigma theme (Thanks to Rolf Hoverath). Added EgalsTry theme (Thanks to Uwe Hanke). Added option to disable rounded corners.	2005-10-04 04:20:00 +03:00