Backported the "AC3 Stream Information" feature from version 0.1.3.

.gitignore

@@ -1,6 +0,0 @@
-.dependencies
-*.o
-*.so
-*~
-po/*.pot
-po/*.mo

COPYING

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+                       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.
 
@@ -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 Lesser General Public License instead.)  You can apply it to
+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
@@ -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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    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.
@@ -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 Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.

HISTORY

@@ -1,7 +1,5 @@
-
-===================================
 VDR Plugin 'femon' Revision History
-===================================
+-----------------------------------
 
 2004-02-15: Version 0.0.1
 
@@ -46,7 +44,7 @@ VDR Plugin 'femon' Revision History
 2004-04-04: Version 0.0.3c
 
 - Fixed minor bitrate calculation errors.
-- Added Russian translation (Thanks to Vyacheslav Dikonov).
+- Added russian translation (Thanks to Vyacheslav Dikonov).
 
 2004-05-31: Version 0.0.4
 
@@ -60,13 +58,7 @@ VDR Plugin 'femon' Revision History
 
 - Backported the "AC3 Stream Information" feature from version 0.1.3.
 
-2004-09-11: Version 0.0.7
+-------------------------
-
--  Backported changes and fixes from version 0.1.6.
-
-===================================
-VDR Plugin 'femon' Revision History
-===================================
 
 2004-05-18: Version 0.1.0
 
@@ -77,7 +69,7 @@ VDR Plugin 'femon' Revision History
 - Added "Stream Information" display mode.
   Toggle between different modes with 'OK' key:
   .-> basic -> transponder -> stream -.
-  `-----------------------------------'
+  `-----------------------------------<EFBFBD>
 - Added missing german translations (Thanks to Peter Marquardt).
 
 2004-06-06: Version 0.1.2
@@ -89,245 +81,3 @@ VDR Plugin 'femon' Revision History
 2004-06-11: Version 0.1.3
 
 - Added "AC-3 Stream Information" display mode (Thanks to Lothar Englisch).
-
-2004-06-24: Version 0.1.4
-
-- Added some new symbols and beautified the old ones.
-- Added audio track selection feature.
-- Added preliminary device switching feature (disabled at the moment).
-
-2004-08-18: Version 0.1.5
-
-- Fixed OSDSTATUSWIN_XC define.
-- Added preliminary NTSC support (make NTSC_SYSTEM=1 plugins).
-- Fixed "Setup/OSD/Use Small Fonts" bug (Thanks to Winni for reporting this one).
-- Added patches directory: CA system names by Lauri Tischler.
-
-2004-09-11: Version 0.1.6
-
-- Yet Another Minor Release.
-- Integrated the CA system names patch: "Setup / Show CA System".
-
-2004-11-28: Version 0.1.7
-
-- Updated for vdr-1.3.17.
-- Fixed receiver related crash (Thanks to Marco Schluessler).
-
-2005-01-15: Version 0.7.7
-
-- Updated for vdr-1.3.18.
-- Added DEBUG mode (make DEBUG=1 plugins).
-- OSD height is now user configurable.
-- Added audio channel selection into Yellow key.
-
-2005-01-23: Version 0.7.9
-
-- Some minor cosmetic fixes.
-
-2005-01-23: Version 0.8.0
-
-- Updated for vdr-1.3.19.
-
-2005-01-24: Version 0.8.1
-
-- Added Estonian translations (Thanks to Arthur Konovalov).
-
-2005-02-24: Version 0.8.5
-
-- Updated for vdr-1.3.21.
-- Minor modification for DEBUG mode.
-- Added preliminary support for themes and some GUI tweaks.
-- Added horizontal offset setup option.
-
-2005-02-26: Version 0.8.6
-
-- Horizontal offset setup option should be functional now.
-
-2005-04-01: Version 0.8.7
-
-- Default make target is now all.
-- Fixed the access rights of symbols subdirectory (Thanks to Harri Kukkonen).
-- Added a new theme: Moronimo (Thanks to Morone).
-
-2005-04-02: Version 0.8.8
-
-- Cleaned up Finnish translations (Thanks to Ville Skyttä).
-
-2005-04-04: Version 0.8.9
-
-- Updated Estonian translations (Thanks to Arthur Konovalov).
-- Added the missing german translations (Thanks to #vdr-portal).
-
-2005-05-20: Version 0.9.0
-
-- Renamed compiling switches ('DEBUG' to 'FEMON_DEBUG' and 'NTSC_SYSTEM' to 'FEMON_NTSC').
-- Enabled preliminary support for the device switching.
-
-2005-07-23: Version 0.9.1
-
-- Fixed AC3-info flickering (Thanks to Pasi Juppo for reporting this one).
-- Added "Analog" type CA system.
-- Plugin is now stripped by default.
-
-2005-08-15: Version 0.9.2
-
-- Threads updated for vdr-1.3.29.
-
-2005-08-28: Version 0.9.3
-
-- 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ä).
-- 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älä 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 Diego Pierotto).
-- 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 Diego Pierotto).
-- Added '-Wno-parentheses' to the compiler options.
-- Mapped 'kInfo' as help key in setup menu.
-
-2008-02-18: Version 1.2.4
-
-- Replaced asprintf with cString.
-- Updated French translation (Thanks to Michaël Nival).
-- Fixed service call with null data.
-- Added setup option to use a single 8 bpp OSD area.
-
-2008-03-27: Version 1.6.0
-
-- Updated for vdr-1.6.0.
-- Updated Italian translation (Thanks to Diego Pierotto).
-- Added ST:TNG theme (Thanks to Fabian Förg).
-
-2008-06-20: Version 1.6.1
-
-- Updated Italian translation (Thanks to Diego Pierotto).
-- Fixed a crash if no channel available (Thanks to Winfried Köhler)
-
-2008-10-12: Version 1.6.2
-
-- Converted HISTORY and fi_FI.po to UTF-8.
-- Optimized receiver and OSD thread termination.
-
-2008-11-09: Version 1.6.3
-
-- Added initial support for H.264 and HE-AAC.
-- Fixed detection of false positives in audio/video streams.
-- Refactored source code.
-
-2008-11-30: Version 1.6.4
-
-- Added new helper functions.
-- Updated Italian translation (Thanks to Diego Pierotto).
-- Fixed a memory leak.
-- Added a check for the minimum OSD height.
-- Replaced "Use single area (8bpp)" option with VDR's "Setup/OSD/Anti-alias".
-- Removed the FEMON_NTSC option.
-- Fixed a deadlock in cFemonReceiver (Thanks to Antti Seppälä for reporting this one).
-
-2008-12-16: Version 1.6.5
-
-- Backported from 1.7.0.
-
-2008-12-16: Version 1.7.0
-
-- Updated for vdr-1.7.2.
-- Added whitespace cleanups.
-- Changed info window to use the channel source instead of the frontend type.
-- Removed the "Show CA system" setup option.

Makefile

@@ -1,32 +1,26 @@
 #
-# Makefile for Frontend Status Monitor plugin
+# Makefile for a Video Disk Recorder plugin
 #
-
+# $Id$
-# Debugging on/off 
-#FEMON_DEBUG = 1
-
-# Strip debug symbols?  Set eg. to /bin/true if not
-STRIP = strip
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
 #
 PLUGIN = femon
 
 ### The version number of this plugin (taken from the main source file):
 
-VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
+DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -35,9 +29,9 @@ TMPDIR = /tmp
 
 -include $(VDRDIR)/Make.config
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
+### The version number of VDR (taken from VDR's "config.h"):
 
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -46,72 +40,35 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
-ifdef FEMON_DEBUG
-DEFINES += -DDEBUG
-endif
-
-.PHONY: all all-redirect
-all-redirect: all
-
 ### The object files (add further files here):
 
-OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femontools.o femonmpeg.o femonac3.o femonaac.o femonh264.o femonsymbol.o
+OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femoni18n.o
-
-### The main target:
-
-all: libvdr-$(PLUGIN).so i18n
 
 ### Implicit rules:
 
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-### Dependencies:
+# Dependencies:
 
-MAKEDEP = $(CXX) -MM -MG
+MAKEDEP = g++ -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
-### Internationalization (I18N):
-
-PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
-I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
-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:
 
+all: libvdr-$(PLUGIN).so
+
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-ifndef FEMON_DEBUG
+	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
-	@$(STRIP) $@
-endif
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -122,4 +79,4 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~

README

@@ -1,21 +1,16 @@
 This is a DVB Frontend Status Monitor plugin for the Video Disk Recorder (VDR).
 
-Written by:                  Rolf Ahrenberg
+Written by:                  R o l f . A h r e n b e r g @ s c i . f i
-                             < 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:
 
-VDR and a DVB card.
+VDR & DVB. BMW & Ph.D.. BEER. YARRR!
 
 Description:
 
@@ -23,19 +18,21 @@ DVB Frontend Status Monitor is a plugin that displays some signal information
 parameters of the current tuned channel on OSD. You can zap through all your
 channels and the plugin should be monitoring always the right frontend. The
 transponder and stream information are also available in advanced display modes.
+User can switch between different display modes by pressing 'OK' key.
 
 The plugin is based on a neat console frontend status monitor application
 called 'femon' by Johannes Stezenbach (see DVB-apps/szap/femon.c for further
-information). The bitrate calculation trick originates from the 'dvbstream'
+information). The other parts of plugin code are borrowed from the excellent
-application by Dave Chapman and the stream information routines are taken from
+'OSD Picture-In-Picture' plugin by Sascha Volkenandt and Andreas Regel. The
-the 'libdvb' library by Metzler Brothers. The H.264 parsing routines are taken
+bitrate calculation algorithm originates from the 'dvbstream' application by
-from vdr-xineliboutput plugin by Petri Hintukainen.
+Dave Chapman and the stream information routines from the 'libdvb' library by
+Metzler Brothers.
 
 Terminology:
 
 --------------------------------------------------------------
-|## Channel Name ################### [SVDRP][AR][VF][A/DD][D]|
+|## Channel Name ############################# DD 16:9 PAL ##|
-|[=====Signal Strength in % ==============|=================]|
+|[=====Signal Strength in %  =============|=================]|
 |[=====Signal-to-Noise Ratio in % ========|=================]|
 | STR: #0000 (0%)       BER: #00000000       Video: 0 Mbit/s |
 | SNR: #0000 (0%)       UNC: #00000000       Audio: 0 kbit/s |
@@ -47,7 +44,7 @@ SNR     - Signal-to-noise ratio
 BER     - Bit error rate
 UNC     - Uncorrected blocks
 Video   - Calculated video bitrate in Mbit/s
-Audio   - Calculated audio / AC-3 bitrate in kbit/s
+Audio   - Calculated audio / AC-3 bitrate in kbit/s (only first PID)
 
 LOCK    - Everything's working...
 SIGNAL  - Found something above the noise level
@@ -55,69 +52,22 @@ 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..N) / AC-3 track (optional)
-D       - Device number: 0..N (optional)
-
-Controls:
-
-ChanUp/ChanDn - Switch channel up/down
-Up/Down       - Switch channel up/down
-0-9           - Select channel
-Ok            - Switch between display modes: basic, transponder, stream, AC-3
-Green         - Select next audio track
-Yellow        - Select audio channel: stereo, mono left, mono right
-Back          - Exit plugin
-Left/Right    - Switch to next/previous device that provides the current channel
-
 Installation:
 
 cd /put/your/path/here/VDR/PLUGINS/src
-tar -xzf /put/your/path/here/vdr-femon-X.Y.Z.tgz
+tar -xzf /put/your/path/here/vdr-femon-X.Y.Z.tar.gz
 ln -s femon-X.Y.Z femon
 cd /put/your/path/here/VDR
 make
 make plugins
-./vdr -P femon
+./vdr -Pfemon
-
-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, because I
+- The plugin supports only those DVB cards with _one_ frontend (do any cards
-  haven't yet figured howto do it without patching the VDR core.
+  with multiple frontends even exist?), because I haven't yet figured howto do
-
+  it without patching the VDR core.
+- Sometimes (read always) ttxtsubs plugin messes up the OSD - user should disable
+  ttxtsubs, but closing and reopening the femon plugin might help temporarily as
+  well. Btw., this same thing happens with OSDTeletext plugin too :)
 - Disable the stream analyze to speed up heavy zapping sessions.
-
-- The signal strength and signal-to-noise ratio values are comparable only
-  between the same brand/model frontends. Due to the lack of proper frontend
-  specifications those values cannot be calculated into any real units.
-
-- If the OSD isn't visible, you've configured the OSD height too big or too
-  small. Please, try to adjust the variable on the setup page before writing
-  any bug reports. NTSC users should use a shrinked default OSD height by
-  modifying VDR's setup.conf: femon.OSDHeight = 420
-
-- 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."

femon.c

@@ -3,60 +3,29 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
+ * $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 "femon.h"
-#include "femontools.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10600
+#if VDRVERSNUM >= 10307
-#error "VDR-1.6.0 API version or greater is required!"
+#error "You don't exist! Go away!"
 #endif
 
-static const char VERSION[]       = "1.6.5";
+cPluginFemon::cPluginFemon(void)
-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)
@@ -80,14 +49,10 @@ bool cPluginFemon::Initialize(void)
 bool cPluginFemon::Start(void)
 {
   // Start any background activities the plugin shall perform.
+  RegisterI18n(Phrases);
   return true;
 }
 
-void cPluginFemon::Stop(void)
-{
-  // Stop the background activities.
-}
-
 void cPluginFemon::Housekeeping(void)
 {
   // Perform any cleanup or other regular tasks.
@@ -96,206 +61,34 @@ void cPluginFemon::Housekeeping(void)
 cOsdObject *cPluginFemon::MainMenuAction(void)
 {
   // Perform the action when selected from the main VDR menu.
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  return new cFemonOsd();
-  if (cReplayControl::NowReplaying() || (Channels.Count() <= 0))
-     Skins.Message(mtInfo, tr("Femon not available"));
-  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, "RedLimit"))       femonConfig.redlimit       = atoi(Value);
   else if (!strcasecmp(Name, "GreenLimit"))     femonConfig.greenlimit     = atoi(Value);
   else if (!strcasecmp(Name, "UpdateInterval")) femonConfig.updateinterval = atoi(Value);
   else if (!strcasecmp(Name, "AnalStream"))     femonConfig.analyzestream  = atoi(Value);
   else if (!strcasecmp(Name, "CalcInterval"))   femonConfig.calcinterval   = atoi(Value);
-  else if (!strcasecmp(Name, "UseSvdrp"))       femonConfig.usesvdrp       = atoi(Value);
-  else if (!strcasecmp(Name, "ServerPort"))     femonConfig.svdrpport      = atoi(Value);
-  else if (!strcasecmp(Name, "ServerIp"))       strn0cpy(femonConfig.svdrpip, Value, sizeof(femonConfig.svdrpip));
   else
     return false;
-  if (femonConfig.displaymode < 0 || femonConfig.displaymode >= eFemonModeMaxNumber) femonConfig.displaymode = 0;
+  if (femonConfig.displaymode < 0 || femonConfig.displaymode >= modeMaxNumber) femonConfig.displaymode = 0;
 
   return true;
 }
 
-bool cPluginFemon::Service(const char *Id, void *Data)
-{
-  if (strcmp(Id,"FemonService-v1.0") == 0) {
-     if (Data) {
-        FemonService_v1_0 *data = (FemonService_v1_0*)Data;
-        int ndx = cDevice::ActualDevice()->CardIndex();
-        data->fe_name = getFrontendName(ndx);
-        data->fe_status = getFrontendStatus(ndx);
-        data->fe_snr = getSNR(ndx);
-        data->fe_signal = getSignal(ndx);
-        data->fe_ber = getBER(ndx);
-        data->fe_unc = getUNC(ndx);
-        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;
-     }
-
-  return false;
-}
-
-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"
-    "    Print the current frontend status.",
-    "SGNL\n"
-    "    Print the current signal strength.",
-    "SNRA\n"
-    "    Print the current signal-to-noise ratio.",
-    "BERA\n"
-    "    Print the current bit error rate.",
-    "UNCB\n"
-    "    Print the current uncorrected blocks rate.",
-    "VIBR\n"
-    "    Print the actual device and current video bitrate [Mbit/s].",
-    "AUBR\n"
-    "    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;
-}
-
-cString cPluginFemon::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
-{
-  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) {
-     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) {
-     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 on device #%d", getBER(cDevice::ActualDevice()->CardIndex()), cDevice::ActualDevice()->CardIndex());
-     }
-  else if (strcasecmp(Command, "UNCB") == 0) {
-     return cString::sprintf("%08X on device #%d", getUNC(cDevice::ActualDevice()->CardIndex()), cDevice::ActualDevice()->CardIndex());
-     }
-  else if (strcasecmp(Command, "VIBR") == 0) {
-     if (cFemonOsd::Instance())
-        return cString::sprintf("%s on device #%d", *getBitrateMbits(cFemonOsd::Instance()->GetVideoBitrate()), cDevice::ActualDevice()->CardIndex());
-     else
-        return cString::sprintf("--- Mbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
-     }
-  else if (strcasecmp(Command, "AUBR") == 0) {
-     if (cFemonOsd::Instance())
-        return cString::sprintf("%s on device #%d", *getBitrateKbits(cFemonOsd::Instance()->GetAudioBitrate()), cDevice::ActualDevice()->CardIndex());
-     else
-        return cString::sprintf("--- kbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
-     }
-  else if (strcasecmp(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[modeBasic]       = tr("basic");
-  dispmodes[eFemonModeBasic]       = tr("basic");
+  dispmodes[modeTransponder] = tr("transponder");
-  dispmodes[eFemonModeTransponder] = tr("transponder");
+  dispmodes[modeStream]      = tr("stream");
-  dispmodes[eFemonModeStream]      = tr("stream");
+  dispmodes[modeAC3]         = tr("AC-3");
-  dispmodes[eFemonModeAC3]         = tr("AC-3");
-
-  skins[eFemonSkinClassic]         = tr("Classic");
-  skins[eFemonSkinElchi]           = tr("Elchi");
-
-  themes[eFemonThemeClassic]       = tr("Classic");
-  themes[eFemonThemeElchi]         = tr("Elchi");
-  themes[eFemonThemeSTTNG]         = tr("ST:TNG");
-  themes[eFemonThemeDeepBlue]      = tr("DeepBlue");
-  themes[eFemonThemeMoronimo]      = tr("Moronimo");
-  themes[eFemonThemeEnigma]        = tr("Enigma");
-  themes[eFemonThemeEgalsTry]      = tr("EgalsTry");
-  themes[eFemonThemeDuotone]       = tr("Duotone");
-  themes[eFemonThemeSilverGreen]   = tr("SilverGreen");
-
-  data = femonConfig;
   Setup();
 }
 
@@ -304,56 +97,16 @@ void cMenuFemonSetup::Setup(void)
   int current = Current();
 
   Clear();
-  help.Clear();
+  Add(new cMenuEditBoolItem(  tr("Hide Mainmenu Entry"),         &femonConfig.hidemenu,       tr("no"),      tr("yes")));
-
+  Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),      tr("yes")));
-  Add(new cMenuEditBoolItem(tr("Hide main menu entry"), &data.hidemenu));
+  Add(new cMenuEditStraItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    modeMaxNumber, dispmodes));
-  help.Append(tr("Define whether the main menu entry is hidden."));
+  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"),  tr("top")));
-
+  Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,             50));
-  Add(new cMenuEditStraItem(tr("Default display mode"), &data.displaymode, eFemonModeMaxNumber, dispmodes));
+  Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,            100));
-  help.Append(tr("Define the default display mode at startup."));
+  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")));
-  Add(new cMenuEditStraItem(trVDR("Setup.OSD$Skin"), &data.skin, eFemonSkinMaxNumber, skins));
+  if (femonConfig.analyzestream)
-  help.Append(tr("Define the used OSD skin."));
+     Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,             100));
-
-  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 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();
@@ -361,37 +114,26 @@ void cMenuFemonSetup::Setup(void)
 
 void cMenuFemonSetup::Store(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  femonConfig = data;
   SetupStore("HideMenu",       femonConfig.hidemenu);
-  SetupStore("DisplayMode",    femonConfig.displaymode);
+  SetupStore("SyslogOutput",   femonConfig.syslogoutput);
-  SetupStore("Skin",           femonConfig.skin);
-  SetupStore("Theme",          femonConfig.theme);
   SetupStore("Position",       femonConfig.position);
-  SetupStore("OSDHeight",      femonConfig.osdheight);
+  SetupStore("DisplayMode",    femonConfig.displaymode);
-  SetupStore("OSDOffset",      femonConfig.osdoffset);
   SetupStore("RedLimit",       femonConfig.redlimit);
   SetupStore("GreenLimit",     femonConfig.greenlimit);
   SetupStore("UpdateInterval", femonConfig.updateinterval);
   SetupStore("AnalStream",     femonConfig.analyzestream);
   SetupStore("CalcInterval",   femonConfig.calcinterval);
-  SetupStore("UseSvdrp",       femonConfig.usesvdrp);
-  SetupStore("ServerPort",     femonConfig.svdrpport);
-  SetupStore("ServerIp",       femonConfig.svdrpip);
 }
 
 eOSState cMenuFemonSetup::ProcessKey(eKeys Key)
 {
-  int oldUsesvdrp = data.usesvdrp;
+  int oldAnalyzestream = femonConfig.analyzestream;
-  int oldAnalyzestream = data.analyzestream;
 
   eOSState state = cMenuSetupPage::ProcessKey(Key);
 
-  if (Key != kNone && (data.analyzestream != oldAnalyzestream || data.usesvdrp != oldUsesvdrp))
+  if (Key != kNone && (femonConfig.analyzestream != oldAnalyzestream)) {
      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;
 }

femon.h

@@ -0,0 +1,49 @@
+/*
+ * 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.0.6";
+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 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);
+  };
+
+class cMenuFemonSetup : public cMenuSetupPage {
+  private:
+    const char *dispmodes[modeMaxNumber];
+    virtual void Setup(void);
+  protected:
+    virtual eOSState ProcessKey(eKeys Key);
+    virtual void Store(void);
+  public:
+    cMenuFemonSetup(void);
+  };
+
+#endif //__FEMON_H
+

femonaac.c

@@ -1,77 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#include "femontools.h"
-#include "femonaac.h"
-
-#define IS_HEAAC_AUDIO(buf) (((buf)[0] == 0xFF) && (((buf)[1] & 0xF6) == 0xF0))
-
-static unsigned int samplerates[16] =
-{
-  96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, -1, -1, -1, -1
-};
-
-bool getAACAudioInfo(uint8_t *buf, int len, audio_info_t *info)
-{
-  // HE-AAC audio detection, search for syncword with layer set to 0
-  if ((len < 4) || !IS_HEAAC_AUDIO(buf))
-     return false;
-
-  /* ADTS Fixed Header:
-   * syncword                 12b  always: '111111111111'
-   * id                        1b  0: MPEG-4, 1: MPEG-2
-   * layer                     2b  always: '00'
-   * protection_absent         1b
-   * profile                   2b  0: Main profile AAC MAIN 1: Low Complexity profile (LC) AAC LC 2: Scalable Sample Rate profile (SSR) AAC SSR 3: (reserved) AAC LTP
-   * sampling_frequency_index  4b
-   * private_bit               1b
-   * channel_configuration     3b
-   * original/copy             1b
-   * home                      1b
-   * emphasis                  2b only if ID == 0 (ie MPEG-4)
-   */
-
-  int sampling_frequency_index = (buf[2] & 0x03C) >> 2;
-  int channel_configuration = ((buf[2] & 0x01) << 2) | ((buf[3] & 0xC0) >> 6);
-
-  info->codec = AUDIO_CODEC_HEAAC;
-  info->bitrate = AUDIO_BITRATE_RESERVED;
-
-  switch (channel_configuration) {
-    case 0:
-         info->channelMode = AUDIO_CHANNEL_MODE_STEREO;
-         break;
-
-    case 1:
-         info->channelMode = AUDIO_CHANNEL_MODE_JOINT_STEREO;
-         break;
-
-    case 2:
-         info->channelMode = AUDIO_CHANNEL_MODE_DUAL;
-         break;
-
-    case 3:
-         info->channelMode = AUDIO_CHANNEL_MODE_SINGLE;
-         break;
-
-    default:
-         info->channelMode = AUDIO_CHANNEL_MODE_INVALID;
-         break;
-  }
-
-  switch (sampling_frequency_index) {
-    case 0xC ... 0xF:
-         info->samplingFrequency = AUDIO_SAMPLING_FREQUENCY_RESERVED;
-         break;
-
-    default:
-         info->samplingFrequency = samplerates[sampling_frequency_index];
-         break;
-  }
-
-  return true;
-}

femonaac.h

@@ -1,15 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMONAAC_H
-#define __FEMONAAC_H
-
-#include "femonaudio.h"
-
-bool getAACAudioInfo(uint8_t *buf, int len, audio_info_t *info);
-
-#endif //__FEMONAAC_H

femonac3.c

@@ -1,115 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * AC3 Audio Header: http://www.atsc.org/standards/a_52a.pdf
- */
-
-#include "femontools.h"
-#include "femonac3.h"
-
-#define IS_AC3_DATA(buf) (((buf)[0] == 0x0b) && ((buf)[1] == 0x77))
-
-static unsigned int ac3_bitrates[32] =
-{
-  32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static unsigned int ac3_freq[4] =
-{
-  480, 441, 320, 0
-};
-
-//static unsigned int ac3_frames[3][32] =
-//{
-//  {64, 80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768,  896,  1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-//  {69, 87,  104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835,  975,  1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-//  {96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672, 768, 960, 1152, 1344, 1536, 1728, 1920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-//};
-
-bool getAC3AudioInfo(uint8_t *buf, int len, ac3_info_t *info)
-{
-  if (!IS_AC3_DATA(buf) || (len < 8))
-     return false;
-
-  uint8_t *data = buf + 2;
-  uint8_t frame = (data[2] & 0x3f);
-  info->bitrate = 1000 * ac3_bitrates[frame >> 1];
-  uint8_t fr = (data[2] & 0xc0 ) >> 6;
-  //uint8_t sz = ac3_frames[fr][frame >> 1];
-  //if ((frame & 1) && (fr == 1))
-  //   sz++;
-  //sz <<= 1;
-  info->samplingFrequency = 100 * ac3_freq[fr];
-  info->bitstreamMode = (data[3] & 7);
-  int acm = (data[4] & 0xE0) >> 5;
-  info->audioCodingMode = acm;
-  if ((acm & 0x01) && (acm != 0x01)) {
-     // 3 front channels
-     info->centerMixLevel = (data[4] & 0x18) >> 3;
-     if (acm & 0x04) {
-        // a surround channel exists
-        info->surroundMixLevel = (data[4] & 0x06) >> 1;
-        if (acm == 0x02) {
-           // if in 2/0 mode
-           info->dolbySurroundMode = ((data[4] & 0x01) << 1) | ((data[5] & 0x80) >> 7);
-           info->lfe = (data[5] & 0x40) >> 6;
-           info->dialogLevel = (data[5] & 0x3e) >> 1;
-           }
-        else {
-           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
-           info->lfe = (data[4] & 0x01);
-           info->dialogLevel = (data[5] & 0xF8) >> 3;
-           }
-        }
-     else {
-        info->surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
-        if (acm == 0x02) {
-           // if in 2/0 mode
-            info->dolbySurroundMode = (data[4] & 0x06) >> 1;
-            info->lfe = (data[4] & 0x01);
-            info->dialogLevel = (data[5] & 0xF8) >> 3;
-           }
-        else {
-           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
-           info->lfe = (data[4] & 0x04) >> 2;
-           info->dialogLevel = (data[4] & 0x03) << 3 | ((data[5] & 0xE0) >> 5);
-           }
-        }
-     }
-  else {
-     info->centerMixLevel = AUDIO_CENTER_MIX_LEVEL_INVALID;
-     if (acm & 0x04) {
-        // a surround channel exists
-        info->surroundMixLevel = (data[4] & 0x18) >> 3;
-        if (acm == 0x02) {
-           // if in 2/0 mode
-           info->dolbySurroundMode = (data[4] & 0x06) >> 1;
-           info->lfe = (data[4] & 0x01);
-           info->dialogLevel = (data[5] & 0xF8) >> 3;
-           }
-        else {
-           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
-           info->lfe = (data[4] & 0x04) >> 2;
-           info->dialogLevel = (data[4] & 0x03) << 3 | ((data[5] & 0xE0) >> 5);
-           }
-        }
-     else {
-        info->surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
-        if (acm == 0x02) {
-           // if in 2/0 mode
-           info->dolbySurroundMode = (data[4] & 0x18) >> 3;
-           info->lfe = (data[4] & 0x04) >> 2;
-           info->dialogLevel = (data[4] & 0x03) << 3 | ((data[5] & 0xE0) >> 5);
-           }
-        else {
-           info->dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
-           info->lfe = (data[4] & 0x10) >> 4;
-           info->dialogLevel = ((data[4] & 0x0F) << 1) | ((data[5] & 0x80) >> 7);
-           }
-        }
-     }
-     
-  return true;
-}

femonac3.h

@@ -1,15 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMONAC3_H
-#define __FEMONAC3_H
-
-#include "femonaudio.h"
-
-bool getAC3AudioInfo(uint8_t *buf, int len, ac3_info_t *info);
-
-#endif //__FEMONAC3_H

femonaudio.h

@@ -1,109 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the AUDIO Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMONAUDIO_H
-#define __FEMONAUDIO_H
-
-enum eAudioCodec {
-  AUDIO_CODEC_INVALID = -1,
-  AUDIO_CODEC_UNKNOWN,
-  AUDIO_CODEC_MPEG1_I,
-  AUDIO_CODEC_MPEG1_II,
-  AUDIO_CODEC_MPEG1_III,
-  AUDIO_CODEC_MPEG2_I,
-  AUDIO_CODEC_MPEG2_II,
-  AUDIO_CODEC_MPEG2_III,
-  AUDIO_CODEC_HEAAC
-  };
-
-enum eAudioChannelMode {
-  AUDIO_CHANNEL_MODE_INVALID = -1,
-  AUDIO_CHANNEL_MODE_STEREO,
-  AUDIO_CHANNEL_MODE_JOINT_STEREO,
-  AUDIO_CHANNEL_MODE_DUAL,
-  AUDIO_CHANNEL_MODE_SINGLE
-  };
-
-enum eAudioBitrate {
-  AUDIO_BITRATE_RESERVED = -3,
-  AUDIO_BITRATE_FREE = -2,
-  AUDIO_BITRATE_INVALID = -1
-  };
-
-enum eAudioSamplingFrequency {
-  AUDIO_SAMPLING_FREQUENCY_RESERVED = -2,
-  AUDIO_SAMPLING_FREQUENCY_INVALID = -1
-  };
-
-enum eAudioCenterMixLevel {
-  AUDIO_CENTER_MIX_LEVEL_INVALID = -1,
-  AUDIO_CENTER_MIX_LEVEL_MINUS_3dB,
-  AUDIO_CENTER_MIX_LEVEL_MINUS_4_5dB,
-  AUDIO_CENTER_MIX_LEVEL_MINUS_6dB,
-  AUDIO_CENTER_MIX_LEVEL_RESERVED
-  };
-
-enum eAudioSurroundMixLevel {
-  AUDIO_SURROUND_MIX_LEVEL_INVALID = -1,
-  AUDIO_SURROUND_MIX_LEVEL_MINUS_3dB,
-  AUDIO_SURROUND_MIX_LEVEL_MINUS_6dB,
-  AUDIO_SURROUND_MIX_LEVEL_0_dB,
-  AUDIO_SURROUND_MIX_LEVEL_RESERVED
-  };
-
-enum eAudioDolbySurroundMode {
-  AUDIO_DOLBY_SURROUND_MODE_INVALID = -1,
-  AUDIO_DOLBY_SURROUND_MODE_NOT_INDICATED,
-  AUDIO_DOLBY_SURROUND_MODE_NOT_DOLBYSURROUND,
-  AUDIO_DOLBY_SURROUND_MODE_DOLBYSURROUND,
-  AUDIO_DOLBY_SURROUND_MODE_RESERVED
-  };
-
-enum eAudioBitstreamMode {
-  AUDIO_BITSTREAM_MODE_INVALID = -1,
-  AUDIO_BITSTREAM_MODE_CM,
-  AUDIO_BITSTREAM_MODE_ME,
-  AUDIO_BITSTREAM_MODE_VI,
-  AUDIO_BITSTREAM_MODE_HI,
-  AUDIO_BITSTREAM_MODE_D,
-  AUDIO_BITSTREAM_MODE_C,
-  AUDIO_BITSTREAM_MODE_E,
-  AUDIO_BITSTREAM_MODE_VO_KAR
-  };
-
-enum eAudioCodingMode {
-  AUDIO_CODING_MODE_INVALID = -1,
-  AUDIO_CODING_MODE_1_1,
-  AUDIO_CODING_MODE_1_0,
-  AUDIO_CODING_MODE_2_0,
-  AUDIO_CODING_MODE_3_0,
-  AUDIO_CODING_MODE_2_1,
-  AUDIO_CODING_MODE_3_1,
-  AUDIO_CODING_MODE_2_2,
-  AUDIO_CODING_MODE_3_2,
-  };
-
-typedef struct audio_info {
-  eAudioCodec codec;             // enum
-  double      bitrate;           // kbit/s or eAudioBitrate
-  int         samplingFrequency; // Hz or eAudioSamplingFrequency
-  int         channelMode;       // eAudioChannelMode
-} audio_info_t;
-
-typedef struct ac3_info {
-  int         bitrate;           // bit/s or eAudioBitrate
-  int         samplingFrequency; // Hz or eAudioSamplingFrequency
-  int         bitstreamMode;     // 0..7 or eAudioBitstreamMode
-  int         audioCodingMode;   // 0..7 or eAudioCodingMode
-  int         dolbySurroundMode; // eAudioDolbySurroundMode
-  int         centerMixLevel;    // eAudioCenterMixLevel
-  int         surroundMixLevel;  // eAudioSurroundMixLevel
-  int         dialogLevel;       // -dB
-  bool        lfe;               // boolean
-} ac3_info_t;
-
-#endif //__FEMONAUDIO_H

femoncfg.c

@@ -3,9 +3,9 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
+ * $Id$
  */
 
-#include <string.h>
 #include "femoncfg.h"
 
 cFemonConfig femonConfig;
@@ -14,129 +14,11 @@ cFemonConfig::cFemonConfig(void)
 {
   hidemenu       = 0;
   displaymode    = 0;
-  skin           = 0;
-  theme          = 0;
   position       = 1;
   redlimit       = 33;
   greenlimit     = 66;
   updateinterval = 5;
   analyzestream  = 1;
   calcinterval   = 20;
-  osdheight      = 480;
+  syslogoutput   = 0;
-  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
-    0xFFFCC024, // clrActiveText
-    0xFFFCFCFC, // clrInactiveText
-    0xFFFC1414, // clrRed
-    0xFFFCC024, // clrYellow
-    0xFF24FC24, // clrGreen
-  },
-  {
-    // eFemonThemeElchi
-    4,          // bpp
-    0xC8000066, // clrBackground
-    0xC833AAEE, // clrTitleBackground
-    0xFF000000, // clrTitleText
-    0xFFCCBB22, // clrActiveText
-    0xFFFFFFFF, // clrInactiveText
-    0xFFFF0000, // clrRed
-    0xFFFFEE00, // clrYellow
-    0xFF33CC33, // clrGreen
-  },
-  {
-    // eFemonThemeSTTNG
-    4,          // bpp
-    0x7F000000, // clrBackground
-    0xFFFCC024, // clrTitleBackground
-    0xFF000000, // clrTitleText
-    0xFF00FCFC, // clrActiveText
-    0xFFFCC024, // clrInactiveText
-    0xFFFC1414, // clrRed
-    0xFFFCC024, // clrYellow
-    0xFF24FC24, // clrGreen
-  },
-  {
-    // eFemonThemeDeepBlue
-    4,          // bpp
-    0xC80C0C0C, // clrBackground
-    0xC832557A, // clrTitleBackground
-    0xFF000000, // clrTitleText
-    0xFFCE7B00, // clrActiveText
-    0xFF9A9A9A, // clrInactiveText
-    0xFF992900, // clrRed
-    0xFFCE7B00, // clrYellow
-    0xFF336600, // clrGreen
-  },
-  {
-    // eFemonThemeMoronimo
-    4,          // bpp
-    0xDF294A6B, // clrBackground
-    0xDF3E5578, // clrTitleBackground
-    0xFF9BBAD7, // clrTitleText
-    0xFFCE7B00, // clrActiveText
-    0xFF9A9A9A, // clrInactiveText
-    0xFF992900, // clrRed
-    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
-  },
-};

femoncfg.h

@@ -3,21 +3,19 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
+ * $Id$
  */
 
 #ifndef __FEMONCFG_H
 #define __FEMONCFG_H
 
-#define MaxSvdrpIp 15 // xxx.xxx.xxx.xxx
+enum dispModes {
-
+  modeBasic,
-enum eFemonModes
+  modeTransponder,
-{
+  modeStream,
-  eFemonModeBasic,
+  modeAC3,
-  eFemonModeTransponder,
+  modeMaxNumber
-  eFemonModeStream,
+  };
-  eFemonModeAC3,
-  eFemonModeMaxNumber
-};
 
 struct cFemonConfig
 {
@@ -25,57 +23,15 @@ public:
   cFemonConfig(void);
   int hidemenu;
   int displaymode;
-  int skin;
-  int theme;
   int position;
   int redlimit;
   int greenlimit;
   int updateinterval;
   int analyzestream;
   int calcinterval;
-  int osdheight;
+  int syslogoutput;
-  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,
-  eFemonThemeSTTNG,
-  eFemonThemeDeepBlue,
-  eFemonThemeMoronimo,
-  eFemonThemeEnigma,
-  eFemonThemeEgalsTry,
-  eFemonThemeDuotone,
-  eFemonThemeSilverGreen,
-  eFemonThemeMaxNumber
-};
-
-struct cFemonTheme
-{
-  int bpp;
-  int clrBackground;
-  int clrTitleBackground;
-  int clrTitleText;
-  int clrActiveText;
-  int clrInactiveText;
-  int clrRed;
-  int clrYellow;
-  int clrGreen;
-};
-
-extern const cFemonTheme femonTheme[eFemonThemeMaxNumber];
-
 #endif // __FEMONCFG_H

femonh264.c

@@ -1,425 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * The original NAL SPS parsing and bitstream functions are taken from
- * vdr-xineliboutput plugin by Petri Hintukainen. 
- */
-
-#include "femontools.h"
-#include "femonh264.h"
-
-#define NAL_SEI     0x06 // Supplemental Enhancement Information
-#define NAL_SPS     0x07 // Sequence Parameter Set
-#define NAL_AUD     0x09 // Access Unit Delimiter
-#define NAL_END_SEQ 0x10 // End of Sequence
-
-#define IS_NAL_SEI(buf)     (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == NAL_SEI))
-#define IS_NAL_SPS(buf)     (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == NAL_SPS))
-#define IS_NAL_AUD(buf)     (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == NAL_AUD))
-#define IS_NAL_END_SEQ(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == NAL_END_SEQ))
-
-// Picture types
-#define NO_PICTURE  0
-#define I_FRAME     1
-#define P_FRAME     2
-#define B_FRAME     3
-
-static const eVideoAspectRatio aspect_ratios[] =
-{
-  VIDEO_ASPECT_RATIO_INVALID,
-  VIDEO_ASPECT_RATIO_1_1,
-  VIDEO_ASPECT_RATIO_12_11,
-  VIDEO_ASPECT_RATIO_10_11,
-  VIDEO_ASPECT_RATIO_16_11,
-  VIDEO_ASPECT_RATIO_40_33,
-  VIDEO_ASPECT_RATIO_24_11,
-  VIDEO_ASPECT_RATIO_20_11,
-  VIDEO_ASPECT_RATIO_32_11,
-  VIDEO_ASPECT_RATIO_80_33,
-  VIDEO_ASPECT_RATIO_18_11,
-  VIDEO_ASPECT_RATIO_15_11,
-  VIDEO_ASPECT_RATIO_64_33,
-  VIDEO_ASPECT_RATIO_160_99,
-  VIDEO_ASPECT_RATIO_4_3,
-  VIDEO_ASPECT_RATIO_3_2,
-  VIDEO_ASPECT_RATIO_2_1
-};
-
-static const eVideoFormat video_formats[] =
-{
-  VIDEO_FORMAT_COMPONENT,
-  VIDEO_FORMAT_PAL,
-  VIDEO_FORMAT_NTSC,
-  VIDEO_FORMAT_SECAM,
-  VIDEO_FORMAT_MAC,
-  VIDEO_FORMAT_UNKNOWN,
-  VIDEO_FORMAT_RESERVED
-};
-
-typedef struct {
-  int width;
-  int height;
-  eVideoAspectRatio aspect_ratio;
-  eVideoFormat format;
-} h264_sps_data_t;
-
-typedef struct {
-   double frame_rate;
-   double bitrate;
-   eVideoScan scan;
-} h264_sei_data_t;
-
-typedef struct {
-  const uint8_t *data;
-  int            count; // bits
-  int            index; // bits
-} br_state;
-
-#define BR_INIT(data, bytes)  { (data), 8 * (bytes), 0 }
-#define BR_EOF(br)            ((br)->index >= (br)->count)
-#define br_skip_bit(br)       br_skip_bits(br,1)
-#define br_get_u8(br)         br_get_bits(br, 8)
-#define br_get_u16(br)        ((br_get_bits(br, 8) << 8) | br_get_bits(br, 8))
-#define br_skip_ue_golomb(br) br_skip_golomb(br)
-#define br_skip_se_golomb(br) br_skip_golomb(br)
-
-static inline void br_init(br_state *br, const uint8_t *data, int bytes)
-{
-  br->data  = data;
-  br->count = 8 * bytes;
-  br->index = 0;
-}
-
-static inline int br_get_bit(br_state *br)
-{
-  if (br->index >= br->count)
-    return 1; // -> no infinite colomb's ...
-
-  int r = (br->data[br->index >> 3] >> (7 - (br->index & 7))) & 1;
-  br->index++;
-  return r;
-}
-
-static inline uint32_t br_get_bits(br_state *br, uint32_t n)
-{
-  uint32_t r = 0;
-  while (n--)
-    r = r | (br_get_bit(br) << n);
-  return r;
-}
-
-static inline void br_skip_bits(br_state *br, int n)
-{
-  br->index += n;
-}
-
-static inline uint32_t br_get_ue_golomb(br_state *br)
-{
-  int n = 0;
-  while (!br_get_bit(br) && (n < 32))
-    n++;
-  return n ? ((1 << n) - 1) + br_get_bits(br, n) : 0;
-}
-
-static inline int32_t br_get_se_golomb(br_state *br)
-{
-  uint32_t r = br_get_ue_golomb(br) + 1;
-  return (r & 1) ? -(r >> 1) : (r >> 1);
-}
-
-static inline void br_skip_golomb(br_state *br)
-{
-  int n = 0;
-  while (!br_get_bit(br) && (n < 32))
-    n++;
-  br_skip_bits(br, n);
-}
-
-static inline void br_byte_align(br_state *br)
-{
-  int n = br->index % 8;
-  if (n > 0)
-     br_skip_bits(br, 8 - n);
-}
-
-static bool h264_parse_sps(const uint8_t *buf, int len, h264_sps_data_t *sps)
-{
-  br_state br = BR_INIT(buf, len);
-  int profile_idc, pic_order_cnt_type;
-  int frame_mbs_only;
-  int i, j;
-
-  profile_idc = br_get_u8(&br);
-  
-  //Dprintf("H.264 SPS: profile_idc %d", profile_idc);
-  
-  br_skip_bits(&br, 16);
-  br_skip_ue_golomb(&br);            // seq_parameter_set_id
-  if (profile_idc >= 100) {
-     if (br_get_ue_golomb(&br) == 3) // chroma_format_idc
-        br_skip_bit(&br);            // residual_colour_transform_flag
-     br_skip_ue_golomb(&br);         // bit_depth_luma - 8
-     br_skip_ue_golomb(&br);         // bit_depth_chroma - 8
-     br_skip_bit(&br);               // transform_bypass
-     if (br_get_bit(&br)) {          // seq_scaling_matrix_present
-        for (i = 0; i < 8; i++) {  
-            if (br_get_bit(&br)) {   // seq_scaling_list_present
-               int last = 8, next = 8, size = (i < 6) ? 16 : 64;
-               for (j = 0; j < size; j++) {
-                   if (next)
-                      next = (last + br_get_se_golomb(&br)) & 0xff;
-                   last = next ?: last;
-                   }
-               }
-            }
-        }
-     }
-
-  br_skip_ue_golomb(&br);            // log2_max_frame_num - 4
-  pic_order_cnt_type = br_get_ue_golomb(&br);
-  if (pic_order_cnt_type == 0)
-     br_skip_ue_golomb(&br);         // log2_max_poc_lsb - 4
-  else if (pic_order_cnt_type == 1) {
-     br_skip_bit(&br);               // delta_pic_order_always_zero
-     br_skip_se_golomb(&br);         // offset_for_non_ref_pic
-     br_skip_se_golomb(&br);         // offset_for_top_to_bottom_field
-     j = br_get_ue_golomb(&br);      // num_ref_frames_in_pic_order_cnt_cycle
-     for (i = 0; i < j; i++)
-         br_skip_se_golomb(&br);     // offset_for_ref_frame[i]
-     }
-  br_skip_ue_golomb(&br);            // ref_frames
-  br_skip_bit(&br);                  // gaps_in_frame_num_allowed
-  sps->width      = br_get_ue_golomb(&br) + 1; // mbs
-  sps->height     = br_get_ue_golomb(&br) + 1; // mbs
-  frame_mbs_only  = br_get_bit(&br);
-
-  //Dprintf("H.264 SPS: pic_width:  %u mbs", (unsigned int)sps->width);
-  //Dprintf("H.264 SPS: pic_height: %u mbs", (unsigned int)sps->height);
-  //Dprintf("H.264 SPS: frame only flag: %d", frame_mbs_only);
-
-  sps->width  *= 16;
-  sps->height *= 16 * (2 - frame_mbs_only);
-
-  if (!frame_mbs_only) {
-    if (br_get_bit(&br)) {           // mb_adaptive_frame_field_flag
-       //Dprintf("H.264 SPS: MBAFF");
-       }
-    }
-
-  br_skip_bit(&br);                  // direct_8x8_inference_flag
-  if (br_get_bit(&br)) {             // frame_cropping_flag
-    uint32_t crop_left   = br_get_ue_golomb(&br);
-    uint32_t crop_right  = br_get_ue_golomb(&br);
-    uint32_t crop_top    = br_get_ue_golomb(&br);
-    uint32_t crop_bottom = br_get_ue_golomb(&br);
-    //Dprintf("H.264 SPS: cropping %d %d %d %d", crop_left, crop_top, crop_right, crop_bottom);
-
-    sps->width -= 2 * (crop_left + crop_right);
-    if (frame_mbs_only)
-       sps->height -= 2 * (crop_top + crop_bottom); 
-    else
-       sps->height -= 4 * (crop_top + crop_bottom);
-    }
-
-  // VUI parameters
-  sps->aspect_ratio = VIDEO_ASPECT_RATIO_INVALID;
-  sps->format = VIDEO_FORMAT_INVALID;
-  if (br_get_bit(&br)) {             // vui_parameters_present_flag
-     if (br_get_bit(&br)) {          // aspect_ratio_info_present
-        uint32_t aspect_ratio_idc = br_get_u8(&br);
-        //Dprintf("H.264 SPS: aspect_ratio_idc %d", aspect_ratio_idc);
-        if (aspect_ratio_idc == 255) { // extended sar
-           br_skip_bit(&br);           // sar_width
-           br_skip_bit(&br);           // sar_height
-           sps->aspect_ratio = VIDEO_ASPECT_RATIO_EXTENDED;
-           //Dprintf("H.264 SPS: aspect ratio extended");
-           }
-        else if (aspect_ratio_idc < sizeof(aspect_ratios) / sizeof(aspect_ratios[0])) {
-           sps->aspect_ratio = aspect_ratios[aspect_ratio_idc];
-           //Dprintf("H.264 SPS: -> aspect ratio %d", sps->aspect_ratio);
-           }
-        }
-     if (br_get_bit(&br))            // overscan_info_present_flag
-        br_skip_bit(&br);            // overscan_approriate_flag
-     if (br_get_bit(&br)) {          // video_signal_type_present_flag
-        uint32_t video_format = br_get_bits(&br, 3);
-        if (video_format < sizeof(video_formats) / sizeof(video_formats[0])) {
-           sps->format = video_formats[video_format];
-           //Dprintf("H.264 SPS: -> video format %d", sps->format);
-           }
-        }
-     }
-
-  //Dprintf("H.264 SPS: -> video size %dx%d, aspect %d", sps->width, sps->height, sps->aspect_ratio);
-
-  if (BR_EOF(&br)) {
-     //Dprintf("H.264 SPS: not enough data ?");
-     return false;
-     }
-  
-  return true;
-}
-
-static bool h264_parse_sei(const uint8_t *buf, int len, h264_sei_data_t *sei)
-{
-  int num_referenced_subseqs, i;
-  br_state br = BR_INIT(buf, len);
-
-  while (!BR_EOF(&br)) { // sei_message
-    int lastByte, payloadSize = 0, payloadType = 0;
-
-    // last_payload_type_byte
-    do {
-       lastByte = br_get_u8(&br) & 0xFF;
-       payloadType += lastByte;
-    } while (lastByte == 0xFF);
-
-    // last_payload_size_byte
-    do {
-       lastByte = br_get_u8(&br) & 0xFF;
-       payloadSize += lastByte;
-    } while (lastByte == 0xFF);
-
-    switch (payloadType) {                             // sei_payload
-      //case 1:                                        // pic_timing
-      //     ...
-      //     switch (br_get_bits(&br, 2)) {            // ct_type
-      //       case 0:
-      //            sei->scan = VIDEO_SCAN_PROGRESSIVE;
-      //            break;
-      //       case 1:
-      //            sei->scan = VIDEO_SCAN_INTERLACED;
-      //            break;
-      //       case 2:
-      //            sei->scan = VIDEO_SCAN_UNKNOWN;
-      //            break;
-      //       default:
-      //            sei->scan = VIDEO_SCAN_RESERVED;
-      //            break;
-      //       }
-      //     break;
-
-      case 12:                                         // sub_seq_characteristics
-           br_skip_ue_golomb(&br);                     // sub_seq_layer_num
-           br_skip_ue_golomb(&br);                     // sub_seq_id
-           if (br_get_bit(&br))                        // duration_flag
-              br_skip_bits(&br, 32);                   // sub_seq_duration
-           if (br_get_bit(&br)) {                      // average_rate_flag
-              br_skip_bit(&br);                        // accurate_statistics_flag
-              sei->bitrate = br_get_u16(&br);          // average_bit_rate
-              sei->frame_rate = br_get_u16(&br);       // average_frame_rate
-              //Dprintf("H.264 SEI: -> stream bitrate %.1f, frame rate %.1f", sei->bitrate, sei->frame_rate);
-              }
-           num_referenced_subseqs = br_get_ue_golomb(&br); // num_referenced_subseqs
-           for (i = 0; i < num_referenced_subseqs; ++i) {
-               br_skip_ue_golomb(&br);                 // ref_sub_seq_layer_num
-               br_skip_ue_golomb(&br);                 // ref_sub_seq_id
-               br_get_bit(&br);                        // ref_sub_seq_direction
-               }
-           break;
-
-      default:
-           br_skip_bits(&br, payloadSize);
-           break;
-      }
-
-    // force byte align
-    br_byte_align(&br);
-    }
-
-  return true;
-}
-
-static int h264_nal_unescape(uint8_t *dst, const uint8_t *src, int len)
-{
-  int s = 0, d = 0;
-
-  while (s < len) {
-    if (!src[s] && !src[s + 1]) {
-       // hit 00 00 xx
-       dst[d] = dst[d + 1] = 0;
-       s += 2;
-       d += 2;
-       if (src[s] == 3) {
-          s++; // 00 00 03 xx --> 00 00 xx
-          if (s >= len)
-             return d;
-          }
-       }
-    dst[d++] = src[s++];
-    }
-    
-  return d;
-}
-
-static int h264_get_picture_type(const uint8_t *buf, int len)
-{
-  for (int i = 0; i < (len - 5); ++i) {
-      if (buf[i] == 0 && buf[i + 1] == 0 && buf[i + 2] == 1 && buf[i + 3] == NAL_AUD) {
-         uint8_t type = (buf[i + 4] >> 5);
-         switch (type) {
-           case 0: case 3: case 5: return I_FRAME;
-           case 1: case 4: case 6: return P_FRAME;
-           case 2: case 7:         return B_FRAME;
-           default:;
-           }
-         }
-      }
-  return NO_PICTURE;
-}
-
-bool getH264VideoInfo(uint8_t *buf, int len, video_info_t *info)
-{
-  bool sps_found = false, sei_found = true; // sei currently disabled
-
-  // H.264 detection, search for NAL AUD
-  if (!IS_NAL_AUD(buf))
-     return false;
-
-  // If I-frame, search for NAL SPS
-  if (h264_get_picture_type(buf, len) != I_FRAME)
-     return false;
-
-  info->codec = VIDEO_CODEC_H264;
-
-  // Scan video packet ...
-  for (int i = 5; i < len - 4; i++) {
-      // ... for sequence parameter set
-      if (!sps_found && (buf[i] == 0x00) && (buf[i + 1] == 0x00) && (buf[i + 2] == 0x01) && (buf[i + 3] & 0x1f) == NAL_SPS) {
-         uint8_t nal_data[len];
-         int nal_len;
-         //Dprintf("H.264: Found NAL SPS at offset %d/%d", i, len);
-         if (0 < (nal_len = h264_nal_unescape(nal_data, buf + i + 4, len - i - 4))) {
-            h264_sps_data_t sps = { 0 };
-            if (h264_parse_sps(nal_data, nal_len, &sps)) {
-               info->format = sps.format;
-               info->width = sps.width;
-               info->height = sps.height;
-               info->aspectRatio = sps.aspect_ratio;
-               sps_found = true;
-               }
-            }
-         }
-      // ... for supplemental enhancement information
-      if (!sei_found && (buf[i] == 0x00) && (buf[i + 1] == 0x00) && (buf[i + 2] == 0x01) && (buf[i + 3] & 0x1f) == NAL_SEI) {
-         uint8_t nal_data[len];
-         int nal_len;
-         //Dprintf("H.264: Found NAL SEI at offset %d/%d", i, len);
-         if (0 < (nal_len = h264_nal_unescape(nal_data, buf + i + 4, len - i - 4))) {
-            h264_sei_data_t sei = { 0 };
-            if (h264_parse_sei(nal_data, nal_len, &sei)) {
-               info->frameRate = sei.frame_rate;
-               info->bitrate = sei.bitrate;
-               info->scan = sei.scan;
-               sei_found = true;
-               }
-            }
-         }
-      if (sps_found && sei_found)
-         break;
-      }
-
-  return true;
-}

femonh264.h

@@ -1,15 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMONH264_H
-#define __FEMONH264_H
-
-#include "femonvideo.h"
-
-bool getH264VideoInfo(uint8_t *buf, int len, video_info_t *info);
-
-#endif //__FEMONH264_H

femoni18n.h

@@ -0,0 +1,17 @@
+/*
+ * 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/config.h> // for VDRVERSNUM
+#include <vdr/i18n.h>
+
+extern const tI18nPhrase Phrases[];
+
+#endif // __FEMONI18N_H

femonmpeg.c

@@ -1,184 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#include "femontools.h"
-#include "femonmpeg.h"
-
-#define IS_MPEG_AUDIO(buf)      (((buf)[0] == 0xFF) && ((buf)[1] & 0xF0))
-#define IS_SEQUENCE_HEADER(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == 0xB3))
-
-static unsigned int bitrates[2][3][16] =
-{
-  {
-    {0,  32,  48,  56,  64,  80,  96, 112, 128, 144, 160, 176, 192, 224, 256, -1}, // MPEG-2 Layer I
-    {0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1}, // MPEG-2 Layer II/III
-    {0,   8,  16,  24,  32,  40,  48,  56,  64,  80,  96, 112, 128, 144, 160, -1}  // MPEG-2 Layer II/III
-  },
-  {
-    {0,  32,  64,  96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1}, // MPEG-1 Layer I
-    {0,  32,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, 384, -1}, // MPEG-1 Layer II
-    {0,  32,  40,  48,  56,  64,  80,  96, 112, 128, 160, 192, 224, 256, 320, -1}  // MPEG-1 Layer III
-  }
-};
-
-static unsigned int samplerates[2][4] =
-{
-  {22050, 24000, 16000, -1}, // MPEG-2
-  {44100, 48000, 32000, -1}  // MPEG-1
-};
-
-static eAudioCodec formats[2][4] =
-{
-  {AUDIO_CODEC_MPEG2_I, AUDIO_CODEC_MPEG2_II, AUDIO_CODEC_MPEG2_III, AUDIO_CODEC_UNKNOWN}, // MPEG-2
-  {AUDIO_CODEC_MPEG1_I, AUDIO_CODEC_MPEG1_II, AUDIO_CODEC_MPEG1_III, AUDIO_CODEC_UNKNOWN}  // MPEG-1
-};
-
-bool getMPEGAudioInfo(uint8_t *buf, int len, audio_info_t *info)
-{
-  // MPEG audio detection, search for syncword
-  if ((len < 4) || !IS_MPEG_AUDIO(buf))
-     return false;
-
-  int mpegIndex = (buf[1] & 0x08) >> 3;        // MPEG-2=0, MPEG-1=1
-  int layerIndex = 3 - ((buf[1] & 0x06) >> 1); // I=11, II=10, III=01 
-  int bitrateIndex = (buf[2] & 0xF0) >> 4;
-  int frequency = (buf[2] & 0x0C) >> 2;
-  int channelMode = (buf[3] & 0xC0) >> 6;
-
-  info->codec = formats[mpegIndex][layerIndex];
-
-  switch (channelMode) {
-    case 0:
-         info->channelMode = AUDIO_CHANNEL_MODE_STEREO;
-         break;
-         
-    case 1:
-         info->channelMode = AUDIO_CHANNEL_MODE_JOINT_STEREO;
-         break;
-
-    case 2:
-         info->channelMode = AUDIO_CHANNEL_MODE_DUAL;
-         break;
-
-    case 3:
-         info->channelMode = AUDIO_CHANNEL_MODE_SINGLE;
-         break;
-
-    default:
-         info->channelMode = AUDIO_CHANNEL_MODE_INVALID;
-         break;
-  }
-
-  switch (bitrateIndex) {
-    case 0:
-         info->bitrate = AUDIO_BITRATE_FREE;
-         break;
-         
-    case 0xF:
-         info->bitrate = AUDIO_BITRATE_RESERVED;
-         break;
-
-    default:
-         info->bitrate = 1000 * bitrates[mpegIndex][layerIndex][bitrateIndex];
-         break;
-  }
-  
-  switch (frequency) {
-    case 3:
-         info->samplingFrequency = AUDIO_SAMPLING_FREQUENCY_RESERVED;
-         break;
-
-    default:
-         info->samplingFrequency = samplerates[mpegIndex][frequency];
-         break;
-  }
-
-  return true;
-}
-
-bool getMPEGVideoInfo(uint8_t *buf, int len, video_info_t *info)
-{
-  // MPEG-2 video detection, search for sequence header
-  if ((len < 7) || !IS_SEQUENCE_HEADER(buf))
-     return false;
-
-  // Parse header   
-  uint8_t *data = buf + 4;
-  info->codec = VIDEO_CODEC_MPEG2;
-  info->width = ((data[1] & 0xF0) >> 4) | (data[0] << 4);
-  info->height = ((data[1] & 0x0F) << 8) | (data[2]);
-  switch ((data[3] & 0xF0) >> 4) {
-    case 1:
-      info->aspectRatio = VIDEO_ASPECT_RATIO_1_1;
-      break;
-    case 2:
-      info->aspectRatio = VIDEO_ASPECT_RATIO_4_3;
-      break;
-    case 3:
-      info->aspectRatio = VIDEO_ASPECT_RATIO_16_9;
-      break;
-    case 4:
-      info->aspectRatio = VIDEO_ASPECT_RATIO_2_21_1;
-      break;
-    case 5 ... 15:
-    default:
-      info->aspectRatio = VIDEO_ASPECT_RATIO_RESERVED;
-      break;
-    }
-  // Video scan should be read from progressive_sequence field in sequence extension
-  switch (data[3] & 0x0F) {
-    case 1:
-      info->frameRate   = 24000 / 1001.0;
-      info->scan        = VIDEO_SCAN_PROGRESSIVE;
-      info->format      = VIDEO_FORMAT_UNKNOWN;
-      break;
-    case 2:
-      info->frameRate   = 24.0;
-      info->scan        = VIDEO_SCAN_PROGRESSIVE;
-      info->format      = VIDEO_FORMAT_UNKNOWN;
-      break;
-    case 3:
-      info->frameRate   = 25.0;
-      info->scan        = VIDEO_SCAN_UNKNOWN;  // interlaced or progressive
-      info->format      = VIDEO_FORMAT_PAL;
-      break;
-    case 4:
-      info->frameRate   = 30000 / 1001.0;
-      info->scan        = VIDEO_SCAN_UNKNOWN; // interlaced or progressive
-      info->format      = VIDEO_FORMAT_NTSC;
-      break;
-    case 5:
-      info->frameRate   = 30.0;
-      info->scan        = VIDEO_SCAN_UNKNOWN;  // interlaced or progressive
-      info->format      = VIDEO_FORMAT_NTSC;
-      break;
-    case 6:
-      info->frameRate   = 50.0;
-      info->scan        = VIDEO_SCAN_PROGRESSIVE;
-      info->format      = VIDEO_FORMAT_PAL;
-      break;
-    case 7:
-      info->frameRate   = 60.0;
-      info->scan        = VIDEO_SCAN_PROGRESSIVE;
-      info->format      = VIDEO_FORMAT_NTSC;
-      break;
-    case 8:
-      info->frameRate   = 60000 / 1001.0;
-      info->scan        = VIDEO_SCAN_PROGRESSIVE;
-      info->format      = VIDEO_FORMAT_NTSC;
-      break;
-    case 9 ... 15:
-    default:
-      info->frameRate   = 0;
-      info->scan        = VIDEO_SCAN_UNKNOWN;
-      info->format      = VIDEO_FORMAT_UNKNOWN;
-      break;
-    }
-  info->bitrate = 400.0 * (((data[4] << 10) & 0x0003FC00UL) | ((data[5] << 2) & 0x000003FCUL) | (((data[6] & 0xC0) >> 6) & 0x00000003UL));
-
-  return true;
-}

femonmpeg.h

@@ -1,17 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMONMPEG_H
-#define __FEMONMPEG_H
-
-#include "femonaudio.h"
-#include "femonvideo.h"
-
-bool getMPEGAudioInfo(uint8_t *buf, int len, audio_info_t *info);
-bool getMPEGVideoInfo(uint8_t *buf, int len, video_info_t *info);
-
-#endif //__FEMONMPEG_H

femonosd.h

@@ -3,6 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
+ * $Id$
  */
 
 #ifndef __FEMONOSD_H
@@ -14,64 +15,42 @@
 #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/font.h>
-#include <vdr/tools.h>
-#include "svdrpservice.h"
-
-#define MAX_BM_NUMBER 8
 
 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
-  static cFemonOsd *pInstance;
+  bool m_Active;
-
+  cOsdBase *m_Osd;
-  cOsd             *m_Osd;
+  tWindowHandle m_InfoWindow;
-  cFemonReceiver   *m_Receiver;
+  tWindowHandle m_StatusWindow;
-  int               m_Frontend;
+  cFemonReceiver *m_Receiver;
-  int               m_SvdrpFrontend;
+  int m_Frontend;
-  double            m_SvdrpVideoBitrate;
+  struct dvb_frontend_info m_FrontendInfo;
-  double            m_SvdrpAudioBitrate;
+  int m_Number;
-  SvdrpConnection_v1_0 m_SvdrpConnection;
+  int m_OldNumber;
-  cPlugin          *m_SvdrpPlugin;
+  int m_InputTime;
-  dvb_frontend_info m_FrontendInfo;
+  uint16_t m_SNR;
-  int               m_Number;
+  uint16_t m_Signal;
-  int               m_OldNumber;
+  uint32_t m_BER;
-  uint16_t          m_SNR;
+  uint32_t m_UNC;
-  uint16_t          m_Signal;
+  fe_status_t m_FrontendStatus;
-  uint32_t          m_BER;
+  int m_DisplayMode;
-  uint32_t          m_UNC;
+  eDvbFont m_Font;
-  fe_status_t       m_FrontendStatus;
+  cMutex* m_Mutex;
-  int               m_DisplayMode;
-  const cFont      *m_Font;
-  cTimeMs           m_InputTime;
-  cCondWait         m_Sleep;
-  cMutex            m_Mutex;
-
   void DrawStatusWindow(void);
   void DrawInfoWindow(void);
-  bool SvdrpConnect(void);
-  bool SvdrpTune(void);
 
 protected:
-  cFemonOsd();
-  cFemonOsd(const cFemonOsd&);
-  cFemonOsd& operator= (const cFemonOsd&);
   virtual void Action(void);
   virtual void ChannelSwitch(const cDevice * device, int channelNumber);
-  virtual void SetAudioTrack(int Index, const char * const *Tracks);
 
 public:
-  static cFemonOsd *Instance(bool create = false);
+  cFemonOsd(void);
   ~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

femonreceiver.c

@@ -3,15 +3,11 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
+ * $Id$
  */
 
 #include <unistd.h>
-#include "femontools.h"
 #include "femoncfg.h"
-#include "femonmpeg.h"
-#include "femonaac.h"
-#include "femonac3.h"
-#include "femonh264.h"
 #include "femonreceiver.h"
 
 #define TS_SIZE       188
@@ -20,167 +16,253 @@
 #define PAYLOAD       0x10
 #define PTS_DTS_FLAGS 0xC0
 
-cFemonReceiver::cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[])
+cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid)
-: cReceiver(ChannelID, -1, Vpid, Apid, Dpid, NULL),
+#if VDRVERSNUM >= 10300
-  cThread("femon receiver"),
+:cReceiver(Ca, -1, 3, Vpid, Apid, Dpid), cThread("femon receiver")
-  m_Sleep(),
+#else
-  m_Active(false),
+:cReceiver(Ca, -1, 3, Vpid, Apid, Dpid)
-  m_VideoPid(Vpid),
+#endif
-  m_VideoPacketCount(0),
-  m_VideoBitrate(0.0),
-  m_VideoValid(false),
-  m_VideoInfoBufferIndex(0),
-  m_AudioPid(Apid[0]),
-  m_AudioPacketCount(0),
-  m_AudioBitrate(0.0),
-  m_AudioValid(false),
-  m_AudioInfoBufferIndex(0),
-  m_AC3Pid(Dpid[0]),
-  m_AC3PacketCount(0), 
-  m_AC3Bitrate(0),
-  m_AC3Valid(false),
-  m_AC3InfoBufferIndex(0)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  //printf("cFemonReceiver::cFemonReceiver()\n");
-
+  m_Active = false;
-  m_VideoInfo.codec = VIDEO_CODEC_INVALID;
+  m_VideoPid = Vpid;
-  m_VideoInfo.format = VIDEO_FORMAT_INVALID;
+  m_AudioPid = Apid;
-  m_VideoInfo.scan = VIDEO_SCAN_INVALID;
+  m_AC3Pid = Dpid;      
-  m_VideoInfo.aspectRatio = VIDEO_ASPECT_RATIO_INVALID;
+  m_VideoValid = false;
-  m_VideoInfo.width = 0;
+  m_VideoPacketCount = 0;
-  m_VideoInfo.height = 0;
+  m_VideoHorizontalSize = 0;
-  m_VideoInfo.frameRate = 0;
+  m_VideoVerticalSize = 0;
-  m_VideoInfo.bitrate = AUDIO_BITRATE_INVALID;
+  m_VideoAspectRatio = AR_RESERVED;
-  for (unsigned int i = 0; i < ELEMENTS(m_VideoInfoBuffer); ++i)
+  m_VideoFormat = VF_UNKNOWN;
-      memcpy(&m_VideoInfoBuffer[i], &m_VideoInfo, sizeof(video_info_t));
+  m_VideoFrameRate = 0.0;
-
+  m_VideoStreamBitrate = 0.0;
-  m_AudioInfo.codec = AUDIO_CODEC_UNKNOWN;
+  m_VideoBitrate = 0.0;
-  m_AudioInfo.bitrate = AUDIO_BITRATE_INVALID;
+  m_AudioValid = false;
-  m_AudioInfo.samplingFrequency = AUDIO_SAMPLING_FREQUENCY_INVALID;
+  m_AudioPacketCount = 0;
-  m_AudioInfo.channelMode = AUDIO_CHANNEL_MODE_INVALID;
+  m_AudioStreamBitrate = -2.0;
-  for (unsigned int i = 0; i < ELEMENTS(m_AudioInfoBuffer); ++i)
+  m_AudioBitrate = 0.0;
-      memcpy(&m_AudioInfoBuffer[i], &m_AudioInfo, sizeof(audio_info_t));
+  m_AudioSamplingFreq = -1;
-
+  m_AudioMPEGLayer = 0;
-  m_AC3Info.bitrate = AUDIO_BITRATE_INVALID;
+  m_AudioBitrate = 0.0;
-  m_AC3Info.samplingFrequency = AUDIO_SAMPLING_FREQUENCY_INVALID;
+  m_AC3Valid = false;
-  m_AC3Info.bitstreamMode = AUDIO_BITSTREAM_MODE_INVALID;
+  m_AC3PacketCount = 0; 
-  m_AC3Info.audioCodingMode = AUDIO_CODING_MODE_INVALID;
+  m_AC3StreamBitrate = 0;
-  m_AC3Info.dolbySurroundMode = AUDIO_DOLBY_SURROUND_MODE_INVALID;
+  m_AC3SamplingFreq = 0;
-  m_AC3Info.centerMixLevel = AUDIO_CENTER_MIX_LEVEL_INVALID;
+  m_AC3Bitrate = 0;
-  m_AC3Info.surroundMixLevel = AUDIO_SURROUND_MIX_LEVEL_INVALID;
+  m_AC3FrameSize = 0;
-  m_AC3Info.dialogLevel = 0;
+  m_AC3BitStreamMode = FR_NOTVALID;
-  m_AC3Info.lfe = false;
+  m_AC3AudioCodingMode = FR_NOTVALID;
-  for (unsigned int i = 0; i < ELEMENTS(m_AC3InfoBuffer); ++i)
+  m_AC3CenterMixLevel = FR_NOTVALID;
-      memcpy(&m_AC3InfoBuffer[i], &m_AC3Info, sizeof(ac3_info_t));
+  m_AC3SurroundMixLevel = FR_NOTVALID;
+  m_AC3DolbySurroundMode = FR_NOTVALID;
+  m_AC3LfeOn = false;
+  m_AC3DialogLevel = FR_NOTVALID;
 }
-
+ 
 cFemonReceiver::~cFemonReceiver(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  //printf("cFemonReceiver::~cFemonReceiver()\n");
-  Deactivate();
-}
-
-void cFemonReceiver::Deactivate(void)
-{
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
   if (m_Active) {
      m_Active = false;
-     m_Sleep.Signal();
+     Cancel(0);
-     if (Running())
-        Cancel(3);
-     Detach();
      }
 }
 
-void cFemonReceiver::GetVideoInfo(uint8_t *buf, int len)
+/* The following function originates from libdvbmpeg: */
+void cFemonReceiver::GetVideoInfo(uint8_t *mbuf, int count)
 {
+  //printf("cFemonReceiver::GetVideoInfo()\n");
+  uint8_t *headr;
+  int found = 0;
   int c = 0;
-
+  m_VideoValid = false;
-  while (c < len) {
+  while ((found < 4) && ((c + 4) < count)) {
-    video_info_t tmp;
+    uint8_t *b;
-    uint8_t *b = buf + c;
+    b = mbuf + c;
-    if (getMPEGVideoInfo(b, len - c, &tmp) || getH264VideoInfo(b, len - c, &tmp)) {
+    if ((b[0] == 0x00) && (b[1] == 0x00) && (b[2] == 0x01) && (b[3] == 0xb3))
-       bool coherent = true;
+       found = 4;
-       memcpy(&m_VideoInfoBuffer[m_VideoInfoBufferIndex], &tmp, sizeof(video_info_t));
+    else
-       m_VideoInfoBufferIndex = (m_VideoInfoBufferIndex + 1) % ELEMENTS(m_VideoInfoBuffer);
+       c++;
-       for (unsigned int i = 1; i < ELEMENTS(m_VideoInfoBuffer); ++i) {
-           if (memcmp(&m_VideoInfoBuffer[0], &m_VideoInfoBuffer[i], sizeof(video_info_t)))
-              coherent = false;
-              break;
-           }
-       if (!m_VideoValid || coherent) {
-          m_VideoValid = true;
-          memcpy(&m_VideoInfo, &m_VideoInfoBuffer[0], sizeof(video_info_t));
-          }
-       return;
-       }
-    c++;
     }
+  if ((!found) || ((c + 16) >= count)) return;
+  m_VideoValid = true;
+  headr = mbuf + c + 4;
+  m_VideoHorizontalSize = ((headr[1] & 0xF0) >> 4) | (headr[0] << 4);
+  m_VideoVerticalSize = ((headr[1] & 0x0F) << 8) | (headr[2]);
+  int sw = (int)((headr[3] & 0xF0) >> 4);
+  switch ( sw ){
+    case 1:
+      m_VideoAspectRatio = AR_1_1;
+      break;
+    case 2:
+      m_VideoAspectRatio = AR_4_3;
+      break;
+    case 3:
+      m_VideoAspectRatio = AR_16_9;
+      break;
+    case 4:
+      m_VideoAspectRatio = AR_2_21_1;
+      break;
+    case 5 ... 15:
+    default:
+      m_VideoAspectRatio = AR_RESERVED;
+      break;
+    }
+  sw = (int)(headr[3] & 0x0F);
+  switch ( sw ) {
+    case 1:
+      m_VideoFrameRate = 24000 / 1001.0;
+      m_VideoFormat = VF_UNKNOWN;
+      break;
+    case 2:
+      m_VideoFrameRate = 24.0;
+      m_VideoFormat = VF_UNKNOWN;
+      break;
+    case 3:
+      m_VideoFrameRate = 25.0;
+      m_VideoFormat = VF_PAL;
+      break;
+    case 4:
+      m_VideoFrameRate = 30000 / 1001.0;
+      m_VideoFormat = VF_NTSC;
+      break;
+    case 5:
+      m_VideoFrameRate = 30.0;
+      m_VideoFormat = VF_NTSC;
+      break;
+    case 6:
+      m_VideoFrameRate = 50.0;
+      m_VideoFormat = VF_PAL;
+      break;
+    case 7:
+      m_VideoFrameRate = 60.0;
+      m_VideoFormat = VF_NTSC;
+      break;
+    case 8:
+      m_VideoFrameRate = 60000 / 1001.0;
+      m_VideoFormat = VF_NTSC;
+      break;
+    case 9 ... 15:
+    default:
+      m_VideoFrameRate = 0;
+      m_VideoFormat = VF_UNKNOWN;
+      break;
+    }
+  m_VideoStreamBitrate = 400 * (((headr[4] << 10) & 0x0003FC00UL) | ((headr[5] << 2) & 0x000003FCUL) | (((headr[6] & 0xC0) >> 6) & 0x00000003UL)) / 1000000.0;
 }
 
-void cFemonReceiver::GetAudioInfo(uint8_t *buf, int len)
+static unsigned int bitrates[3][16] =
 {
-  int c = 0;
+  {0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0},
+  {0, 32, 48, 56, 64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 0},
+  {0, 32, 40, 48, 56,  64,  80,  96,  112, 128, 160, 192, 224, 256, 320, 0}
+};
 
-  while (c < len) {
+static unsigned int samplerates[4] =
-    audio_info_t tmp;
+{441, 480, 320, 0};
-    uint8_t *b = buf + c;
+
-    if (getAACAudioInfo(b, len - c, &tmp) || getMPEGAudioInfo(b, len - c, &tmp)) {
+/* The following function originates from libdvbmpeg: */
-       bool coherent = true;
+void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count)
-       memcpy(&m_AudioInfoBuffer[m_AudioInfoBufferIndex], &tmp, sizeof(audio_info_t));
+{
-       m_AudioInfoBufferIndex = (m_AudioInfoBufferIndex + 1) % ELEMENTS(m_AudioInfoBuffer);
+  //printf("cFemonReceiver::GetAudioInfo()\n");
-       for (unsigned int i = 1; i < ELEMENTS(m_AudioInfoBuffer); ++i) {
+  uint8_t *headr;
-           if (memcmp(&m_AudioInfoBuffer[0], &m_AudioInfoBuffer[i], sizeof(audio_info_t)))
+  int found = 0;
-              coherent = false;
+  int c = 0;
-              break;
+  int tmp = 0;
-           }
+  m_AudioValid = false;
-       if (!m_AudioValid || coherent) {
+  while (!found && (c < count)) {
-          m_AudioValid = true;
+    uint8_t *b = mbuf + c;
-          memcpy(&m_AudioInfo, &m_AudioInfoBuffer[0], sizeof(audio_info_t));
+    if ((b[0] == 0xff) && ((b[1] & 0xf8) == 0xf8))
-          }
+       found = 1;
-       return;
+    else
-       }
+       c++;
-    c++;
     }	
+  if ((!found) || ((c + 3) >= count)) return;
+  m_AudioValid = true;
+  headr = mbuf + c;
+  m_AudioMPEGLayer = 4 - ((headr[1] & 0x06) >> 1);
+  tmp = bitrates[(3 - ((headr[1] & 0x06) >> 1))][(headr[2] >> 4)] * 1000;
+  if (tmp == 0)
+     m_AudioStreamBitrate = (double)FR_FREE;
+  else if (tmp == 0xf)
+     m_AudioStreamBitrate = (double)FR_RESERVED;
+  else
+     m_AudioStreamBitrate = tmp / 1000.0;
+  tmp = samplerates[((headr[2] & 0x0c) >> 2)] * 100;
+  if (tmp == 3)
+     m_AudioSamplingFreq = FR_RESERVED;
+  else
+     m_AudioSamplingFreq = tmp;
 }
 
-void cFemonReceiver::GetAC3Info(uint8_t *buf, int len)
+static unsigned int ac3_bitrates[32] =
-{
+{32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  int c = 0;
 
-  while (c < len) {
+static unsigned int ac3_freq[4] =
-    ac3_info_t tmp;
+{480, 441, 320, 0};
-    uint8_t *b = buf + c;
+
-    if (getAC3AudioInfo(b, len - c, &tmp)) {
+static unsigned int ac3_frames[3][32] =
-       bool coherent = true;
+{
-       memcpy(&m_AC3InfoBuffer[m_AC3InfoBufferIndex], &tmp, sizeof(ac3_info_t));
+  {64, 80,  96,  112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 640, 768,  896,  1024, 1152, 1280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-       m_AC3InfoBufferIndex = (m_AC3InfoBufferIndex + 1) % ELEMENTS(m_AC3InfoBuffer);
+  {69, 87,  104, 121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835,  975,  1114, 1253, 1393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-       for (unsigned int i = 1; i < ELEMENTS(m_AC3InfoBuffer); ++i) {
+  {96, 120, 144, 168, 192, 240, 288, 336, 384, 480, 576, 672, 768, 960, 1152, 1344, 1536, 1728, 1920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-           if (memcmp(&m_AC3InfoBuffer[0], &m_AC3InfoBuffer[i], sizeof(ac3_info_t)))
+};
-              coherent = false;
+
-              break;
+/*
-           }
+** AC3 Audio Header: http://www.atsc.org/standards/a_52a.pdf
-       if (!m_AC3Valid || coherent) {
+** The following function originates from libdvbmpeg:
-          m_AC3Valid = true;
+*/
-          memcpy(&m_AC3Info, &m_AC3InfoBuffer[0], sizeof(ac3_info_t));
+void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count)
-          }   
+{
-       return;
+  uint8_t *headr;
-       }
+  int found = 0;
-    c++;
+  int c = 0;
+  uint8_t frame;
+  m_AC3Valid = false;
+  while (!found && (c < count)) {
+    uint8_t *b = mbuf + c;
+    if ((b[0] == 0x0b) && (b[1] == 0x77))
+       found = 1;
+    else
+       c++;
     }
+  if ((!found) || ((c + 5) >= count)) return;
+  m_AC3Valid = true;
+  headr = mbuf + c + 2;
+  frame = (headr[2] & 0x3f);
+  m_AC3StreamBitrate = ac3_bitrates[frame >> 1];
+  int fr = (headr[2] & 0xc0 ) >> 6;
+  m_AC3SamplingFreq = ac3_freq[fr] * 100;
+  m_AC3FrameSize = ac3_frames[fr][frame >> 1];
+  if ((frame & 1) && (fr == 1)) m_AC3FrameSize++;
+     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
+     m_AC3CenterMixLevel = (headr[4] & 0x18) >> 3;
+  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;
 }
 
 void cFemonReceiver::Activate(bool On)
 {
-  Dprintf("%s(%d)\n", __PRETTY_FUNCTION__, On);
+  //printf("cFemonReceiver::Activate()\n");
-  if (On)
+  Start();
-     Start();
-  else
-     Deactivate();
 }
 
 void cFemonReceiver::Receive(uchar *Data, int Length)
 {
+  //printf("cFemonReceiver::Receive()\n");
   // TS packet length: TS_SIZE
   if (Length == TS_SIZE) {
      int pid = ((Data[1] & 0x1f) << 8) | (Data[2]);
@@ -223,18 +305,22 @@ void cFemonReceiver::Receive(uchar *Data, int Length)
 
 void cFemonReceiver::Action(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  //printf("cFemonReceiver::Action()\n");
-  cTimeMs t;
+#if (VDRVERSNUM < 10300)
+  isyslog("femon receiver: thread started (pid = %d)", getpid());
+#endif
   m_Active = true;
-  while (Running() && m_Active) {
+  while (m_Active) {
-        t.Set(0);
         // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
-        m_VideoBitrate = (10.0 * 8.0 * 184.0 * m_VideoPacketCount) / femonConfig.calcinterval;
+        m_VideoBitrate = (8.0 * 184.0 * m_VideoPacketCount) / (femonConfig.calcinterval * 100000.0);
         m_VideoPacketCount = 0;
-        m_AudioBitrate = (10.0 * 8.0 * 184.0 * m_AudioPacketCount) / femonConfig.calcinterval;
+        m_AudioBitrate = (8.0 * 184.0 * m_AudioPacketCount) / (femonConfig.calcinterval * 100.0);
         m_AudioPacketCount = 0;
-        m_AC3Bitrate   = (10.0 * 8.0 * 184.0 * m_AC3PacketCount)   / femonConfig.calcinterval;
+        m_AC3Bitrate   = (8.0 * 184.0 * m_AC3PacketCount)   / (femonConfig.calcinterval * 100.0);
         m_AC3PacketCount = 0;
-        m_Sleep.Wait(max((int)(100 * femonConfig.calcinterval - t.Elapsed()), 3));
+        usleep(100000L * femonConfig.calcinterval);
     }
+#if (VDRVERSNUM < 10300)
+  isyslog("femon receiver: thread stopped (pid = %d)", getpid());
+#endif
 }

femonreceiver.h

@@ -3,6 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
+ * $Id$
  */
 
 #ifndef __FEMONRECEIVER_H
@@ -11,41 +12,82 @@
 #include <vdr/thread.h>
 #include <vdr/receiver.h>
 
-#include "femonaudio.h"
+enum eVideoFormat {
-#include "femonvideo.h"
+  VF_UNKNOWN = 0,
+  VF_PAL     = 1,
+  VF_NTSC    = 2,
+  };
+
+enum eAspectRatio {
+  AR_RESERVED = 0,
+  AR_1_1      = 100,
+  AR_4_3      = 133,
+  AR_16_9     = 177,
+  AR_2_21_1   = 233,
+  };
+
+enum eCenterMixLevel {
+  CML_MINUS_3dB   = 0,
+  CML_MINUS_4_5dB = 1,
+  CML_MINUS_6dB   = 2,
+  CML_RESERVED    = 3,
+  };
+
+enum eSurroundMixLevel {
+  SML_MINUS_3dB = 0,
+  SML_MINUS_6dB = 1,
+  SML_0_dB      = 2,
+  SML_RESERVED  = 3,
+  };
+
+enum eDolbySurroundMode {
+  DSM_NOT_INDICATED     = 0,
+  DSM_NOT_DOLBYSURROUND = 1,
+  DSM_DOLBYSURROUND     = 2,
+  DSM_RESERVED          = 3,
+  };
+
+#define FR_RESERVED    -1
+#define FR_FREE        -2
+#define FR_NOTVALID    -3
 
 class cFemonReceiver : public cReceiver, public cThread {
 private:
-  cCondWait     m_Sleep;
+  bool   m_Active;
-  bool          m_Active;
+  int    m_VideoPid;
-
+  int    m_AudioPid;
-  int           m_VideoPid;
+  int    m_AC3Pid;
-  int           m_VideoPacketCount;
+  bool   m_VideoValid;
-  double        m_VideoBitrate;
+  int    m_VideoPacketCount;
-  bool          m_VideoValid;
+  int    m_VideoHorizontalSize;
-  video_info_t  m_VideoInfo;
+  int    m_VideoVerticalSize;
-  video_info_t  m_VideoInfoBuffer[3];
+  int    m_VideoAspectRatio;
-  unsigned int  m_VideoInfoBufferIndex;
+  int    m_VideoFormat;
-
+  double m_VideoFrameRate;
-  int           m_AudioPid;
+  double m_VideoStreamBitrate;
-  int           m_AudioPacketCount;
+  double m_VideoBitrate;
-  double        m_AudioBitrate;
+  bool   m_AudioValid;
-  bool          m_AudioValid;
+  int    m_AudioPacketCount;
-  audio_info_t  m_AudioInfo;
+  double m_AudioStreamBitrate;
-  audio_info_t  m_AudioInfoBuffer[3];
+  double m_AudioBitrate;
-  unsigned int  m_AudioInfoBufferIndex;
+  int    m_AudioSamplingFreq;
-
+  int    m_AudioMPEGLayer;
-  int           m_AC3Pid;
+  bool   m_AC3Valid;
-  int           m_AC3PacketCount;
+  int    m_AC3PacketCount;
-  double        m_AC3Bitrate;
+  double m_AC3Bitrate;
-  bool          m_AC3Valid;
+  int    m_AC3FrameSize;
-  ac3_info_t    m_AC3Info;
+  int    m_AC3SamplingFreq;
-  ac3_info_t    m_AC3InfoBuffer[3];
+  int    m_AC3StreamBitrate;
-  unsigned int  m_AC3InfoBufferIndex;
+  int    m_AC3BitStreamMode;
-
+  int    m_AC3AudioCodingMode;
-  void          GetVideoInfo(uint8_t *buf, int len);
+  int    m_AC3CenterMixLevel;
-  void          GetAudioInfo(uint8_t *buf, int len);
+  int    m_AC3SurroundMixLevel;
-  void          GetAC3Info(uint8_t *buf, int len);
+  int    m_AC3DolbySurroundMode;
+  bool   m_AC3LfeOn;
+  int    m_AC3DialogLevel;  
+  void   GetVideoInfo(uint8_t *mbuf, int count);
+  void   GetAudioInfo(uint8_t *mbuf, int count);
+  void   GetAC3Info(uint8_t *mbuf, int count);
 
 protected:
   virtual void Activate(bool On);
@@ -53,41 +95,38 @@ protected:
   virtual void Action(void);
 
 public:
-  cFemonReceiver(tChannelID ChannelID, int Ca, int Vpid, int Apid[], int Dpid[]);
+  cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid);
   virtual ~cFemonReceiver();
-  void Deactivate(void);
 
-  bool   VideoValid(void)           { return m_VideoValid; };                  // boolean
+  bool VideoValid(void)           { return m_VideoValid; };          // boolean
-  double VideoBitrate(void)         { return m_VideoBitrate; };                // bit/s
+  int VideoHorizontalSize(void)   { return m_VideoHorizontalSize; }; // pixels
-  int    VideoCodec(void)           { return m_VideoInfo.codec; };             // eVideoCodec
+  int VideoVerticalSize(void)     { return m_VideoVerticalSize; };   // pixels
-  int    VideoFormat(void)          { return m_VideoInfo.format; };            // eVideoFormat
+  int VideoAspectRatio(void)      { return m_VideoAspectRatio; };    // eAspectRatio
-  int    VideoScan(void)            { return m_VideoInfo.scan; };              // eVideoScan
+  int VideoFormat(void)           { return m_VideoFormat; };         // eVideoFormat
-  int    VideoAspectRatio(void)     { return m_VideoInfo.aspectRatio; };       // eVideoAspectRatio
+  double VideoFrameRate(void)     { return m_VideoFrameRate; };      // Hz
-  int    VideoHorizontalSize(void)  { return m_VideoInfo.width; };             // pixels
+  double VideoStreamBitrate(void) { return m_VideoStreamBitrate; };  // Mbit/s
-  int    VideoVerticalSize(void)    { return m_VideoInfo.height; };            // pixels
+  double VideoBitrate(void)       { return m_VideoBitrate; };        // Mbit/s
-  double VideoFrameRate(void)       { return m_VideoInfo.frameRate; };         // Hz
-  double VideoStreamBitrate(void)   { return m_VideoInfo.bitrate; };           // bit/s
 
-  bool   AudioValid(void)           { return m_AudioValid; };                  // boolean
+  bool AudioValid(void)           { return m_AudioValid; };          // boolean
-  double AudioBitrate(void)         { return m_AudioBitrate; };                // bit/s
+  int AudioMPEGLayer(void)        { return m_AudioMPEGLayer; };      // layer number
-  int    AudioCodec(void)           { return m_AudioInfo.codec; };             // eAudioCodec
+  int AudioSamplingFreq(void)     { return m_AudioSamplingFreq; };   // Hz
-  int    AudioChannelMode(void)     { return m_AudioInfo.channelMode; };       // eAudioChannelMode
+  double AudioStreamBitrate(void) { return m_AudioStreamBitrate; };  // kbit/s
-  double AudioStreamBitrate(void)   { return m_AudioInfo.bitrate; };           // bit/s or eAudioBitrate
+  double AudioBitrate(void)       { return m_AudioBitrate; };        // kbit/s
-  int    AudioSamplingFreq(void)    { return m_AudioInfo.samplingFrequency; }; // Hz or eAudioSamplingFrequency
 
-  bool   AC3Valid(void)             { return m_AC3Valid; };                    // boolean
+  bool AC3Valid(void)             { return m_AC3Valid; };                // boolean
-  double AC3Bitrate(void)           { return m_AC3Bitrate; };                  // bit/s
+  int AC3SamplingFreq(void)       { return m_AC3SamplingFreq; };         // Hz
-  double AC3StreamBitrate(void)     { return m_AC3Info.bitrate; };             // bit/s or eAudioBitrate
+  double AC3StreamBitrate(void)   { return m_AC3StreamBitrate; };        // kbit/s
-  int    AC3SamplingFreq(void)      { return m_AC3Info.samplingFrequency; };   // Hz or eAudioSamplingFrequency
+  double AC3Bitrate(void)         { return m_AC3Bitrate; };              // kbit/s
-  int    AC3BitStreamMode(void)     { return m_AC3Info.bitstreamMode; };       // 0..7 or eAudioBitstreamMode
+  int AC3FrameSize(void)          { return m_AC3FrameSize; };            // Bytes
-  int    AC3AudioCodingMode(void)   { return m_AC3Info.audioCodingMode; };     // 0..7 or eAudioCodingMode
+  int AC3BitStreamMode(void)      { return m_AC3BitStreamMode; };        // 0..7
-  bool   AC3_2_0(void)              { return m_AC3Info.audioCodingMode == AUDIO_CODING_MODE_2_0; }; // boolean
+  int AC3AudioCodingMode(void)    { return m_AC3AudioCodingMode; };      // 0..7
-  bool   AC3_5_1(void)	            { return m_AC3Info.audioCodingMode == AUDIO_CODING_MODE_3_2; }; // boolean
+  bool AC3_2_0(void)		  { return m_AC3AudioCodingMode == 2; }; // DD 2.0
-  int    AC3DolbySurroundMode(void) { return m_AC3Info.dolbySurroundMode; };   // eAudioDolbySurroundMode
+  bool AC3_5_1(void)	          { return m_AC3AudioCodingMode == 7; }; // DD 5.1
-  int    AC3CenterMixLevel(void)    { return m_AC3Info.centerMixLevel; };      // eAudioCenterMixLevel
+  int AC3CenterMixLevel(void)     { return m_AC3CenterMixLevel; };       // eCenterMixLevel
-  int    AC3SurroundMixLevel(void)  { return m_AC3Info.surroundMixLevel; };    // eAudioSurroundMixLevel
+  int AC3SurroundMixLevel(void)   { return m_AC3SurroundMixLevel; };     // eSurroundMixLevel
-  int    AC3DialogLevel(void)       { return m_AC3Info.dialogLevel; };         // -dB
+  int AC3DolbySurroundMode(void)  { return m_AC3DolbySurroundMode; };    // eDolbySurroundMode
-  bool   AC3Lfe(void)               { return m_AC3Info.lfe; };                 // boolean
+  bool AC3LfeOn(void)             { return m_AC3LfeOn; };                // boolean
+  int AC3DialogLevel(void)        { return m_AC3DialogLevel; };          // -dB
   };
 
 #endif //__FEMONRECEIVER_H

femonservice.h

@@ -1,26 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMONSERVICE_H
-#define __FEMONSERVICE_H
-
-#include <linux/dvb/frontend.h>
-
-struct FemonService_v1_0 {
-  cString fe_name;
-  cString fe_status;
-  uint16_t fe_snr;
-  uint16_t fe_signal;
-  uint32_t fe_ber;
-  uint32_t fe_unc;
-  double video_bitrate;
-  double audio_bitrate;
-  double dolby_bitrate;
-  };
-
-#endif //__FEMONSERVICE_H
-

femonsymbol.c

@@ -1,73 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#include "femonsymbol.h"
-
-#include "symbols/stereo.xpm"
-#include "symbols/monoleft.xpm"
-#include "symbols/monoright.xpm"
-#include "symbols/dolbydigital.xpm"
-#include "symbols/dolbydigital20.xpm"
-#include "symbols/dolbydigital51.xpm"
-#include "symbols/mpeg2.xpm"
-#include "symbols/h264.xpm"
-#include "symbols/ntsc.xpm"
-#include "symbols/pal.xpm"
-#include "symbols/encrypted.xpm"
-#include "symbols/svdrp.xpm"
-#include "symbols/lock.xpm"
-#include "symbols/signal.xpm"
-#include "symbols/carrier.xpm"
-#include "symbols/viterbi.xpm"
-#include "symbols/sync.xpm"
-#include "symbols/ar11.xpm"
-#include "symbols/ar169.xpm"
-#include "symbols/ar2211.xpm"
-#include "symbols/ar43.xpm"
-#include "symbols/device.xpm"
-#include "symbols/zero.xpm"
-#include "symbols/one.xpm"
-#include "symbols/two.xpm"
-#include "symbols/three.xpm"
-#include "symbols/four.xpm"
-#include "symbols/five.xpm"
-#include "symbols/six.xpm"
-#include "symbols/seven.xpm"
-
-cBitmap bmSymbol[SYMBOL_MAX_COUNT] =
-{
-  cBitmap(stereo_xpm),         // SYMBOL_STEREO
-  cBitmap(monoleft_xpm),       // SYMBOL_MONO_LEFT
-  cBitmap(monoright_xpm),      // SYMBOL_MONO_RIGHT
-  cBitmap(dolbydigital_xpm),   // SYMBOL_DD
-  cBitmap(dolbydigital20_xpm), // SYMBOL_DD20
-  cBitmap(dolbydigital51_xpm), // SYMBOL_DD51
-  cBitmap(mpeg2_xpm),          // SYMBOL_MPEG2
-  cBitmap(h264_xpm),           // SYMBOL_H264
-  cBitmap(pal_xpm),            // SYMBOL_PAL
-  cBitmap(ntsc_xpm),           // SYMBOL_NTSC
-  cBitmap(encrypted_xpm),      // SYMBOL_ENCRYPTED
-  cBitmap(svdrp_xpm),          // SYMBOL_SVDRP
-  cBitmap(lock_xpm),           // SYMBOL_LOCK
-  cBitmap(signal_xpm),         // SYMBOL_SIGNAL
-  cBitmap(carrier_xpm),        // SYMBOL_CARRIER
-  cBitmap(viterbi_xpm),        // SYMBOL_VITERBI
-  cBitmap(sync_xpm),           // SYMBOL_SYNC
-  cBitmap(ar11_xpm),           // SYMBOL_AR_1_1
-  cBitmap(ar169_xpm),          // SYMBOL_AR_16_9
-  cBitmap(ar2211_xpm),         // SYMBOL_AR_2_21_1
-  cBitmap(ar43_xpm),           // SYMBOL_AR_4_3
-  cBitmap(device_xpm),         // SYMBOL_DEVICE
-  cBitmap(zero_xpm),           // SYMBOL_ZERO
-  cBitmap(one_xpm),            // SYMBOL_ONE
-  cBitmap(two_xpm),            // SYMBOL_TWO
-  cBitmap(three_xpm),          // SYMBOL_THREE
-  cBitmap(four_xpm),           // SYMBOL_FOUR
-  cBitmap(five_xpm),           // SYMBOL_FIVE
-  cBitmap(six_xpm),            // SYMBOL_SIX
-  cBitmap(seven_xpm)           // SYMBOL_SEVEN
-};

femonsymbol.h

@@ -1,49 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMONSYMBOL_H
-#define __FEMONSYMBOL_H
-
-#include <vdr/osd.h>
-
-enum eSymbols {
-  SYMBOL_STEREO,
-  SYMBOL_MONO_LEFT,
-  SYMBOL_MONO_RIGHT,
-  SYMBOL_DD,
-  SYMBOL_DD20,
-  SYMBOL_DD51,
-  SYMBOL_MPEG2,
-  SYMBOL_H264,
-  SYMBOL_PAL,
-  SYMBOL_NTSC,
-  SYMBOL_ENCRYPTED,
-  SYMBOL_SVDRP,
-  SYMBOL_LOCK,
-  SYMBOL_SIGNAL,
-  SYMBOL_CARRIER,
-  SYMBOL_VITERBI,
-  SYMBOL_SYNC,
-  SYMBOL_AR_1_1,
-  SYMBOL_AR_16_9,
-  SYMBOL_AR_2_21_1,
-  SYMBOL_AR_4_3,
-  SYMBOL_DEVICE,
-  SYMBOL_ZERO,
-  SYMBOL_ONE,
-  SYMBOL_TWO,
-  SYMBOL_THREE,
-  SYMBOL_FOUR,
-  SYMBOL_FIVE,
-  SYMBOL_SIX,
-  SYMBOL_SEVEN,
-  SYMBOL_MAX_COUNT
-  };
-
-extern cBitmap bmSymbol[SYMBOL_MAX_COUNT];
-
-#endif // __FEMONSYMBOL_H

femontools.c

@@ -1,545 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <linux/dvb/frontend.h>
-#include "femonreceiver.h"
-#include "femonosd.h"
-#include "femontools.h"
-
-static cString getCA(int value)
-{
-  // http://www.dvb.org/index.php?id=174
-  // http://en.wikipedia.org/wiki/Conditional_access_system
-  switch (value) {
-    case 0x0000:            return cString::sprintf("%s (%X)", trVDR("Free To Air"), value);  // Reserved
-    case 0x0001 ... 0x009F:
-    case 0x00A2 ... 0x00FF: return cString::sprintf("%s (%X)", tr("Fixed"),          value); // Standardized systems
-    case 0x00A0 ... 0x00A1: return cString::sprintf("%s (%X)", tr("Analog"),         value); // Analog signals
-    case 0x0100 ... 0x01FF: return cString::sprintf("%s (%X)", "SECA Mediaguard",    value); // Canal Plus
-    case 0x0464:            return cString::sprintf("%s (%X)", "EuroDec",            value); // EuroDec
-    case 0x0500 ... 0x05FF: return cString::sprintf("%s (%X)", "Viaccess",           value); // France Telecom
-    case 0x0600 ... 0x06FF: return cString::sprintf("%s (%X)", "Irdeto",             value); // Irdeto
-    case 0x0900 ... 0x09FF: return cString::sprintf("%s (%X)", "NDS Videoguard",     value); // News Datacom
-    case 0x0B00 ... 0x0BFF: return cString::sprintf("%s (%X)", "Conax",              value); // Norwegian Telekom
-    case 0x0D00 ... 0x0DFF: return cString::sprintf("%s (%X)", "CryptoWorks",        value); // Philips
-    case 0x0E00 ... 0x0EFF: return cString::sprintf("%s (%X)", "PowerVu",            value); // Scientific Atlanta
-    case 0x1000:            return cString::sprintf("%s (%X)", "RAS",                value); // Tandberg Television
-    case 0x1200 ... 0x12FF: return cString::sprintf("%s (%X)", "NagraVision",        value); // BellVu Express
-    case 0x1700 ... 0x17FF: return cString::sprintf("%s (%X)", "BetaCrypt",          value); // BetaTechnik
-    case 0x1800 ... 0x18FF: return cString::sprintf("%s (%X)", "NagraVision",        value); // Kudelski SA
-    case 0x22F0:            return cString::sprintf("%s (%X)", "Codicrypt",          value); // Scopus Network Technologies
-    case 0x2600:            return cString::sprintf("%s (%X)", "BISS",               value); // European Broadcasting Union
-    case 0x4347:            return cString::sprintf("%s (%X)", "CryptOn",            value); // CryptOn
-    case 0x4800:            return cString::sprintf("%s (%X)", "Accessgate",         value); // Telemann
-    case 0x4900:            return cString::sprintf("%s (%X)", "China Crypt",        value); // CryptoWorks
-    case 0x4A10:            return cString::sprintf("%s (%X)", "EasyCas",            value); // EasyCas
-    case 0x4A20:            return cString::sprintf("%s (%X)", "AlphaCrypt",         value); // AlphaCrypt
-    case 0x4A70:            return cString::sprintf("%s (%X)", "DreamCrypt",         value); // Dream Multimedia
-    case 0x4A60:            return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
-    case 0x4A61:            return cString::sprintf("%s (%X)", "Neotioncrypt",       value); // Neotion
-    case 0x4A62:            return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
-    case 0x4A63:            return cString::sprintf("%s (%X)", "Neotion SHL",        value); // Neotion
-    case 0x4A64 ... 0x4A6F: return cString::sprintf("%s (%X)", "SkyCrypt",           value); // @Sky
-    case 0x4A80:            return cString::sprintf("%s (%X)", "ThalesCrypt",        value); // TPS
-    case 0x4AA1:            return cString::sprintf("%s (%X)", "KeyFly",             value); // SIDSA
-    case 0x4ABF:            return cString::sprintf("%s (%X)", "DG-Crypt",           value); // Beijing Compunicate Technology Inc.
-    case 0x4AD0 ... 0x4AD1: return cString::sprintf("%s (%X)", "X-Crypt",            value); // XCrypt Inc.
-    case 0x4AD4:            return cString::sprintf("%s (%X)", "OmniCrypt",          value); // Widevine Technologies, Inc.
-    case 0x4AE0:            return cString::sprintf("%s (%X)", "RossCrypt",          value); // Digi Raum Electronics Co. Ltd.
-    case 0x5500:            return cString::sprintf("%s (%X)", "Z-Crypt",            value); // Digi Raum Electronics Co. Ltd.
-    case 0x5501:            return cString::sprintf("%s (%X)", "Griffin",            value); // Griffin
-    }
-  return cString::sprintf("%X", value);
-}
-
-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;
-  cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
-
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  if (fe < 0)
-     return NULL;
-  CHECK(ioctl(fe, FE_GET_INFO, &value));
-  CHECK(ioctl(fe, FE_READ_STATUS, &status));
-  CHECK(ioctl(fe, FE_READ_SIGNAL_STRENGTH, &signal));
-  CHECK(ioctl(fe, FE_READ_SNR, &snr));
-  CHECK(ioctl(fe, FE_READ_BER, &ber));
-  CHECK(ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &unc));
-  close(fe);
-
-  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;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
-
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  if (fe < 0)
-     return NULL;
-  CHECK(ioctl(fe, FE_GET_INFO, &value));
-  close(fe);
-
-  return (cString::sprintf("%s on device #%d", value.name, cardIndex));
-}
-
-cString getFrontendStatus(int cardIndex)
-{
-  fe_status_t value;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
-
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  if (fe < 0)
-     return NULL;
-  CHECK(ioctl(fe, FE_READ_STATUS, &value));
-  close(fe);
-
-  return (cString::sprintf("Status %s:%s:%s:%s:%s on device #%d", (value & FE_HAS_LOCK) ? "LOCKED" : "-", (value & FE_HAS_SIGNAL) ? "SIGNAL" : "-", (value & FE_HAS_CARRIER) ? "CARRIER" : "-", (value & FE_HAS_VITERBI) ? "VITERBI" : "-", (value & FE_HAS_SYNC) ? "SYNC" : "-", cardIndex));
-}
-
-uint16_t getSignal(int cardIndex)
-{
-  uint16_t value = 0;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
-
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  if (fe < 0)
-     return (value);
-  CHECK(ioctl(fe, FE_READ_SIGNAL_STRENGTH, &value));
-  close(fe);
-
-  return (value);
-}
-
-uint16_t getSNR(int cardIndex)
-{
-  uint16_t value = 0;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
-
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  if (fe < 0)
-     return (value);
-  CHECK(ioctl(fe, FE_READ_SNR, &value));
-  close(fe);
-
-  return (value);
-}
-
-uint32_t getBER(int cardIndex)
-{
-  uint32_t value = 0;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
-
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  if (fe < 0)
-     return (value);
-  CHECK(ioctl(fe, FE_READ_BER, &value));
-  close(fe);
-
-  return (value);
-}
-
-uint32_t getUNC(int cardIndex)
-{
-  uint32_t value = 0;
-  cString dev = cString::sprintf(FRONTEND_DEVICE, cardIndex, 0);
-
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  if (fe < 0)
-     return (value);
-  CHECK(ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &value));
-  close(fe);
-
-  return (value);
-}
-
-cString getApids(const cChannel *channel)
-{
-  int value = 0;
-  cString apids = cString::sprintf("%d", channel->Apid(value));
-  while (channel->Apid(++value) && (value < MAXAPIDS))
-    apids = cString::sprintf("%s, %d", *apids, channel->Apid(value));
-  return apids;
-}
-
-cString getDpids(const cChannel *channel)
-{
-  int value = 0;
-  cString dpids = cString::sprintf("%d", channel->Dpid(value));
-  while (channel->Dpid(++value) && (value < MAXDPIDS))
-    dpids = cString::sprintf("%s, %d", *dpids, channel->Dpid(value));
-  return dpids;
-}
-
-cString getSpids(const cChannel *channel)
-{
-  int value = 0;
-  cString spids = cString::sprintf("%d", channel->Spid(value));
-  while (channel->Spid(++value) && (value < MAXSPIDS))
-    spids = cString::sprintf("%s, %d", *spids, channel->Spid(value));
-  return spids;
-}
-
-cString getCAids(const cChannel *channel)
-{
-  int value = 0;
-  cString caids = cString::sprintf("%s", *getCA(channel->Ca(value)));
-  while (channel->Ca(++value) && (value < MAXCAIDS))
-    caids = cString::sprintf("%s, %s", *caids, *getCA(channel->Ca(value)));
-  return caids;
-}
-
-cString getVideoStream(int value)
-{
-  if (value != 0)
-     return cString::sprintf("#%d", value);
-  return cString::sprintf("---");
-}
-
-cString getAudioStream(int value, const cChannel *channel)
-{
-  int pid = 0;
-  if (IS_AUDIO_TRACK(value))
-     pid = int(value - ttAudioFirst);
-  if (channel && channel->Apid(pid)) {
-     if (channel->Alang(pid))
-        return cString::sprintf("#%d (%s)", channel->Apid(pid), channel->Alang(pid));
-     else
-        return cString::sprintf("#%d", channel->Apid(pid));
-     }
-  return cString::sprintf("---");
-}
-
-cString getAC3Stream(int value, const cChannel *channel)
-{
-  int pid = 0;
-  if (IS_DOLBY_TRACK(value))
-     pid = int(value - ttDolbyFirst);
-  if (channel && channel->Dpid(pid)) {
-     if (channel->Dlang(pid))
-        return cString::sprintf("#%d (%s)", channel->Dpid(pid), channel->Dlang(pid));
-     else
-        return cString::sprintf("#%d", channel->Dpid(pid));
-     }
-  return cString::sprintf("---");
-}
-
-cString getVideoCodec(int value)
-{
-  switch (value) {
-    case VIDEO_CODEC_MPEG2: return cString::sprintf("%s", tr("MPEG-2"));
-    case VIDEO_CODEC_H264:  return cString::sprintf("%s", tr("H.264"));
-    }
-  return cString::sprintf("---");
-}
-
-cString getAudioCodec(int value)
-{
-  switch (value) {
-    case AUDIO_CODEC_MPEG1_I:   return cString::sprintf("%s", tr("MPEG-1 Layer I"));
-    case AUDIO_CODEC_MPEG1_II:  return cString::sprintf("%s", tr("MPEG-1 Layer II"));
-    case AUDIO_CODEC_MPEG1_III: return cString::sprintf("%s", tr("MPEG-1 Layer III"));
-    case AUDIO_CODEC_MPEG2_I:   return cString::sprintf("%s", tr("MPEG-2 Layer I"));
-    case AUDIO_CODEC_MPEG2_II:  return cString::sprintf("%s", tr("MPEG-2 Layer II"));
-    case AUDIO_CODEC_MPEG2_III: return cString::sprintf("%s", tr("MPEG-2 Layer III"));
-    case AUDIO_CODEC_HEAAC:     return cString::sprintf("%s", tr("HE-AAC"));
-    }
-  return cString::sprintf("---");
-}
-
-cString getAudioChannelMode(int value)
-{
-  switch (value) {
-    case AUDIO_CHANNEL_MODE_STEREO:       return cString::sprintf("%s", tr("stereo"));
-    case AUDIO_CHANNEL_MODE_JOINT_STEREO: return cString::sprintf("%s", tr("joint Stereo"));
-    case AUDIO_CHANNEL_MODE_DUAL:         return cString::sprintf("%s", tr("dual"));
-    case AUDIO_CHANNEL_MODE_SINGLE:       return cString::sprintf("%s", tr("mono"));
-    }
-  return cString::sprintf("---");
-}
-
-cString getCoderate(int value)
-{
-  switch (value) {
-    case FEC_NONE: return cString::sprintf("%s", trVDR("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", trVDR("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", trVDR("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", trVDR("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", trVDR("auto"));
-    }
-  return cString::sprintf("---");
-}
-
-cString getHierarchy(int value)
-{
-  switch (value) {
-    case HIERARCHY_NONE: return cString::sprintf("%s", trVDR("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: return cString::sprintf("%s", trVDR("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: return cString::sprintf("%s", trVDR("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", trVDR("auto"));
-    }
-  return cString::sprintf("---");
-}
-
-cString getResolution(int width, int height, int scan)
-{
-  if ((width > 0) && (height > 0)) {
-     switch (scan) {
-       case VIDEO_SCAN_INTERLACED:  return cString::sprintf("%dx%d %s", width, height, tr("interlaced"));
-       case VIDEO_SCAN_PROGRESSIVE: return cString::sprintf("%dx%d %s", width, height, tr("progressive"));
-       default:                     return cString::sprintf("%dx%d",    width, height);
-       }
-     }
-  return cString::sprintf("---");
-}
-
-cString getAspectRatio(int value)
-{
-  switch (value) {
-    case VIDEO_ASPECT_RATIO_RESERVED: return cString::sprintf("%s", tr("reserved"));
-    case VIDEO_ASPECT_RATIO_EXTENDED: return cString::sprintf("%s", tr("extended"));
-    case VIDEO_ASPECT_RATIO_1_1:      return cString::sprintf("1:1");
-    case VIDEO_ASPECT_RATIO_4_3:      return cString::sprintf("4:3");
-    case VIDEO_ASPECT_RATIO_16_9:     return cString::sprintf("16:9");
-    case VIDEO_ASPECT_RATIO_2_21_1:   return cString::sprintf("2.21:1");
-    case VIDEO_ASPECT_RATIO_12_11:    return cString::sprintf("12:11");
-    case VIDEO_ASPECT_RATIO_10_11:    return cString::sprintf("10:11");
-    case VIDEO_ASPECT_RATIO_16_11:    return cString::sprintf("16:11");
-    case VIDEO_ASPECT_RATIO_40_33:    return cString::sprintf("40:33");
-    case VIDEO_ASPECT_RATIO_24_11:    return cString::sprintf("24:11");
-    case VIDEO_ASPECT_RATIO_20_11:    return cString::sprintf("20:11");
-    case VIDEO_ASPECT_RATIO_32_11:    return cString::sprintf("32:11");
-    case VIDEO_ASPECT_RATIO_80_33:    return cString::sprintf("80:33");
-    case VIDEO_ASPECT_RATIO_18_11:    return cString::sprintf("18:11");
-    case VIDEO_ASPECT_RATIO_15_11:    return cString::sprintf("15:11");
-    case VIDEO_ASPECT_RATIO_64_33:    return cString::sprintf("64:33");
-    case VIDEO_ASPECT_RATIO_160_99:   return cString::sprintf("160:99");
-    case VIDEO_ASPECT_RATIO_3_2:      return cString::sprintf("3:2");
-    case VIDEO_ASPECT_RATIO_2_1:      return cString::sprintf("2:1");
-    }
-  return cString::sprintf("---");
-}
-
-cString getVideoFormat(int value)
-{
-  switch (value) {
-    case VIDEO_FORMAT_UNKNOWN:   return cString::sprintf("%s", tr("unknown"));
-    case VIDEO_FORMAT_RESERVED:  return cString::sprintf("%s", tr("reserved"));
-    case VIDEO_FORMAT_COMPONENT: return cString::sprintf("%s", tr("component"));
-    case VIDEO_FORMAT_PAL:       return cString::sprintf("%s", tr("PAL"));
-    case VIDEO_FORMAT_NTSC:      return cString::sprintf("%s", tr("NTSC"));
-    case VIDEO_FORMAT_SECAM:     return cString::sprintf("%s", tr("SECAM"));
-    case VIDEO_FORMAT_MAC:       return cString::sprintf("%s", tr("MAC"));
-    }
-  return cString::sprintf("---");
-}
-
-cString getFrameRate(double value)
-{
-  if (value > 0)
-     return cString::sprintf("%.2f %s", value, tr("Hz"));
-  return cString::sprintf("---");
-}
-
-cString getAC3BitStreamMode(int value, int coding)
-{
-  switch (value) {
-    case AUDIO_BITSTREAM_MODE_CM:     return cString::sprintf("%s", tr("Complete Main (CM)"));
-    case AUDIO_BITSTREAM_MODE_ME:     return cString::sprintf("%s", tr("Music and Effects (ME)"));
-    case AUDIO_BITSTREAM_MODE_VI:     return cString::sprintf("%s", tr("Visually Impaired (VI)"));
-    case AUDIO_BITSTREAM_MODE_HI:     return cString::sprintf("%s", tr("Hearing Impaired (HI)"));
-    case AUDIO_BITSTREAM_MODE_D:      return cString::sprintf("%s", tr("Dialogue (D)"));
-    case AUDIO_BITSTREAM_MODE_C:      return cString::sprintf("%s", tr("Commentary (C)"));
-    case AUDIO_BITSTREAM_MODE_E:      return cString::sprintf("%s", tr("Emergency (E)"));
-    case AUDIO_BITSTREAM_MODE_VO_KAR: return cString::sprintf("%s", (coding == 1) ? tr("Voice Over (VO)") : tr("Karaoke"));
-    }
-  return cString::sprintf("---");
-}
-
-cString getAC3AudioCodingMode(int value, int stream)
-{
-  if (stream != 7) {
-     switch (value) {
-       case AUDIO_CODING_MODE_1_1: return cString::sprintf("1+1 - %s, %s", tr("Ch1"), tr("Ch2"));
-       case AUDIO_CODING_MODE_1_0: return cString::sprintf("1/0 - %s", tr("C"));
-       case AUDIO_CODING_MODE_2_0: return cString::sprintf("2/0 - %s, %s", tr("L"), tr("R"));
-       case AUDIO_CODING_MODE_3_0: return cString::sprintf("3/0 - %s, %s, %s", tr("L"), tr("C"), tr("R"));
-       case AUDIO_CODING_MODE_2_1: return cString::sprintf("2/1 - %s, %s, %s", tr("L"), tr("R"), tr("S"));
-       case AUDIO_CODING_MODE_3_1: return cString::sprintf("3/1 - %s, %s, %s, %s", tr("L"), tr("C"), tr("R"), tr("S"));
-       case AUDIO_CODING_MODE_2_2: return cString::sprintf("2/2 - %s, %s, %s, %s", tr("L"), tr("R"), tr("SL"), tr("SR"));
-       case AUDIO_CODING_MODE_3_2: return cString::sprintf("3/2 - %s, %s, %s, %s, %s", tr("L"), tr("C"), tr("R"), tr("SL"), tr("SR"));
-       }
-     }
-  return cString::sprintf("---");
-}
-
-cString getAC3CenterMixLevel(int value)
-{
-  switch (value) {
-    case AUDIO_CENTER_MIX_LEVEL_MINUS_3dB:   return cString::sprintf("-3.0 %s", tr("dB"));
-    case AUDIO_CENTER_MIX_LEVEL_MINUS_4_5dB: return cString::sprintf("-4.5 %s", tr("dB"));
-    case AUDIO_CENTER_MIX_LEVEL_MINUS_6dB:   return cString::sprintf("-6.0 %s", tr("dB"));
-    case AUDIO_CENTER_MIX_LEVEL_RESERVED:    return cString::sprintf("%s", tr("reserved"));
-    }
-  return cString::sprintf("---");
-}
-
-cString getAC3SurroundMixLevel(int value)
-{
-  switch (value) {
-    case AUDIO_SURROUND_MIX_LEVEL_MINUS_3dB: return cString::sprintf("-3 %s", tr("dB"));
-    case AUDIO_SURROUND_MIX_LEVEL_MINUS_6dB: return cString::sprintf("-6 %s", tr("dB"));
-    case AUDIO_SURROUND_MIX_LEVEL_0_dB:      return cString::sprintf("0 %s", tr("dB"));
-    case AUDIO_SURROUND_MIX_LEVEL_RESERVED:  return cString::sprintf("%s", tr("reserved"));
-    }
-  return cString::sprintf("---");
-}
-
-cString getAC3DolbySurroundMode(int value)
-{
-  switch (value) {
-    case AUDIO_DOLBY_SURROUND_MODE_NOT_INDICATED:     return cString::sprintf("%s", tr("not indicated"));
-    case AUDIO_DOLBY_SURROUND_MODE_NOT_DOLBYSURROUND: return cString::sprintf("%s", trVDR("no"));
-    case AUDIO_DOLBY_SURROUND_MODE_DOLBYSURROUND:     return cString::sprintf("%s", trVDR("yes"));
-    case AUDIO_DOLBY_SURROUND_MODE_RESERVED:          return cString::sprintf("%s", tr("reserved"));
-    }
-  return cString::sprintf("---");
-}
-
-cString getAC3DialogLevel(int value)
-{
-  if (value > 0)
-     return cString::sprintf("-%d %s", value, tr("dB"));
-  return cString::sprintf("---");
-}
-
-cString getFrequencyMHz(int value)
-{
-   while (value > 20000) value /= 1000;
-   return cString::sprintf("%d %s", value, tr("MHz"));
-}
-
-cString getAudioSamplingFreq(int value)
-{
-  switch (value) {
-    case AUDIO_SAMPLING_FREQUENCY_INVALID:  return cString::sprintf("---");
-    case AUDIO_SAMPLING_FREQUENCY_RESERVED: return cString::sprintf("%s", tr("reserved"));
-    }
-  return cString::sprintf("%d %s", value, tr("Hz"));
-}
-
-cString getAudioBitrate(double value, double stream)
-{
-  switch ((int)stream) {
-    case AUDIO_BITRATE_INVALID:  return cString::sprintf("---");
-    case AUDIO_BITRATE_RESERVED: return cString::sprintf("%s (%s)", tr("reserved"), *getBitrateKbits(value));
-    case AUDIO_BITRATE_FREE:     return cString::sprintf("%s (%s)", tr("free"), *getBitrateKbits(value));
-    }
-  return cString::sprintf("%s (%s)", *getBitrateKbits(stream), *getBitrateKbits(value));
-}
-
-cString getVideoBitrate(double value, double stream)
-{
-  return cString::sprintf("%s (%s)", *getBitrateMbits(stream), *getBitrateMbits(value));
-}
-
-cString getBitrateMbits(double value)
-{
-  if (value > 0)
-     return cString::sprintf("%.2f %s", value / 1000000.0, tr("Mbit/s"));
-  return cString::sprintf("---");
-}
-
-cString getBitrateKbits(double value)
-{
-  if (value > 0) 
-     return cString::sprintf("%.0f %s", value / 1000.0, tr("kbit/s"));
-  return cString::sprintf("---");
-}

femontools.h

@@ -1,69 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMONTOOLS_H
-#define __FEMONTOOLS_H
-
-#include <stdint.h>
-#include <vdr/channels.h>
-#include <vdr/tools.h>
-
-#ifdef DEBUG
-#define Dprintf(x...) printf(x);
-#else
-#define Dprintf(x...) ;
-#endif
-
-#define ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
-
-#define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"
-
-cString getFrontendInfo(int cardIndex = 0);
-cString getFrontendName(int cardIndex = 0);
-cString getFrontendStatus(int cardIndex = 0);
-
-uint16_t getSNR(int cardIndex = 0);
-uint16_t getSignal(int cardIndex = 0);
-
-uint32_t getBER(int cardIndex = 0);
-uint32_t getUNC(int cardIndex = 0);
-
-cString getApids(const cChannel *channel);
-cString getDpids(const cChannel *channel);
-cString getSpids(const cChannel *channel);
-cString getCAids(const cChannel *channel);
-cString getVideoStream(int value);
-cString getVideoCodec(int value);
-cString getAudioStream(int value, const cChannel *channel);
-cString getAudioCodec(int value);
-cString getAudioChannelMode(int value);
-cString getCoderate(int value);
-cString getTransmission(int value);
-cString getBandwidth(int value);
-cString getInversion(int value);
-cString getHierarchy(int value);
-cString getGuard(int value);
-cString getModulation(int value);
-cString getResolution(int width, int height, int scan);
-cString getAspectRatio(int value);
-cString getVideoFormat(int value);
-cString getFrameRate(double value);
-cString getAC3Stream(int value, const cChannel *channel);
-cString getAC3BitStreamMode(int value, int coding);
-cString getAC3AudioCodingMode(int value, int stream);
-cString getAC3CenterMixLevel(int value);
-cString getAC3SurroundMixLevel(int value);
-cString getAC3DolbySurroundMode(int value);
-cString getAC3DialogLevel(int value);
-cString getFrequencyMHz(int value);
-cString getAudioSamplingFreq(int value);
-cString getAudioBitrate(double value, double stream);
-cString getVideoBitrate(double value, double stream);
-cString getBitrateMbits(double value);
-cString getBitrateKbits(double value);
-
-#endif // __FEMONTOOLS_H

femonvideo.h

@@ -1,72 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- */
-
-#ifndef __FEMONVIDEO_H
-#define __FEMONVIDEO_H
-
-enum eVideoCodec {
-  VIDEO_CODEC_INVALID = -1,
-  VIDEO_CODEC_UNKNOWN,
-  VIDEO_CODEC_MPEG2,
-  VIDEO_CODEC_H264
-  };
-
-enum eVideoFormat {
-  VIDEO_FORMAT_INVALID = -1,
-  VIDEO_FORMAT_UNKNOWN,
-  VIDEO_FORMAT_RESERVED,
-  VIDEO_FORMAT_COMPONENT,
-  VIDEO_FORMAT_PAL,
-  VIDEO_FORMAT_NTSC,
-  VIDEO_FORMAT_SECAM,
-  VIDEO_FORMAT_MAC
-  };
-
-enum eVideoScan {
-  VIDEO_SCAN_INVALID = -1,
-  VIDEO_SCAN_UNKNOWN,
-  VIDEO_SCAN_RESERVED,
-  VIDEO_SCAN_INTERLACED,
-  VIDEO_SCAN_PROGRESSIVE
-  };
-
-enum eVideoAspectRatio {
-  VIDEO_ASPECT_RATIO_INVALID = -1,
-  VIDEO_ASPECT_RATIO_RESERVED,
-  VIDEO_ASPECT_RATIO_EXTENDED,
-  VIDEO_ASPECT_RATIO_1_1,
-  VIDEO_ASPECT_RATIO_4_3,
-  VIDEO_ASPECT_RATIO_16_9,
-  VIDEO_ASPECT_RATIO_2_21_1,
-  VIDEO_ASPECT_RATIO_12_11,
-  VIDEO_ASPECT_RATIO_10_11,
-  VIDEO_ASPECT_RATIO_16_11,
-  VIDEO_ASPECT_RATIO_40_33,
-  VIDEO_ASPECT_RATIO_24_11,
-  VIDEO_ASPECT_RATIO_20_11,
-  VIDEO_ASPECT_RATIO_32_11,
-  VIDEO_ASPECT_RATIO_80_33,
-  VIDEO_ASPECT_RATIO_18_11,
-  VIDEO_ASPECT_RATIO_15_11,
-  VIDEO_ASPECT_RATIO_64_33,
-  VIDEO_ASPECT_RATIO_160_99,
-  VIDEO_ASPECT_RATIO_3_2,
-  VIDEO_ASPECT_RATIO_2_1
-  };
-
-typedef struct video_info {
-  eVideoCodec       codec;       // enum
-  eVideoFormat      format;      // enum
-  eVideoScan        scan;        // enum
-  eVideoAspectRatio aspectRatio; // enum
-  int               width;       // pixels
-  int               height;      // pixels
-  double            frameRate;   // Hz
-  double            bitrate;     // Mbit/s
-} video_info_t;
-
-#endif //__FEMONVIDEO_H

po/de_DE.po

@@ -1,390 +0,0 @@
-# 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.6.5\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
-"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"
-msgstr "Femon 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 "ST:TNG"
-msgstr "ST:TNG"
-
-msgid "DeepBlue"
-msgstr "DeepBlue"
-
-msgid "Moronimo"
-msgstr "Moronimo"
-
-msgid "Enigma"
-msgstr "Enigma"
-
-msgid "EgalsTry"
-msgstr "EgalsTry"
-
-msgid "Duotone"
-msgstr "Duotone"
-
-msgid "SilverGreen"
-msgstr "SilverGreen"
-
-msgid "Hide main menu entry"
-msgstr "Hauptmen<65>eintrag verstecken"
-
-msgid "Define whether the main menu 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 "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 "Coderate"
-msgstr "Coderate"
-
-msgid "Stream Information"
-msgstr "Streaminformation"
-
-msgid "Video Stream"
-msgstr "Video Stream"
-
-msgid "Codec"
-msgstr ""
-
-msgid "Bitrate"
-msgstr "Bitrate"
-
-msgid "Aspect Ratio"
-msgstr "Seitenverh<72>ltnis"
-
-msgid "Frame Rate"
-msgstr "Bildrate"
-
-msgid "Video Format"
-msgstr "Bildformat"
-
-msgid "Resolution"
-msgstr "Aufl<66>sung"
-
-msgid "Audio Stream"
-msgstr "Audio Stream"
-
-msgid "Channel Mode"
-msgstr ""
-
-msgid "Sampling Frequency"
-msgstr "Abtastrate"
-
-msgid "AC-3 Stream"
-msgstr "AC-3 Stream"
-
-msgid "Bit Stream Mode"
-msgstr "Bitstream Modus"
-
-msgid "Audio Coding Mode"
-msgstr "Audiokodierung"
-
-msgid "Center Mix Level"
-msgstr "Center Mix Pegel"
-
-msgid "Surround Mix Level"
-msgstr "Surround Mix Pegel"
-
-msgid "Dolby Surround Mode"
-msgstr "Dolby Surround Modus"
-
-msgid "Low Frequency Effects"
-msgstr "Tieft<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 "MPEG-2"
-msgstr ""
-
-msgid "H.264"
-msgstr ""
-
-msgid "MPEG-1 Layer I"
-msgstr ""
-
-msgid "MPEG-1 Layer II"
-msgstr ""
-
-msgid "MPEG-1 Layer III"
-msgstr ""
-
-msgid "MPEG-2 Layer I"
-msgstr ""
-
-msgid "MPEG-2 Layer II"
-msgstr ""
-
-msgid "MPEG-2 Layer III"
-msgstr ""
-
-msgid "HE-AAC"
-msgstr ""
-
-msgid "stereo"
-msgstr ""
-
-msgid "joint Stereo"
-msgstr ""
-
-msgid "dual"
-msgstr ""
-
-msgid "mono"
-msgstr ""
-
-msgid "MHz"
-msgstr "MHz"
-
-msgid "interlaced"
-msgstr ""
-
-msgid "progressive"
-msgstr ""
-
-msgid "reserved"
-msgstr "belegt"
-
-msgid "extended"
-msgstr ""
-
-msgid "unknown"
-msgstr "unbekannt"
-
-msgid "component"
-msgstr ""
-
-msgid "PAL"
-msgstr "PAL"
-
-msgid "NTSC"
-msgstr "NTSC"
-
-msgid "SECAM"
-msgstr ""
-
-msgid "MAC"
-msgstr ""
-
-msgid "Hz"
-msgstr "Hz"
-
-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"

po/es_ES.po

@@ -1,388 +0,0 @@
-# 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.6.5\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
-"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"
-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 "ST:TNG"
-msgstr "ST:TNG"
-
-msgid "DeepBlue"
-msgstr "DeepBlue"
-
-msgid "Moronimo"
-msgstr "Moronimo"
-
-msgid "Enigma"
-msgstr "Enigma"
-
-msgid "EgalsTry"
-msgstr "EgalsTry"
-
-msgid "Duotone"
-msgstr "Duotone"
-
-msgid "SilverGreen"
-msgstr "SilverGreen"
-
-msgid "Hide main menu entry"
-msgstr "Ocultar en el men<65> principal"
-
-msgid "Define whether the main menu 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 "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 "Coderate"
-msgstr "Coderate"
-
-msgid "Stream Information"
-msgstr "Informaci<63>n del flujo"
-
-msgid "Video Stream"
-msgstr "Flujo de video"
-
-msgid "Codec"
-msgstr ""
-
-msgid "Bitrate"
-msgstr "Tasa de bits"
-
-msgid "Aspect Ratio"
-msgstr "Proporciones de la imagen"
-
-msgid "Frame Rate"
-msgstr "Tasa de frames"
-
-msgid "Video Format"
-msgstr "Formato de video"
-
-msgid "Resolution"
-msgstr "Resoluci<63>n"
-
-msgid "Audio Stream"
-msgstr "Flujo de audio"
-
-msgid "Channel Mode"
-msgstr ""
-
-msgid "Sampling Frequency"
-msgstr "Frecuencia de muestreo"
-
-msgid "AC-3 Stream"
-msgstr "Flujo AC-3"
-
-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 "MPEG-2"
-msgstr ""
-
-msgid "H.264"
-msgstr ""
-
-msgid "MPEG-1 Layer I"
-msgstr ""
-
-msgid "MPEG-1 Layer II"
-msgstr ""
-
-msgid "MPEG-1 Layer III"
-msgstr ""
-
-msgid "MPEG-2 Layer I"
-msgstr ""
-
-msgid "MPEG-2 Layer II"
-msgstr ""
-
-msgid "MPEG-2 Layer III"
-msgstr ""
-
-msgid "HE-AAC"
-msgstr ""
-
-msgid "stereo"
-msgstr ""
-
-msgid "joint Stereo"
-msgstr ""
-
-msgid "dual"
-msgstr ""
-
-msgid "mono"
-msgstr "o"
-
-msgid "MHz"
-msgstr "MHz"
-
-msgid "interlaced"
-msgstr ""
-
-msgid "progressive"
-msgstr ""
-
-msgid "reserved"
-msgstr "reservado"
-
-msgid "extended"
-msgstr ""
-
-msgid "unknown"
-msgstr "desconocido"
-
-msgid "component"
-msgstr ""
-
-msgid "PAL"
-msgstr "PAL"
-
-msgid "NTSC"
-msgstr "NTSC"
-
-msgid "SECAM"
-msgstr ""
-
-msgid "MAC"
-msgstr ""
-
-msgid "Hz"
-msgstr "Hz"
-
-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"

po/et_EE.po

@@ -1,388 +0,0 @@
-# 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.6.5\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
-"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"
-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 "ST:TNG"
-msgstr "ST:TNG"
-
-msgid "DeepBlue"
-msgstr "DeepBlue"
-
-msgid "Moronimo"
-msgstr "Moronimo"
-
-msgid "Enigma"
-msgstr "Enigma"
-
-msgid "EgalsTry"
-msgstr "EgalsTry"
-
-msgid "Duotone"
-msgstr "Duotone"
-
-msgid "SilverGreen"
-msgstr "SilverGreen"
-
-msgid "Hide main menu entry"
-msgstr "Peida valik peamen<65><6E>s"
-
-msgid "Define whether the main menu 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 "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 "Coderate"
-msgstr "Coderate"
-
-msgid "Stream Information"
-msgstr "Voo info"
-
-msgid "Video Stream"
-msgstr "Videovoog"
-
-msgid "Codec"
-msgstr ""
-
-msgid "Bitrate"
-msgstr "Bitikiirus"
-
-msgid "Aspect Ratio"
-msgstr "K<>lgsuhe"
-
-msgid "Frame Rate"
-msgstr "Kaadrisagedus"
-
-msgid "Video Format"
-msgstr "Videoformaat"
-
-msgid "Resolution"
-msgstr "Resolutsioon"
-
-msgid "Audio Stream"
-msgstr "Audiovoog"
-
-msgid "Channel Mode"
-msgstr ""
-
-msgid "Sampling Frequency"
-msgstr "S<>mplimissagedus"
-
-msgid "AC-3 Stream"
-msgstr "AC-3 voog"
-
-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 "MPEG-2"
-msgstr ""
-
-msgid "H.264"
-msgstr ""
-
-msgid "MPEG-1 Layer I"
-msgstr ""
-
-msgid "MPEG-1 Layer II"
-msgstr ""
-
-msgid "MPEG-1 Layer III"
-msgstr ""
-
-msgid "MPEG-2 Layer I"
-msgstr ""
-
-msgid "MPEG-2 Layer II"
-msgstr ""
-
-msgid "MPEG-2 Layer III"
-msgstr ""
-
-msgid "HE-AAC"
-msgstr ""
-
-msgid "stereo"
-msgstr ""
-
-msgid "joint Stereo"
-msgstr ""
-
-msgid "dual"
-msgstr ""
-
-msgid "mono"
-msgstr ""
-
-msgid "MHz"
-msgstr "MHz"
-
-msgid "interlaced"
-msgstr ""
-
-msgid "progressive"
-msgstr ""
-
-msgid "reserved"
-msgstr "reserveeritud"
-
-msgid "extended"
-msgstr ""
-
-msgid "unknown"
-msgstr "tundmatu"
-
-msgid "component"
-msgstr ""
-
-msgid "PAL"
-msgstr "PAL"
-
-msgid "NTSC"
-msgstr "NTSC"
-
-msgid "SECAM"
-msgstr ""
-
-msgid "MAC"
-msgstr ""
-
-msgid "Hz"
-msgstr "Hz"
-
-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"

po/fi_FI.po

@@ -1,388 +0,0 @@
-# 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.6.5\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
-"Last-Translator: Rolf Ahrenberg\n"
-"Language-Team: <vdr@linuxtv.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "DVB Signal Information Monitor (OSD)"
-msgstr "Signaalimittari (OSD)"
-
-msgid "Signal Information"
-msgstr "Signaalimittari"
-
-msgid "Femon not available"
-msgstr "Signaalimittari ei ole käytettävissä"
-
-msgid "basic"
-msgstr "perus"
-
-msgid "transponder"
-msgstr "transponderi"
-
-msgid "stream"
-msgstr "lähete"
-
-msgid "AC-3"
-msgstr "AC-3"
-
-msgid "Classic"
-msgstr "Klassinen"
-
-msgid "Elchi"
-msgstr "Elchi"
-
-msgid "ST:TNG"
-msgstr "ST:TNG"
-
-msgid "DeepBlue"
-msgstr "DeepBlue"
-
-msgid "Moronimo"
-msgstr "Moronimo"
-
-msgid "Enigma"
-msgstr "Enigma"
-
-msgid "EgalsTry"
-msgstr "EgalsTry"
-
-msgid "Duotone"
-msgstr "Duotone"
-
-msgid "SilverGreen"
-msgstr "SilverGreen"
-
-msgid "Hide main menu entry"
-msgstr "Piilota valinta päävalikosta"
-
-msgid "Define whether the main menu entry is hidden."
-msgstr "Määrittele, näytetäänkö laajennoksen valinta päävalikossa."
-
-msgid "Default display mode"
-msgstr "Oletusnäyttötila"
-
-msgid "Define the default display mode at startup."
-msgstr "Määrittele käytettävä näyttötila käynnistettäessä."
-
-msgid "Define the used OSD skin."
-msgstr "Määrittele käytettävä ulkoasu näytölle."
-
-msgid "Define the used OSD theme."
-msgstr "Määrittele käytettävä väriteema näytölle."
-
-msgid "Position"
-msgstr "Sijainti"
-
-msgid "Define the position of OSD."
-msgstr "Määrittele näytön sijainti."
-
-msgid "Define the height of OSD."
-msgstr "Määrittele näytön korkeus."
-
-msgid "Horizontal offset"
-msgstr "Vaakakeskitys"
-
-msgid "Define the horizontal offset of OSD."
-msgstr "Määrittele näytön vaakakeskitys."
-
-msgid "Red limit [%]"
-msgstr "Punaisen taso [%]"
-
-msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr "Määrittele taso punaiselle palkille, jota käytetään huonon signaalin ilmaisimena."
-
-msgid "Green limit [%]"
-msgstr "Vihreän taso [%]"
-
-msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr "Määrittele taso vihreälle palkille, jota käytetään hyvän signaalin ilmaisimena."
-
-msgid "OSD update interval [0.1s]"
-msgstr "Näytön päivitysväli [0.1s]"
-
-msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "Määrittele näytönvirkistystaajuus. Mitä pienempi arvo, sitä suurempi CPU-kuorma."
-
-msgid "Analyze stream"
-msgstr "Lähetteen analysointi"
-
-msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "Määrittele, analysoidaanko DVB-lähetettä ja lasketaanko bittinopeuksia."
-
-msgid "Calculation interval [0.1s]"
-msgstr "Laskennan päivitysväli [0.1s]"
-
-msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "Määrittele laskentaikkunan koko. Mitä suurempi laskentaikkuna, sitä todenmukaisemmat lopputulokset."
-
-msgid "Use SVDRP service"
-msgstr "Käytä SVDRP-palvelua"
-
-msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "Määrittele käytetäänkö SVDRP-palvelua asiakas/palvelin-kokoonpanoissa."
-
-msgid "SVDRP service port"
-msgstr "SVDRP-palvelun portti"
-
-msgid "Define the port number of SVDRP service."
-msgstr "Määrittele SVDRP-palvelun käyttämä portti."
-
-msgid "SVDRP service IP"
-msgstr "SVDRP-palvelun IP-osoite"
-
-msgid "Define the IP address of SVDRP service."
-msgstr "Määrittele SVDRP-palvelun käyttämä IP-osoite."
-
-msgid "Help"
-msgstr "Opaste"
-
-msgid "Video"
-msgstr "Kuva"
-
-msgid "Audio"
-msgstr "Ääni"
-
-msgid "Transponder Information"
-msgstr "Transponderin tiedot"
-
-msgid "Apid"
-msgstr "Ää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 "Coderate"
-msgstr "Suojaustaso"
-
-msgid "Stream Information"
-msgstr "Lähetteen tiedot"
-
-msgid "Video Stream"
-msgstr "Kuvaraita"
-
-msgid "Codec"
-msgstr "Koodekki"
-
-msgid "Bitrate"
-msgstr "Bittinopeus"
-
-msgid "Aspect Ratio"
-msgstr "Kuvasuhde"
-
-msgid "Frame Rate"
-msgstr "Ruudunpäivitystaajuus"
-
-msgid "Video Format"
-msgstr "Kuvaformaatti"
-
-msgid "Resolution"
-msgstr "Resoluutio"
-
-msgid "Audio Stream"
-msgstr "Ääniraita"
-
-msgid "Channel Mode"
-msgstr "Kanavatila"
-
-msgid "Sampling Frequency"
-msgstr "Näytteenottotaajuus"
-
-msgid "AC-3 Stream"
-msgstr "AC-3-ääniraita"
-
-msgid "Bit Stream Mode"
-msgstr "Lähetteen tyyppi"
-
-msgid "Audio Coding Mode"
-msgstr "Ää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äällä"
-
-msgid "off"
-msgstr "poissa"
-
-msgid "Dialogue Normalization"
-msgstr "Dialogin normalisointi"
-
-msgid "Fixed"
-msgstr "kiinteä"
-
-msgid "Analog"
-msgstr "analoginen"
-
-msgid "MPEG-2"
-msgstr "MPEG-2"
-
-msgid "H.264"
-msgstr "H.264"
-
-msgid "MPEG-1 Layer I"
-msgstr "MPEG-1 kerros I"
-
-msgid "MPEG-1 Layer II"
-msgstr "MPEG-1 kerros II"
-
-msgid "MPEG-1 Layer III"
-msgstr "MPEG-1 kerros III"
-
-msgid "MPEG-2 Layer I"
-msgstr "MPEG-2 kerros I"
-
-msgid "MPEG-2 Layer II"
-msgstr "MPEG-2 kerros II"
-
-msgid "MPEG-2 Layer III"
-msgstr "MPEG-2 kerros III"
-
-msgid "HE-AAC"
-msgstr "HE-AAC"
-
-msgid "stereo"
-msgstr "stereo"
-
-msgid "joint Stereo"
-msgstr "joint-stereo"
-
-msgid "dual"
-msgstr "kaksikanavainen"
-
-msgid "mono"
-msgstr "mono"
-
-msgid "MHz"
-msgstr "MHz"
-
-msgid "interlaced"
-msgstr "lomiteltu"
-
-msgid "progressive"
-msgstr "lomittelematon"
-
-msgid "reserved"
-msgstr "varattu"
-
-msgid "extended"
-msgstr "laajennettu"
-
-msgid "unknown"
-msgstr "tuntematon"
-
-msgid "component"
-msgstr "komponentti"
-
-msgid "PAL"
-msgstr "PAL"
-
-msgid "NTSC"
-msgstr "NTSC"
-
-msgid "SECAM"
-msgstr "SECAM"
-
-msgid "MAC"
-msgstr "MAC"
-
-msgid "Hz"
-msgstr "Hz"
-
-msgid "Complete Main (CM)"
-msgstr "Pääasiallinen (CM)"
-
-msgid "Music and Effects (ME)"
-msgstr "Musiikki ja tehosteet (ME)"
-
-msgid "Visually Impaired (VI)"
-msgstr "Näkö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ätiedote (E)"
-
-msgid "Voice Over (VO)"
-msgstr "Pää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"

po/fr_FR.po

@@ -1,388 +0,0 @@
-# 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.6.5\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2008-01-26 09:59+0100\n"
-"Last-Translator: NIVAL Micha<68>l <mnival@club-internet.fr>\n"
-"Language-Team:  <vdr@linuxtv.org>\n"
-"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"
-msgstr "Femon n'est pas disponible"
-
-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 "ST:TNG"
-msgstr "ST:TNG"
-
-msgid "DeepBlue"
-msgstr "DeepBlue"
-
-msgid "Moronimo"
-msgstr "Moronimo"
-
-msgid "Enigma"
-msgstr "Enigma"
-
-msgid "EgalsTry"
-msgstr "EgalsTry"
-
-msgid "Duotone"
-msgstr "Duotone"
-
-msgid "SilverGreen"
-msgstr "SilverGreen"
-
-msgid "Hide main menu entry"
-msgstr "Masquer dans le menu principal"
-
-msgid "Define whether the main menu entry is hidden."
-msgstr "D<>finit si l'entr<74>e doit <20>tre masqu<71>e dans le menu principal."
-
-msgid "Default display mode"
-msgstr "Affichage par d<>faut"
-
-msgid "Define the default display mode at startup."
-msgstr "D<>finit l'affichage par d<>faut au d<>marrage."
-
-msgid "Define the used OSD skin."
-msgstr "D<>finit le skin OSD <20> utiliser."
-
-msgid "Define the used OSD theme."
-msgstr "D<>finit le th<74>me OSD <20> utiliser."
-
-msgid "Position"
-msgstr "Position"
-
-msgid "Define the position of OSD."
-msgstr "D<>finit la position de l'OSD."
-
-msgid "Define the height of OSD."
-msgstr "D<>finit l'hauteur de l'OSD."
-
-msgid "Horizontal offset"
-msgstr "D<>placement horizontal"
-
-msgid "Define the horizontal offset of OSD."
-msgstr "D<>finit le d<>placement horizontal de l'OSD."
-
-msgid "Red limit [%]"
-msgstr "Limite du rouge (%)"
-
-msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr "D<>finit la limite de la barre rouge, qui est utilis<69> pour indiquer un mauvais signal."
-
-msgid "Green limit [%]"
-msgstr "Limite du vert (%)"
-
-msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr "D<>finit la limite de la barre rouge, qui est utilis<69> pour indiquer un bon signal."
-
-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 "D<>finit l'intervalle de mise <20> jour de l'OSD. Un petit intervalle g<>n<EFBFBD>re une charge CPU plus importante."
-
-msgid "Analyze stream"
-msgstr "Analyser le flux"
-
-msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "D<>finit si le flux DVB est analys<79> et le bitrates calcul<75>."
-
-msgid "Calculation interval [0.1s]"
-msgstr "Intervalle de calcul (0,1s)"
-
-msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "D<>finit l'intervalle de cacul. Un plus grand intervalle g<>n<EFBFBD>re une valeur plus stable."
-
-msgid "Use SVDRP service"
-msgstr "Utiliser le service SVDRP"
-
-msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "D<>finit si le service SVDRP est utilis<69> en configuration client/serveur."
-
-msgid "SVDRP service port"
-msgstr "Port du service SVDRP"
-
-msgid "Define the port number of SVDRP service."
-msgstr "D<>finit le port d'<27>coute du service SVDRP."
-
-msgid "SVDRP service IP"
-msgstr "IP du service SVDRP"
-
-msgid "Define the IP address of SVDRP service."
-msgstr "D<>finit l'adresse IP du service SVDRP."
-
-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 "Coderate"
-msgstr "Coderate"
-
-msgid "Stream Information"
-msgstr "Information flux"
-
-msgid "Video Stream"
-msgstr "Flux vid<69>o"
-
-msgid "Codec"
-msgstr ""
-
-msgid "Bitrate"
-msgstr "Bitrate"
-
-msgid "Aspect Ratio"
-msgstr "Proportions d'image"
-
-msgid "Frame Rate"
-msgstr "Rafra<72>chissement"
-
-msgid "Video Format"
-msgstr "Standard vid<69>o"
-
-msgid "Resolution"
-msgstr "R<>solution"
-
-msgid "Audio Stream"
-msgstr "Flux audio"
-
-msgid "Channel Mode"
-msgstr ""
-
-msgid "Sampling Frequency"
-msgstr "Fr<46>quence d'<27>chantillonage"
-
-msgid "AC-3 Stream"
-msgstr "Flux AC-3"
-
-msgid "Bit Stream Mode"
-msgstr "Mode bitstream"
-
-msgid "Audio Coding Mode"
-msgstr "Mode de codage audio"
-
-msgid "Center Mix Level"
-msgstr "Niveau sonore milieu"
-
-msgid "Surround Mix Level"
-msgstr "Niveau sonore surround"
-
-msgid "Dolby Surround Mode"
-msgstr "Mode Dolby Surround"
-
-msgid "Low Frequency Effects"
-msgstr "Effets de basses"
-
-msgid "on"
-msgstr "Oui"
-
-msgid "off"
-msgstr "Non"
-
-msgid "Dialogue Normalization"
-msgstr "Normalisation des dialogues"
-
-msgid "Fixed"
-msgstr "Fixe"
-
-msgid "Analog"
-msgstr "Analogique"
-
-msgid "MPEG-2"
-msgstr ""
-
-msgid "H.264"
-msgstr ""
-
-msgid "MPEG-1 Layer I"
-msgstr ""
-
-msgid "MPEG-1 Layer II"
-msgstr ""
-
-msgid "MPEG-1 Layer III"
-msgstr ""
-
-msgid "MPEG-2 Layer I"
-msgstr ""
-
-msgid "MPEG-2 Layer II"
-msgstr ""
-
-msgid "MPEG-2 Layer III"
-msgstr ""
-
-msgid "HE-AAC"
-msgstr ""
-
-msgid "stereo"
-msgstr ""
-
-msgid "joint Stereo"
-msgstr ""
-
-msgid "dual"
-msgstr ""
-
-msgid "mono"
-msgstr ""
-
-msgid "MHz"
-msgstr "MHz"
-
-msgid "interlaced"
-msgstr ""
-
-msgid "progressive"
-msgstr ""
-
-msgid "reserved"
-msgstr "r<>serv<72>"
-
-msgid "extended"
-msgstr ""
-
-msgid "unknown"
-msgstr "inconnu"
-
-msgid "component"
-msgstr ""
-
-msgid "PAL"
-msgstr "PAL"
-
-msgid "NTSC"
-msgstr "NTSC"
-
-msgid "SECAM"
-msgstr ""
-
-msgid "MAC"
-msgstr ""
-
-msgid "Hz"
-msgstr "Hz"
-
-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"

po/it_IT.po

@@ -1,389 +0,0 @@
-# VDR plugin language source file.
-# Copyright (C) 2007 Rolf Ahrenberg
-# This file is distributed under the same license as the femon package.
-# Sean Carlos
-# Diego Pierotto <vdr-italian@tiscali.it>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: femon 1.6.5\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2008-11-10 23:37+0100\n"
-"Last-Translator: Diego Pierotto <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 "Mostra info segnale DVB (OSD)"
-
-msgid "Signal Information"
-msgstr "Info segnale"
-
-msgid "Femon not available"
-msgstr "Femon non disponibile"
-
-msgid "basic"
-msgstr "base"
-
-msgid "transponder"
-msgstr "transponder"
-
-msgid "stream"
-msgstr "flusso"
-
-msgid "AC-3"
-msgstr "AC-3"
-
-msgid "Classic"
-msgstr "Classico"
-
-msgid "Elchi"
-msgstr "Elchi"
-
-msgid "ST:TNG"
-msgstr "ST:TNG"
-
-msgid "DeepBlue"
-msgstr "DeepBlue"
-
-msgid "Moronimo"
-msgstr "Moronimo"
-
-msgid "Enigma"
-msgstr "Enigma"
-
-msgid "EgalsTry"
-msgstr "EgalsTry"
-
-msgid "Duotone"
-msgstr "Duotone"
-
-msgid "SilverGreen"
-msgstr "SilverGreen"
-
-msgid "Hide main menu entry"
-msgstr "Nascondi voce menu principale"
-
-msgid "Define whether the main menu entry is hidden."
-msgstr "Definisci se la voce del menu principale <20> nascosta."
-
-msgid "Default display mode"
-msgstr "Modalit<69> visualizz. predefinita"
-
-msgid "Define the default display mode at startup."
-msgstr "Definisci la modalit<69> di visualizz. predefinita all'avvio."
-
-msgid "Define the used OSD skin."
-msgstr "Definisci lo stile interfaccia OSD utilizzato."
-
-msgid "Define the used OSD theme."
-msgstr "Definisci il tema OSD utilizzato."
-
-msgid "Position"
-msgstr "Posizione"
-
-msgid "Define the position of OSD."
-msgstr "Definisci la posizione dell'OSD."
-
-msgid "Define the height of OSD."
-msgstr "Definisci l'altezza dell'OSD."
-
-msgid "Horizontal offset"
-msgstr "Limite orizzontale"
-
-msgid "Define the horizontal offset of OSD."
-msgstr "Definisci il limite orizzontale dell'OSD."
-
-msgid "Red limit [%]"
-msgstr "Limite rosso [%]"
-
-msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr "Definisci un limite per la barra rossa, usata per indicare un cattivo segnale."
-
-msgid "Green limit [%]"
-msgstr "Limite verde [%]"
-
-msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr "Definisci un limite per la barra verde, usata per indicare un buon segnale."
-
-msgid "OSD update interval [0.1s]"
-msgstr "Intervallo agg. OSD [0.1s]"
-
-msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "Definisci un intervallo per gli agg. OSD. Pi<50> piccolo <20> l'intervallo maggiore sar<61> l'uso di CPU."
-
-msgid "Analyze stream"
-msgstr "Analizza flusso"
-
-msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "Definisci se il flusso DVB <20> analizzato e i bitrate calcolati."
-
-msgid "Calculation interval [0.1s]"
-msgstr "Intervallo di calcolo [0.1s]"
-
-msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "Definisci un intervallo di calcolo. L'intervallo pi<70> grande genera valori pi<70> stabili."
-
-msgid "Use SVDRP service"
-msgstr "Utilizza servizio SVDRP"
-
-msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "Definisci se il servizio SVDRP viene usato nelle opzioni client/server."
-
-msgid "SVDRP service port"
-msgstr "Porta servizio SVDRP"
-
-msgid "Define the port number of SVDRP service."
-msgstr "Definisci il numero di porta del servizio SVDRP."
-
-msgid "SVDRP service IP"
-msgstr "IP servizio SVDRP"
-
-msgid "Define the IP address of SVDRP service."
-msgstr "Definisci l'indirizzo IP del servizio SVDRP."
-
-msgid "Help"
-msgstr "Aiuto"
-
-msgid "Video"
-msgstr "Video"
-
-msgid "Audio"
-msgstr "Audio"
-
-msgid "Transponder Information"
-msgstr "Informazioni transponder"
-
-msgid "Apid"
-msgstr "PID Audio"
-
-msgid "Dpid"
-msgstr "PID AC3"
-
-msgid "Spid"
-msgstr "Spid"
-
-msgid "Nid"
-msgstr "Nid"
-
-msgid "Tid"
-msgstr "Tid"
-
-msgid "Rid"
-msgstr "Rid"
-
-msgid "Coderate"
-msgstr "Coderate"
-
-msgid "Stream Information"
-msgstr "Informazioni flusso"
-
-msgid "Video Stream"
-msgstr "Flusso video"
-
-msgid "Codec"
-msgstr "Codifica"
-
-msgid "Bitrate"
-msgstr "Bitrate"
-
-msgid "Aspect Ratio"
-msgstr "Formato immagine"
-
-msgid "Frame Rate"
-msgstr "Frame rate"
-
-msgid "Video Format"
-msgstr "Formato video"
-
-msgid "Resolution"
-msgstr "Risoluzione"
-
-msgid "Audio Stream"
-msgstr "Flusso audio"
-
-msgid "Channel Mode"
-msgstr "Modalit<69> canale"
-
-msgid "Sampling Frequency"
-msgstr "Frequenza campionamento"
-
-msgid "AC-3 Stream"
-msgstr "Flusso AC-3"
-
-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 "MPEG-2"
-msgstr "MPEG-2"
-
-msgid "H.264"
-msgstr "H.264"
-
-msgid "MPEG-1 Layer I"
-msgstr "MPEG-1 Layer I"
-
-msgid "MPEG-1 Layer II"
-msgstr "MPEG-1 Layer II"
-
-msgid "MPEG-1 Layer III"
-msgstr "MPEG-1 Layer III"
-
-msgid "MPEG-2 Layer I"
-msgstr "MPEG-2 Layer I"
-
-msgid "MPEG-2 Layer II"
-msgstr "MPEG-2 Layer II"
-
-msgid "MPEG-2 Layer III"
-msgstr "MPEG-2 Layer III"
-
-msgid "HE-AAC"
-msgstr "HE-AAC"
-
-msgid "stereo"
-msgstr "stereo"
-
-msgid "joint Stereo"
-msgstr "joint Stereo"
-
-msgid "dual"
-msgstr "dual"
-
-msgid "mono"
-msgstr "mono"
-
-msgid "MHz"
-msgstr "MHz"
-
-msgid "interlaced"
-msgstr "interlacciato"
-
-msgid "progressive"
-msgstr "progressivo"
-
-msgid "reserved"
-msgstr "riservato"
-
-msgid "extended"
-msgstr "esteso"
-
-msgid "unknown"
-msgstr "sconosciuto"
-
-msgid "component"
-msgstr "componente"
-
-msgid "PAL"
-msgstr "PAL"
-
-msgid "NTSC"
-msgstr "NTSC"
-
-msgid "SECAM"
-msgstr "SECAM"
-
-msgid "MAC"
-msgstr "MAC"
-
-msgid "Hz"
-msgstr "Hz"
-
-msgid "Complete Main (CM)"
-msgstr "Principale (P)"
-
-msgid "Music and Effects (ME)"
-msgstr "Musica ed effetti (ME)"
-
-msgid "Visually Impaired (VI)"
-msgstr "Non vedenti (NV)"
-
-msgid "Hearing Impaired (HI)"
-msgstr "Non udenti (NU)"
-
-msgid "Dialogue (D)"
-msgstr "Dialogui (D)"
-
-msgid "Commentary (C)"
-msgstr "Commenti (C)"
-
-msgid "Emergency (E)"
-msgstr "Emergenza (E)"
-
-msgid "Voice Over (VO)"
-msgstr "Voce su (VS)"
-
-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"

po/ru_RU.po

@@ -1,388 +0,0 @@
-# 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.6.5\n"
-"Report-Msgid-Bugs-To: Rolf Ahrenberg\n"
-"POT-Creation-Date: 2008-12-16 12:08+0200\n"
-"PO-Revision-Date: 2007-08-12 23:22+0300\n"
-"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"
-msgstr ""
-
-msgid "basic"
-msgstr ""
-
-msgid "transponder"
-msgstr ""
-
-msgid "stream"
-msgstr ""
-
-msgid "AC-3"
-msgstr "AC-3"
-
-msgid "Classic"
-msgstr ""
-
-msgid "Elchi"
-msgstr "Elchi"
-
-msgid "ST:TNG"
-msgstr "ST:TNG"
-
-msgid "DeepBlue"
-msgstr "DeepBlue"
-
-msgid "Moronimo"
-msgstr "Moronimo"
-
-msgid "Enigma"
-msgstr "Enigma"
-
-msgid "EgalsTry"
-msgstr "EgalsTry"
-
-msgid "Duotone"
-msgstr "Duotone"
-
-msgid "SilverGreen"
-msgstr "SilverGreen"
-
-msgid "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 menu 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 "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 "Coderate"
-msgstr "Coderate"
-
-msgid "Stream Information"
-msgstr ""
-
-msgid "Video Stream"
-msgstr ""
-
-msgid "Codec"
-msgstr ""
-
-msgid "Bitrate"
-msgstr ""
-
-msgid "Aspect Ratio"
-msgstr ""
-
-msgid "Frame Rate"
-msgstr ""
-
-msgid "Video Format"
-msgstr ""
-
-msgid "Resolution"
-msgstr ""
-
-msgid "Audio Stream"
-msgstr ""
-
-msgid "Channel Mode"
-msgstr ""
-
-msgid "Sampling Frequency"
-msgstr ""
-
-msgid "AC-3 Stream"
-msgstr ""
-
-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 "MPEG-2"
-msgstr ""
-
-msgid "H.264"
-msgstr ""
-
-msgid "MPEG-1 Layer I"
-msgstr ""
-
-msgid "MPEG-1 Layer II"
-msgstr ""
-
-msgid "MPEG-1 Layer III"
-msgstr ""
-
-msgid "MPEG-2 Layer I"
-msgstr ""
-
-msgid "MPEG-2 Layer II"
-msgstr ""
-
-msgid "MPEG-2 Layer III"
-msgstr ""
-
-msgid "HE-AAC"
-msgstr ""
-
-msgid "stereo"
-msgstr ""
-
-msgid "joint Stereo"
-msgstr ""
-
-msgid "dual"
-msgstr ""
-
-msgid "mono"
-msgstr ""
-
-msgid "MHz"
-msgstr "<22><><EFBFBD>"
-
-msgid "interlaced"
-msgstr ""
-
-msgid "progressive"
-msgstr ""
-
-msgid "reserved"
-msgstr ""
-
-msgid "extended"
-msgstr ""
-
-msgid "unknown"
-msgstr ""
-
-msgid "component"
-msgstr ""
-
-msgid "PAL"
-msgstr "PAL"
-
-msgid "NTSC"
-msgstr "NTSC"
-
-msgid "SECAM"
-msgstr ""
-
-msgid "MAC"
-msgstr ""
-
-msgid "Hz"
-msgstr "<22><>"
-
-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>"

svdrpservice.h

@@ -1,39 +0,0 @@
-/*
- * 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

symbols/ar11.xpm

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

symbols/ar169.xpm

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

symbols/ar2211.xpm

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

symbols/ar43.xpm

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

symbols/carrier.xpm

@@ -1,24 +0,0 @@
-/* XPM */
-static const char *const carrier_xpm[] = {
-"96 19 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++............................................................................................++",
-"++............................................................................................++",
-"++...........+++++.......+++++.....++++++++....++++++++....+++...++++++++...++++++++..........++",
-"++..........+++++++......+++++.....+++++++++...+++++++++...+++...++++++++...+++++++++.........++",
-"++..........+++.++++.....+++++.....+++...+++...+++...+++...+++...+++........+++...+++.........++",
-"++.........+++...++.....+++.+++....+++...+++...+++...+++...+++...+++........+++...+++.........++",
-"++.........+++..........+++.+++....++++++++....++++++++....+++...+++++++....++++++++..........++",
-"++.........+++..........+++.+++....+++++++.....+++++++.....+++...+++++++....+++++++...........++",
-"++.........+++.........+++...+++...+++..+++....+++..+++....+++...+++........+++..+++..........++",
-"++.........+++...++....+++++++++...+++..+++....+++..+++....+++...+++........+++..+++..........++",
-"++..........+++.++++...+++++++++...+++...+++...+++...+++...+++...+++........+++...+++.........++",
-"++..........+++++++...+++.....+++..+++...+++...+++...+++...+++...++++++++...+++...+++.........++",
-"++...........+++++....+++.....+++..+++....+++..+++....+++..+++...++++++++...+++....+++........++",
-"++............................................................................................++",
-"++............................................................................................++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"};

symbols/device.xpm

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

symbols/dolbydigital.xpm

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

symbols/dolbydigital20.xpm

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

symbols/dolbydigital51.xpm

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

symbols/encrypted.xpm

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

symbols/five.xpm

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

symbols/four.xpm

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

symbols/h264.xpm

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

symbols/lock.xpm

@@ -1,24 +0,0 @@
-/* XPM */
-static const char *const lock_xpm[] = {
-"96 19 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++............................................................................................++",
-"++............................................................................................++",
-"++........................+++........+++++........+++++.....+++....+++........................++",
-"++........................+++.......++++++++.....+++++++....+++...+++.........................++",
-"++........................+++.......+++..+++.....+++.++++...+++..+++..........................++",
-"++........................+++......+++....+++...+++...++....+++.+++...........................++",
-"++........................+++......+++....+++...+++.........+++++++...........................++",
-"++........................+++......+++....+++...+++.........++++.+++..........................++",
-"++........................+++......+++....+++...+++.........+++..+++..........................++",
-"++........................+++......+++....+++...+++...++....+++...+++.........................++",
-"++........................+++.......+++..+++.....+++.++++...+++...+++.........................++",
-"++........................+++++++...++++++++.....+++++++....+++....+++........................++",
-"++........................+++++++.....++++........+++++.....+++.....+++.......................++",
-"++............................................................................................++",
-"++............................................................................................++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"};

symbols/monoleft.xpm

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

symbols/monoright.xpm

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

symbols/mpeg2.xpm

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

symbols/ntsc.xpm

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

symbols/one.xpm

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

symbols/pal.xpm

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

symbols/seven.xpm

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

symbols/signal.xpm

@@ -1,24 +0,0 @@
-/* XPM */
-static const char *const signal_xpm[] = {
-"96 19 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++............................................................................................++",
-"++............................................................................................++",
-"++.................+++++....+++......+++++.....+++....+++.....+++++.....+++...................++",
-"++...............++++++++...+++....++++++++....++++...+++.....+++++.....+++...................++",
-"++...............+++..+++...+++....+++..++++...+++++..+++.....+++++.....+++...................++",
-"++...............+++........+++...+++....++....+++++..+++....+++.+++....+++...................++",
-"++...............++++++.....+++...+++..........++++++.+++....+++.+++....+++...................++",
-"++................++++++....+++...+++..+++++...+++.++.+++....+++.+++....+++...................++",
-"++..................+++++...+++...+++..+++++...+++.++++++...+++...+++...+++...................++",
-"++...............+++..+++...+++...+++....+++...+++..+++++...+++++++++...+++...................++",
-"++...............+++..+++...+++....+++...+++...+++..+++++...+++++++++...+++...................++",
-"++................++++++....+++....+++++++++...+++...++++..+++.....+++..+++++++...............++",
-"++.................++++.....+++......+++++.....+++....+++..+++.....+++..+++++++...............++",
-"++............................................................................................++",
-"++............................................................................................++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"};

symbols/six.xpm

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

symbols/stereo.xpm

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

symbols/svdrp.xpm

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

symbols/sync.xpm

@@ -1,24 +0,0 @@
-/* XPM */
-static const char *const sync_xpm[] = {
-"96 19 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++............................................................................................++",
-"++............................................................................................++",
-"++.........................+++++...+++.....+++..+++....+++.....+++++..........................++",
-"++.......................++++++++...+++...+++...++++...+++....+++++++.........................++",
-"++.......................+++..+++....+++.+++....+++++..+++....+++.++++........................++",
-"++.......................+++.........+++.+++....+++++..+++...+++...++.........................++",
-"++.......................++++++.......+++++.....++++++.+++...+++..............................++",
-"++........................++++++......+++++.....+++.++.+++...+++..............................++",
-"++..........................+++++......+++......+++.++++++...+++..............................++",
-"++.......................+++..+++......+++......+++..+++++...+++...++.........................++",
-"++.......................+++..+++......+++......+++..+++++....+++.++++........................++",
-"++........................++++++.......+++......+++...++++....+++++++.........................++",
-"++.........................++++........+++......+++....+++.....+++++..........................++",
-"++............................................................................................++",
-"++............................................................................................++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"};

symbols/three.xpm

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

symbols/two.xpm

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

symbols/viterbi.xpm

@@ -1,24 +0,0 @@
-/* XPM */
-static const char *const viterbi_xpm[] = {
-"96 19 2 1",
-".	c #FFFFFF",
-"+	c #000000",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++............................................................................................++",
-"++............................................................................................++",
-"++............+++.....+++..+++...+++++++++..++++++++...++++++++....++++++++....+++............++",
-"++.............++.....++...+++...+++++++++..++++++++...+++++++++...+++++++++...+++............++",
-"++.............+++...+++...+++......+++.....+++........+++...+++...+++...+++...+++............++",
-"++.............+++...+++...+++......+++.....+++........+++...+++...+++...+++...+++............++",
-"++..............++...++....+++......+++.....+++++++....++++++++....++++++++....+++............++",
-"++..............+++.+++....+++......+++.....+++++++....+++++++.....++++++++....+++............++",
-"++..............+++.+++....+++......+++.....+++........+++..+++....+++...+++...+++............++",
-"++...............++.++.....+++......+++.....+++........+++..+++....+++...+++...+++............++",
-"++...............+++++.....+++......+++.....+++........+++...+++...+++...+++...+++............++",
-"++...............+++++.....+++......+++.....++++++++...+++...+++...+++++++++...+++............++",
-"++................+++......+++......+++.....++++++++...+++....+++..++++++++....+++............++",
-"++............................................................................................++",
-"++............................................................................................++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
-"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"};

symbols/zero.xpm

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