Backported changes and fixes from version 0.1.6.

HISTORY

@@ -106,27 +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).

Makefile

@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -fPIC
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 

README

@@ -30,7 +30,7 @@ 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 |
@@ -51,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:
@@ -62,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
-Yellow        - Select audio channel: stereo, mono left, mono right
+Right/Left    - Switch to next/previous device that provides the current channel
+Green         - Select language (APID)
 Back          - Exit plugin
-(Left/Right   - Switch to next/previous device that provides the current channel)
 
 Installation:
 
@@ -82,14 +82,14 @@ Notes:
 - The plugin supports only those DVB cards with _one_ frontend (do any cards
   with multiple frontends even exist?), because I haven't yet figured howto do
   it without patching the VDR core.
+- 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.
-- There's a shrinked default OSD height for NTSC users: make NTSC_SYSTEM=1
+- Shrinked OSD is available for NTSC users: make NTSC_SYSTEM=1
 - The device switching feature is still non-functional.
 
 "Femon - A real womon who lives according to her natural feminine inclinations."

femon.c

@@ -12,7 +12,7 @@
 #include "femonosd.h"
 #include "femon.h"
 
-#if VDRVERSNUM && VDRVERSNUM < 10319
+#if VDRVERSNUM && VDRVERSNUM >= 10307
 #error "You don't exist! Go away!"
 #endif
 
@@ -71,7 +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, "ShowCASystem"))   femonConfig.showcasystem   = atoi(Value);
   else if (!strcasecmp(Name, "RedLimit"))       femonConfig.redlimit       = atoi(Value);
   else if (!strcasecmp(Name, "GreenLimit"))     femonConfig.greenlimit     = atoi(Value);
@@ -103,7 +102,6 @@ void cMenuFemonSetup::Setup(void)
   Add(new cMenuEditBoolItem(  tr("Use Syslog Output"),           &femonConfig.syslogoutput,   tr("no"),      tr("yes")));
   Add(new cMenuEditStraItem(  tr("Default Display Mode"),        &femonConfig.displaymode,    modeMaxNumber, dispmodes));
   Add(new cMenuEditBoolItem(  tr("Position"),                    &femonConfig.position,       tr("bottom"),  tr("top")));
-  Add(new cMenuEditIntItem(   tr("Height"),                      &femonConfig.osdheight,      400,           500));
   Add(new cMenuEditBoolItem(  tr("Show CA System"),              &femonConfig.showcasystem,   tr("no"),      tr("yes")));
   Add(new cMenuEditIntItem(   tr("Red Limit [%]"),               &femonConfig.redlimit,       1,             50));
   Add(new cMenuEditIntItem(   tr("Green Limit [%]"),             &femonConfig.greenlimit,     51,            100));
@@ -122,7 +120,6 @@ void cMenuFemonSetup::Store(void)
   SetupStore("SyslogOutput",   femonConfig.syslogoutput);
   SetupStore("DisplayMode",    femonConfig.displaymode);
   SetupStore("Position",       femonConfig.position);
-  SetupStore("OSDHeight",      femonConfig.osdheight);
   SetupStore("ShowCASystem",   femonConfig.showcasystem);
   SetupStore("RedLimit",       femonConfig.redlimit);
   SetupStore("GreenLimit",     femonConfig.greenlimit);

femon.h

@@ -11,7 +11,7 @@
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.8.1";
+static const char *VERSION        = "0.0.7";
 static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
 static const char *MAINMENUENTRY  = "Signal Information";
 

femoncfg.c

@@ -22,9 +22,4 @@ cFemonConfig::cFemonConfig(void)
   calcinterval   = 20;
   syslogoutput   = 0;
   showcasystem   = 0;
-#ifdef NTSC_SYSTEM
-  osdheight      = 420;
-#else
-  osdheight      = 480;
-#endif
 }

femoncfg.h

@@ -9,12 +9,6 @@
 #ifndef __FEMONCFG_H
 #define __FEMONCFG_H
 
-#ifdef DEBUG
-#define debug(x) (x);
-#else
-#define debug(x) ;
-#endif
-
 enum dispModes {
   modeBasic,
   modeTransponder,
@@ -37,7 +31,6 @@ public:
   int calcinterval;
   int syslogoutput;
   int showcasystem;
-  int osdheight;
 };
 
 extern cFemonConfig femonConfig;

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,37 +16,34 @@
 #include <vdr/thread.h>
 #include <vdr/status.h>
 #include <vdr/channels.h>
-#include <vdr/transfer.h>
-#include <vdr/tools.h>
+#include <vdr/font.h>
 
 class cFemonOsd : public cOsdObject, public cThread, public cStatus {
 private:
   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;
-  cTimeMs m_InputTime;
+  eDvbFont m_Font;
   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;
   void DrawStatusWindow(void);
   void DrawInfoWindow(void);
 
 protected:
   virtual void Action(void);
   virtual void ChannelSwitch(const cDevice * device, int channelNumber);
-  virtual void SetAudioTrack(int Index, const char * const *Tracks);
 
 public:
   cFemonOsd(void);

femonreceiver.c

@@ -7,7 +7,6 @@
  */
 
 #include <unistd.h>
-#include <vdr/tools.h>
 #include "femoncfg.h"
 #include "femonreceiver.h"
 
@@ -17,14 +16,18 @@
 #define PAYLOAD       0x10
 #define PTS_DTS_FLAGS 0xC0
 
-cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[])
-:cReceiver(Ca, -1, Vpid, Apid, Dpid, NULL), cThread("femon receiver")
+cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid, int Dpid)
+#if VDRVERSNUM >= 10300
+:cReceiver(Ca, -1, 3, Vpid, Apid, Dpid), cThread("femon receiver")
+#else
+:cReceiver(Ca, -1, 3, Vpid, Apid, Dpid)
+#endif
 {
-  debug(printf("cFemonReceiver::cFemonReceiver()\n"));
+  //printf("cFemonReceiver::cFemonReceiver()\n");
   m_Active = false;
   m_VideoPid = Vpid;
-  m_AudioPid = Apid[0];
-  m_AC3Pid = Dpid[0];      
+  m_AudioPid = Apid;
+  m_AC3Pid = Dpid;      
   m_VideoValid = false;
   m_VideoPacketCount = 0;
   m_VideoHorizontalSize = 0;
@@ -58,8 +61,7 @@ cFemonReceiver::cFemonReceiver(int Ca, int Vpid, int Apid[], int Dpid[])
  
 cFemonReceiver::~cFemonReceiver(void)
 {
-  debug(printf("cFemonReceiver::~cFemonReceiver()\n"));
-  Detach();
+  //printf("cFemonReceiver::~cFemonReceiver()\n");
   if (m_Active) {
      m_Active = false;
      Cancel(0);
@@ -69,7 +71,7 @@ cFemonReceiver::~cFemonReceiver(void)
 /* The following function originates from libdvbmpeg: */
 void cFemonReceiver::GetVideoInfo(uint8_t *mbuf, int count)
 {
-  debug(printf("cFemonReceiver::GetVideoInfo()\n"));
+  //printf("cFemonReceiver::GetVideoInfo()\n");
   uint8_t *headr;
   int found = 0;
   int c = 0;
@@ -162,7 +164,7 @@ static unsigned int samplerates[4] =
 /* The following function originates from libdvbmpeg: */
 void cFemonReceiver::GetAudioInfo(uint8_t *mbuf, int count)
 {
-  debug(printf("cFemonReceiver::GetAudioInfo()\n"));
+  //printf("cFemonReceiver::GetAudioInfo()\n");
   uint8_t *headr;
   int found = 0;
   int c = 0;
@@ -254,20 +256,13 @@ void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count)
 
 void cFemonReceiver::Activate(bool On)
 {
-  debug(printf("cFemonReceiver::Activate()\n"));
-  if (On) {
-     if (!m_Active)
-        Start();
-     }
-  else if (m_Active) {
-     m_Active = false;
-     Cancel(0);
-     }
+  //printf("cFemonReceiver::Activate()\n");
+  Start();
 }
 
 void cFemonReceiver::Receive(uchar *Data, int Length)
 {
-  debug(printf("cFemonReceiver::Receive()\n"));
+  //printf("cFemonReceiver::Receive()\n");
   // TS packet length: TS_SIZE
   if (Length == TS_SIZE) {
      int pid = ((Data[1] & 0x1f) << 8) | (Data[2]);
@@ -310,11 +305,12 @@ void cFemonReceiver::Receive(uchar *Data, int Length)
 
 void cFemonReceiver::Action(void)
 {
-  debug(printf("cFemonReceiver::Action()\n"));
-  cTimeMs t;
+  //printf("cFemonReceiver::Action()\n");
+#if (VDRVERSNUM < 10300)
+  isyslog("femon receiver: thread started (pid = %d)", getpid());
+#endif
   m_Active = true;
   while (m_Active) {
-        t.Set(0);
         // TS packet 188 bytes - 4 byte header; MPEG standard defines 1Mbit = 1000000bit
         m_VideoBitrate = (8.0 * 184.0 * m_VideoPacketCount) / (femonConfig.calcinterval * 100000.0);
         m_VideoPacketCount = 0;
@@ -322,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

@@ -95,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

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/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/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/stereo.xpm

@@ -1,23 +0,0 @@
-/* XPM */
-static char * stereo_xpm[] = {
-"17 18 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/zero.xpm

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