Backported changes and fixes from version 0.1.6.

HISTORY

@@ -106,98 +106,3 @@ VDR Plugin 'femon' Revision History
 
 - 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<74>).
-
-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).

Makefile

@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
@@ -44,20 +44,13 @@ INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
-ifdef FEMON_NTSC
+ifdef NTSC_SYSTEM
-DEFINES += -DFEMON_NTSC
+DEFINES += -DNTSC_SYSTEM
 endif
 
-ifdef FEMON_DEBUG
-DEFINES += -DFEMON_DEBUG
-endif
-
-.PHONY: all all-redirect
-all-redirect: all
-
 ### The object files (add further files here):
 
-OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femoni18n.o femontools.o
+OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femoni18n.o
 
 ### Implicit rules:
 
@@ -80,9 +73,6 @@ all: libvdr-$(PLUGIN).so
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
-ifndef FEMON_DEBUG
-	strip $(LIBDIR)/$@.$(VDRVERSION)
-endif
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)

README

@@ -21,14 +21,16 @@ transponder and stream information are also available in advanced display modes.
 
 The plugin is based on a neat console frontend status monitor application
 called 'femon' by Johannes Stezenbach (see DVB-apps/szap/femon.c for further
-information). The bitrate calculation trick originates from the 'dvbstream'
+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.
+bitrate calculation algorithm originates from the 'dvbstream' application by
+Dave Chapman and the stream information routines from the 'libdvb' library by
+Metzler Brothers.
 
 Terminology:
 
 --------------------------------------------------------------
-|## Channel Name ########################## [AR][VF][A/DD][D]|
+|## Channel Name ######################### [DD][AR][VF][A][D]|
 |[=====Signal Strength in % ==============|=================]|
 |[=====Signal-to-Noise Ratio in % ========|=================]|
 | STR: #0000 (0%)       BER: #00000000       Video: 0 Mbit/s |
@@ -49,9 +51,10 @@ CARRIER - Found a DVB signal
 VITERBI - FEC (forward error correction) is stable
 SYNC    - Found sync bytes
 
+DD      - AC-3 stream (optional)
 AR      - Aspect Ratio: 1:1/4:3/16:9/2.21:1 (optional)
 VF      - Video format: PAL/NTSC (optional)
-A/DD    - Audio (0..5) / AC-3 track (optional)
+A       - Audio track: 1..2 (optional)
 D       - Device number: 0..3 (optional)
 
 Controls:
@@ -60,10 +63,9 @@ 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
+Right/Left    - Switch to next/previous device that provides the current channel
-Yellow        - Select audio channel: stereo, mono left, mono right
+Green         - Select language (APID)
 Back          - Exit plugin
-Left/Right    - Switch to next/previous device that provides the current channel
 
 Installation:
 
@@ -77,18 +79,17 @@ make plugins
 
 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.
-
+- Shrinked OSD is available for NTSC users: make NTSC_SYSTEM=1
-- If the OSD isn't visible, you've configured the OSD height too big or too
+- The device switching feature is still non-functional.
-  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
-  compiling the plugin with: make FEMON_NTSC=1
 
 "Femon - A real womon who lives according to her natural feminine inclinations."

femon.c

@@ -6,31 +6,26 @@
  * $Id$
  */
 
-#include <vdr/remote.h>
 #include "femoncfg.h"
 #include "femoni18n.h"
 #include "femonreceiver.h"
 #include "femonosd.h"
-#include "femonservice.h"
-#include "femontools.h"
 #include "femon.h"
 
-#if defined(VDRVERSNUM) && VDRVERSNUM < 10340
+#if VDRVERSNUM && VDRVERSNUM >= 10307
-#error "You don't exist! Go away! Upgrade yourself!"
+#error "You don't exist! Go away!"
 #endif
 
-cPluginFemon::cPluginFemon()
+cPluginFemon::cPluginFemon(void)
 {
   // 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)
@@ -58,11 +53,6 @@ bool cPluginFemon::Start(void)
   return true;
 }
 
-void cPluginFemon::Stop(void)
-{
-  // Stop the background activities.
-}
-
 void cPluginFemon::Housekeeping(void)
 {
   // Perform any cleanup or other regular tasks.
@@ -71,8 +61,7 @@ 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();
-  return cFemonOsd::Instance(true);
 }
 
 bool cPluginFemon::SetupParse(const char *Name, const char *Value)
@@ -82,10 +71,6 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "SyslogOutput"))   femonConfig.syslogoutput   = atoi(Value);
   else if (!strcasecmp(Name, "DisplayMode"))    femonConfig.displaymode    = atoi(Value);
   else if (!strcasecmp(Name, "Position"))       femonConfig.position       = atoi(Value);
-  else if (!strcasecmp(Name, "OSDHeight"))      femonConfig.osdheight      = atoi(Value);
-  else if (!strcasecmp(Name, "OSDOffset"))      femonConfig.osdoffset      = atoi(Value);
-  else if (!strcasecmp(Name, "Skin"))           femonConfig.skin           = atoi(Value);
-  else if (!strcasecmp(Name, "Theme"))          femonConfig.theme          = atoi(Value);
   else if (!strcasecmp(Name, "ShowCASystem"))   femonConfig.showcasystem   = atoi(Value);
   else if (!strcasecmp(Name, "RedLimit"))       femonConfig.redlimit       = atoi(Value);
   else if (!strcasecmp(Name, "GreenLimit"))     femonConfig.greenlimit     = atoi(Value);
@@ -94,150 +79,17 @@ bool cPluginFemon::SetupParse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "CalcInterval"))   femonConfig.calcinterval   = atoi(Value);
   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) && 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.",
-    "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 uncorrcted 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 (!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, "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("%.2f Mbit/s on device #%d", 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("%.0f kbit/s on device #%d", 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("%.0f kbit/s on device #%d", cFemonOsd::Instance()->GetDolbyBitrate(), cDevice::ActualDevice()->CardIndex());
-     else
-        return cString::sprintf("--- kbit/s on device #%d", cDevice::ActualDevice()->CardIndex());
-     }
-  return NULL;
-}
-
 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[eFemonThemeDeepBlue]      = tr("DeepBlue");
-  themes[eFemonThemeMoronimo]      = tr("Moronimo");
-  themes[eFemonThemeEnigma]        = tr("Enigma");
-  themes[eFemonThemeEgalsTry]      = tr("EgalsTry");
-  themes[eFemonThemeDuotone]       = tr("Duotone");
-
-  data = femonConfig;
   Setup();
 }
 
@@ -246,21 +98,17 @@ void cMenuFemonSetup::Setup(void)
   int current = Current();
 
   Clear();
-  Add(new cMenuEditBoolItem(  tr("Hide main menu entry"),        &data.hidemenu,       tr("no"),            tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Hide Mainmenu Entry"),         &femonConfig.hidemenu,       tr("no"),      tr("yes")));
-  Add(new cMenuEditBoolItem(  tr("Use syslog output"),           &data.syslogoutput,   tr("no"),            tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),      tr("yes")));
-  Add(new cMenuEditStraItem(  tr("Default display mode"),        &data.displaymode,    eFemonModeMaxNumber, dispmodes));
+  Add(new cMenuEditStraItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    modeMaxNumber, dispmodes));
-  Add(new cMenuEditStraItem(  tr("Skin"),                        &data.skin,           eFemonSkinMaxNumber, skins));
+  Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"),  tr("top")));
-  Add(new cMenuEditStraItem(  tr("Theme"),                       &data.theme,          eFemonThemeMaxNumber,themes));
+  Add(new cMenuEditBoolItem(  tr("Show CA System"),              &femonConfig.showcasystem,   tr("no"),      tr("yes")));
-  Add(new cMenuEditBoolItem(  tr("Position"),                    &data.position,       tr("bottom"),        tr("top")));
+  Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,             50));
-  Add(new cMenuEditIntItem(   tr("Height"),                      &data.osdheight,      400,                 500));
+  Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,            100));
-  Add(new cMenuEditIntItem(   tr("Horizontal offset"),           &data.osdoffset,      -50,                 50));
+  Add(new cMenuEditIntItem(   tr("OSD Update Interval [0.1s]"),  &femonConfig.updateinterval, 1,             100));
-  Add(new cMenuEditBoolItem(  tr("Show CA system"),              &data.showcasystem,   tr("no"),            tr("yes")));
+  Add(new cMenuEditBoolItem(  tr("Analyze Stream"),              &femonConfig.analyzestream,  tr("no"),      tr("yes")));
-  Add(new cMenuEditIntItem(   tr("Red limit [%]"),               &data.redlimit,       1,                   50));
-  Add(new cMenuEditIntItem(   tr("Green limit [%]"),             &data.greenlimit,     51,                  100));
-  Add(new cMenuEditIntItem(   tr("OSD update interval [0.1s]"),  &data.updateinterval, 1,                   100));
-  Add(new cMenuEditBoolItem(  tr("Analyze stream"),              &data.analyzestream,  tr("no"),            tr("yes")));
   if (femonConfig.analyzestream)
-     Add(new cMenuEditIntItem(tr("Calculation interval [0.1s]"), &data.calcinterval,   1,                   100));
+     Add(new cMenuEditIntItem(tr("Calculation Interval [0.1s]"), &femonConfig.calcinterval,   1,             100));
 
   SetCurrent(Get(current));
   Display();
@@ -268,16 +116,10 @@ void cMenuFemonSetup::Setup(void)
 
 void cMenuFemonSetup::Store(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  femonConfig = data;
   SetupStore("HideMenu",       femonConfig.hidemenu);
   SetupStore("SyslogOutput",   femonConfig.syslogoutput);
   SetupStore("DisplayMode",    femonConfig.displaymode);
-  SetupStore("Skin",           femonConfig.skin);
-  SetupStore("Theme",          femonConfig.theme);
   SetupStore("Position",       femonConfig.position);
-  SetupStore("OSDHeight",      femonConfig.osdheight);
-  SetupStore("OSDOffset",      femonConfig.osdoffset);
   SetupStore("ShowCASystem",   femonConfig.showcasystem);
   SetupStore("RedLimit",       femonConfig.redlimit);
   SetupStore("GreenLimit",     femonConfig.greenlimit);
@@ -288,11 +130,11 @@ void cMenuFemonSetup::Store(void)
 
 eOSState cMenuFemonSetup::ProcessKey(eKeys Key)
 {
-  int oldAnalyzestream = data.analyzestream;
+  int oldAnalyzestream = femonConfig.analyzestream;
 
   eOSState state = cMenuSetupPage::ProcessKey(Key);
 
-  if (Key != kNone && (data.analyzestream != oldAnalyzestream)) {
+  if (Key != kNone && (femonConfig.analyzestream != oldAnalyzestream)) {
      Setup();
      }
 

femon.h

@@ -11,11 +11,13 @@
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.9.6";
+static const char *VERSION        = "0.0.7";
 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();
@@ -25,23 +27,16 @@ public:
   virtual bool ProcessArgs(int argc, char *argv[]);
   virtual bool Initialize(void);
   virtual bool Start(void);
-  virtual void Stop(void);
   virtual void Housekeeping(void);
   virtual const char *MainMenuEntry(void) { return (femonConfig.hidemenu ? NULL : tr(MAINMENUENTRY)); }
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);
   virtual bool SetupParse(const char *Name, const char *Value);
-  virtual bool Service(const char *Id, void *Data);
-  virtual const char **SVDRPHelpPages(void);
-  virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
   };
 
 class cMenuFemonSetup : public cMenuSetupPage {
   private:
-    const char *dispmodes[eFemonModeMaxNumber];
+    const char *dispmodes[modeMaxNumber];
-    const char *skins[eFemonSkinMaxNumber];
-    const char *themes[eFemonThemeMaxNumber];
-    cFemonConfig data;
     virtual void Setup(void);
   protected:
     virtual eOSState ProcessKey(eKeys Key);

femoncfg.c

@@ -14,8 +14,6 @@ cFemonConfig::cFemonConfig(void)
 {
   hidemenu       = 0;
   displaymode    = 0;
-  skin           = 0;
-  theme          = 0;
   position       = 1;
   redlimit       = 33;
   greenlimit     = 66;
@@ -24,98 +22,4 @@ cFemonConfig::cFemonConfig(void)
   calcinterval   = 20;
   syslogoutput   = 0;
   showcasystem   = 0;
-#ifdef FEMON_NTSC
-  osdheight      = 420;
-#else
-  osdheight      = 480;
-#endif
-  osdoffset      = 0;
 }
-
-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
-  },
-  {
-    // 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
-  },
-};

femoncfg.h

@@ -9,14 +9,13 @@
 #ifndef __FEMONCFG_H
 #define __FEMONCFG_H
 
-enum eFemonModes
+enum dispModes {
-{
+  modeBasic,
-  eFemonModeBasic,
+  modeTransponder,
-  eFemonModeTransponder,
+  modeStream,
-  eFemonModeStream,
+  modeAC3,
-  eFemonModeAC3,
+  modeMaxNumber
-  eFemonModeMaxNumber
+  };
-};
 
 struct cFemonConfig
 {
@@ -24,8 +23,6 @@ public:
   cFemonConfig(void);
   int hidemenu;
   int displaymode;
-  int skin;
-  int theme;
   int position;
   int redlimit;
   int greenlimit;
@@ -34,44 +31,8 @@ public:
   int calcinterval;
   int syslogoutput;
   int showcasystem;
-  int osdheight;
-  int osdoffset;
 };
 
 extern cFemonConfig femonConfig;
 
-enum eFemonSkins
-{
-  eFemonSkinClassic,
-  eFemonSkinElchi,
-  eFemonSkinMaxNumber
-};
-
-enum eFemonThemes
-{
-  eFemonThemeClassic,
-  eFemonThemeElchi,
-  eFemonThemeDeepBlue,
-  eFemonThemeMoronimo,
-  eFemonThemeEnigma,
-  eFemonThemeEgalsTry,
-  eFemonThemeDuotone,
-  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

femonclient-0.0.1/COPYING

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

femonclient-0.0.1/HISTORY

@@ -1,6 +0,0 @@
-VDR Plugin 'femonclient' Revision History
------------------------------------------
-
-2005-08-28: Version 0.0.1
-
-- Initial revision.

femonclient-0.0.1/Makefile

@@ -1,82 +0,0 @@
-#
-# Makefile for a Video Disk Recorder plugin
-#
-# $Id: Makefile 1.1 2005/08/21 10:43:12 kls Exp $
-
-# The official name of this plugin.
-# This name will be used in the '-P...' option of VDR to load the plugin.
-# By default the main source file also carries this name.
-#
-PLUGIN = femonclient
-
-### The version number of this plugin (taken from the main source file):
-
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
-
-### The directory environment:
-
-DVBDIR = ../../../../DVB
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
-
-### Allow user defined options to overwrite defaults:
-
--include $(VDRDIR)/Make.config
-
-### The version number of VDR (taken from VDR's "config.h"):
-
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-
-### The name of the distribution archive:
-
-ARCHIVE = svcintf-$(VERSION)
-PACKAGE = vdr-$(ARCHIVE)
-
-### Includes and Defines (add further entries here):
-
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR)/PLUGINS/src/femon/
-
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o
-
-### Implicit rules:
-
-%.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
-
-# Dependencies:
-
-MAKEDEP = g++ -MM -MG
-DEPFILE = .dependencies
-$(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
-
--include $(DEPFILE)
-
-### Targets:
-
-all: libvdr-$(PLUGIN).so
-
-libvdr-$(PLUGIN).so: $(PLUGIN).o
-	$(CXX) $(CXXFLAGS) -shared $(PLUGIN).o -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
-
-dist: clean
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@mkdir $(TMPDIR)/$(ARCHIVE)
-	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution package created as $(PACKAGE).tgz
-
-clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~

femonclient-0.0.1/README

@@ -1,14 +0,0 @@
-This is a "plugin" for the Video Disk Recorder (VDR).
-
-Written by:                  R o l f . A h r e n b e r g @ s c i . f i
-
-Project's homepage:          http://www.saunalahti.fi/~rahrenbe/vdr/femon/
-
-Latest version available at: http://www.saunalahti.fi/~rahrenbe/vdr/femon/
-
-See the file COPYING for license information.
-
-Description:
-
-Demo client for the service interface of the Femon plugin.
-

femonclient-0.0.1/femonclient.c

@@ -1,51 +0,0 @@
-/*
- * femonclient.c: Demo femon service client plugin
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id: $
- */
-
-#include <stdlib.h>
-#include <vdr/interface.h>
-#include <vdr/plugin.h>
-#include "femonservice.h"
-
-static const char *VERSION        = "0.0.1";
-static const char *DESCRIPTION    = "Femon client";
-static const char *MAINMENUENTRY  = "Show frontend statistic on console";
-
-class cPluginFemonClient : public cPlugin {
-public:
-  virtual const char *Version(void) { return VERSION; }
-  virtual const char *Description(void) { return DESCRIPTION; }
-  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
-  virtual cOsdObject *MainMenuAction(void);
-  };
-
-// --- cPluginFemonClient ----------------------------------------------------------
-
-cOsdObject *cPluginFemonClient::MainMenuAction(void)
-{
-  FemonService_v1_0 femon;
-  cPlugin *p;
-
-  p = cPluginManager::CallFirstService("FemonService-v1.0", &femon);
-  if (p) {
-     printf("Device : %s\n", *femon.fe_name);
-     printf("Status : %s\n", *femon.fe_status);
-     printf("Signal : %04X (%2d%%)\n", femon.fe_signal, femon.fe_signal / 655);
-     printf("SNR    : %04X (%2d%%)\n", femon.fe_snr, femon.fe_snr / 655);
-     printf("BER    : %08X\n", femon.fe_ber);
-     printf("UNC    : %08X\n", femon.fe_unc);
-     printf("Video  : %.2f Mbit/s\n", femon.video_bitrate);
-     printf("Audio  : %.0f kbit/s\n", femon.audio_bitrate);
-     printf("Dolby  : %.0f kbit/s\n", femon.dolby_bitrate);
-     }
-  else
-     printf("\n--- No support for FemonService-v1.0 found ---\n");
-
-  return NULL;
-}
-
-VDRPLUGINCREATOR(cPluginFemonClient); // Don't touch this!

femoni18n.h

@@ -9,6 +9,7 @@
 #ifndef __FEMONI18N_H
 #define __FEMONI18N_H
 
+#include <vdr/config.h> // for VDRVERSNUM
 #include <vdr/i18n.h>
 
 extern const tI18nPhrase Phrases[];

femonosd.h

@@ -16,53 +16,41 @@
 #include <vdr/thread.h>
 #include <vdr/status.h>
 #include <vdr/channels.h>
-#include <vdr/transfer.h>
+#include <vdr/font.h>
-#include <vdr/tools.h>
 
 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
-  static cFemonOsd *pInstance;
+  bool m_Active;
-  cOsd *m_Osd;
+  cOsdBase *m_Osd;
+  tWindowHandle m_InfoWindow;
+  tWindowHandle m_StatusWindow;
   cFemonReceiver *m_Receiver;
   int m_Frontend;
   struct dvb_frontend_info m_FrontendInfo;
   int m_Number;
   int m_OldNumber;
+  int m_InputTime;
   uint16_t m_SNR;
   uint16_t m_Signal;
   uint32_t m_BER;
   uint32_t m_UNC;
   fe_status_t m_FrontendStatus;
   int m_DisplayMode;
-  const cFont *m_Font;
+  eDvbFont m_Font;
-  cTimeMs m_InputTime;
   cMutex* m_Mutex;
-  static cBitmap bmStereo, bmMonoLeft, bmMonoRight, bmDD, bmDD20, bmDD51;
-  static cBitmap bmZero, bmDevice, bmPAL, bmNTSC, bmOne, bmTwo, bmThree, bmFour, bmFive;
-  static cBitmap bmAspectRatio_1_1, bmAspectRatio_16_9, bmAspectRatio_2_21_1, bmAspectRatio_4_3;
-  static cBitmap bmLock, bmSignal, bmCarrier, bmViterbi, bmSync;
   void DrawStatusWindow(void);
   void DrawInfoWindow(void);
 
 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

@@ -7,7 +7,6 @@
  */
 
 #include <unistd.h>
-#include "femontools.h"
 #include "femoncfg.h"
 #include "femonreceiver.h"
 
@@ -17,13 +16,18 @@
 #define PAYLOAD       0x10
 #define PTS_DTS_FLAGS 0xC0
 
-cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[])
+cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid)
-:cReceiver(Ca, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
+#if VDRVERSNUM >= 10300
+:cReceiver(Ca, -1, 3, Vpid, Apid, Dpid), cThread("femon receiver")
+#else
+:cReceiver(Ca, -1, 3, Vpid, Apid, Dpid)
+#endif
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  //printf("cFemonReceiver::cFemonReceiver()\n");
+  m_Active = false;
   m_VideoPid = Vpid;
-  m_AudioPid = Apid[0];
+  m_AudioPid = Apid;
-  m_AC3Pid = Dpid[0];
+  m_AC3Pid = Dpid;      
   m_VideoValid = false;
   m_VideoPacketCount = 0;
   m_VideoHorizontalSize = 0;
@@ -57,18 +61,21 @@ cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[])
  
 cFemonReceiver::~cFemonReceiver(void)
 {
-  Dprintf("%s()\n", __PRETTY_FUNCTION__);
+  //printf("cFemonReceiver::~cFemonReceiver()\n");
-  if (Running())
+  if (m_Active) {
-     Cancel(3);
+     m_Active = false;
+     Cancel(0);
+     }
 }
 
 /* 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;
+  m_VideoValid = false;
   while ((found < 4) && ((c + 4) < count)) {
     uint8_t *b;
     b = mbuf + c;
@@ -157,11 +164,12 @@ static unsigned int samplerates[4] =
 /* The following function originates from libdvbmpeg: */
 void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count)
 {
+  //printf("cFemonReceiver::GetAudioInfo()\n");
   uint8_t *headr;
   int found = 0;
   int c = 0;
   int tmp = 0;
-  //m_AudioValid = false;
+  m_AudioValid = false;
   while (!found && (c < count)) {
     uint8_t *b = mbuf + c;
     if ((b[0] == 0xff) && ((b[1] & 0xf8) == 0xf8))
@@ -210,7 +218,7 @@ void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count)
   int found = 0;
   int c = 0;
   uint8_t frame;
-  //m_AC3Valid = false;
+  m_AC3Valid = false;
   while (!found && (c < count)) {
     uint8_t *b = mbuf + c;
     if ((b[0] == 0x0b) && (b[1] == 0x77))
@@ -230,84 +238,31 @@ void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count)
      m_AC3FrameSize <<= 1;
   m_AC3BitStreamMode = (headr[3] & 7);
   m_AC3AudioCodingMode = (headr[4] & 0xE0) >> 5;
-  if ((m_AC3AudioCodingMode & 0x01) && (m_AC3AudioCodingMode != 0x01)) {
+  if ((m_AC3AudioCodingMode & 0x01) && (m_AC3AudioCodingMode != 0x01)) // if 3 front channels
-     // 3 front channels
      m_AC3CenterMixLevel = (headr[4] & 0x18) >> 3;
-     if (m_AC3AudioCodingMode & 0x04) {
+  else
-        // a surround channel exists
-        m_AC3SurroundMixLevel = (headr[4] & 0x06) >> 1;
-        if (m_AC3AudioCodingMode == 0x02) {
-           // if in 2/0 mode
-           m_AC3DolbySurroundMode = ((headr[4] & 0x01) << 1) | ((headr[5] & 0x80) >> 7);
-           m_AC3LfeOn = (headr[5] & 0x40) >> 6;
-           m_AC3DialogLevel = (headr[5] & 0x3e) >> 1;
-           }
-        else {
-           m_AC3DolbySurroundMode = FR_NOTVALID;
-           m_AC3LfeOn = (headr[4] & 0x01);
-           m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
-           }
-        }
-     else {
-        m_AC3SurroundMixLevel = FR_NOTVALID;
-        if (m_AC3AudioCodingMode == 0x02) {
-           // if in 2/0 mode
-            m_AC3DolbySurroundMode = (headr[4] & 0x06) >> 1;
-            m_AC3LfeOn = (headr[4] & 0x01);
-            m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
-           }
-        else {
-           m_AC3DolbySurroundMode = FR_NOTVALID;
-           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
-           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
-           }
-        }
-     }
-  else {
      m_AC3CenterMixLevel = FR_NOTVALID;
-     if (m_AC3AudioCodingMode & 0x04) {
+  if (m_AC3AudioCodingMode & 0x04) //  if a surround channel exists
-        // a surround channel exists
+     m_AC3SurroundMixLevel = (headr[4] & 0x06) >> 1;
-        m_AC3SurroundMixLevel = (headr[4] & 0x18) >> 3;
+  else
-        if (m_AC3AudioCodingMode == 0x02) {
+     m_AC3SurroundMixLevel = FR_NOTVALID;
-           // if in 2/0 mode
+  if (m_AC3AudioCodingMode == 0x02) // if in 2/0 mode
-           m_AC3DolbySurroundMode = (headr[4] & 0x06) >> 1;
+     m_AC3DolbySurroundMode = ((headr[4] & 1) << 1) | ((headr[5] & 0x80) >> 7);
-           m_AC3LfeOn = (headr[4] & 0x01);
+  else 
-           m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
+     m_AC3DolbySurroundMode = FR_NOTVALID;
-           }
+  m_AC3LfeOn = (headr[5] & 0x40) >> 6;
-        else {
+  m_AC3DialogLevel = (headr[5] & 0x3e) >> 1;
-           m_AC3DolbySurroundMode = FR_NOTVALID;
-           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
-           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
-           }
-        }
-     else {
-        m_AC3SurroundMixLevel = FR_NOTVALID;
-        if (m_AC3AudioCodingMode == 0x02) {
-           // if in 2/0 mode
-           m_AC3DolbySurroundMode = (headr[4] & 0x18) >> 3;
-           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
-           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
-           }
-        else {
-           m_AC3DolbySurroundMode = FR_NOTVALID;
-           m_AC3LfeOn = (headr[4] & 0x10) >> 4;
-           m_AC3DialogLevel = ((headr[4] & 0x0F) << 1) | ((headr[5] & 0x80) >> 7);
-           }
-        }
-     }
 }
 
 void cFemonReceiver::Activate(bool On)
 {
-  Dprintf("%s(%d)\n", __PRETTY_FUNCTION__, On);
+  //printf("cFemonReceiver::Activate()\n");
-  if (On)
+  Start();
-     Start();
-  else
-     Cancel();
 }
 
 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]);
@@ -350,10 +305,12 @@ 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)
-  while (Running()) {
+  isyslog("femon receiver: thread started (pid = %d)", getpid());
-        t.Set(0);
+#endif
+  m_Active = true;
+  while (m_Active) {
         // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
         m_VideoBitrate = (8.0 * 184.0 * m_VideoPacketCount) / (femonConfig.calcinterval * 100000.0);
         m_VideoPacketCount = 0;
@@ -361,6 +318,9 @@ void cFemonReceiver::Action(void)
         m_AudioPacketCount = 0;
         m_AC3Bitrate   = (8.0 * 184.0 * m_AC3PacketCount)   / (femonConfig.calcinterval * 100.0);
         m_AC3PacketCount = 0;
-        cCondWait::SleepMs(100 * femonConfig.calcinterval - t.Elapsed());
+        usleep(100000L * femonConfig.calcinterval);
     }
+#if (VDRVERSNUM < 10300)
+  isyslog("femon receiver: thread stopped (pid = %d)", getpid());
+#endif
 }

femonreceiver.h

@@ -53,6 +53,7 @@ enum eDolbySurroundMode {
 
 class cFemonReceiver : public cReceiver, public cThread {
 private:
+  bool   m_Active;
   int    m_VideoPid;
   int    m_AudioPid;
   int    m_AC3Pid;
@@ -94,7 +95,7 @@ protected:
   virtual void Action(void);
 
 public:
-  cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[]);
+  cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid);
   virtual ~cFemonReceiver();
 
   bool VideoValid(void)           { return m_VideoValid; };          // boolean

femonservice.h

@@ -1,27 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id$
- */
-
-#ifndef __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
-

femontools.c

@@ -1,110 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id$
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <linux/dvb/frontend.h>
-#include "femontools.h"
-
-cString getFrontendName(int cardIndex)
-{
-  struct dvb_frontend_info value;
-  char *dev = NULL;
-
-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
-  if (fe < 0)
-     return NULL;
-  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;
-  char *dev = NULL;
-
-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
-  if (fe < 0)
-     return NULL;
-  CHECK(ioctl(fe, FE_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;
-  char *dev = NULL;
-
-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
-  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;
-  char *dev = NULL;
-
-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
-  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;
-  char *dev = NULL;
-
-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
-  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;
-  char *dev = NULL;
-
-  asprintf(&dev, FRONTEND_DEVICE, cardIndex, 0);
-  int fe = open(dev, O_RDONLY | O_NONBLOCK);
-  free(dev);
-  if (fe < 0)
-     return (value);
-  CHECK(ioctl(fe, FE_READ_UNCORRECTED_BLOCKS, &value));
-  close(fe);
-
-  return (value);
-}
-

femontools.h

@@ -1,30 +0,0 @@
-/*
- * Frontend Status Monitor plugin for the Video Disk Recorder
- *
- * See the README file for copyright information and how to reach the author.
- *
- * $Id$
- */
-
-#ifndef __FEMONTOOLS_H
-#define __FEMONTOOLS_H
-
-#include <stdint.h>
-#include <vdr/tools.h>
-
-#ifdef FEMON_DEBUG
-#define Dprintf(x...) printf(x);
-#else
-#define Dprintf(x...) ;
-#endif
-
-#define FRONTEND_DEVICE "/dev/dvb/adapter%d/frontend%d"
-
-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);
-
-#endif // __FEMONTOOLS_H

symbols/ar11.xpm

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

symbols/ar169.xpm

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

symbols/ar2211.xpm

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

symbols/ar43.xpm

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

symbols/carrier.xpm

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

symbols/device.xpm

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

symbols/dolbydigital.xpm

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

symbols/dolbydigital20.xpm

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

symbols/dolbydigital51.xpm

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

symbols/five.xpm

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

symbols/four.xpm

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

symbols/lock.xpm

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

symbols/monoleft.xpm

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

symbols/monoright.xpm

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

symbols/ntsc.xpm

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

symbols/one.xpm

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

symbols/pal.xpm

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

symbols/signal.xpm

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

symbols/stereo.xpm

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

symbols/sync.xpm

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

symbols/three.xpm

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

symbols/two.xpm

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

symbols/viterbi.xpm

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

symbols/zero.xpm

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