Fixed device switching priority (Thanks to Andreas Brugger).

Fixed device switching back to the primary device.

HISTORY

@@ -214,3 +214,22 @@ VDR Plugin 'femon' Revision History
 - Made all symbol data 'const'.
 - Added spanish translation (Thanks to Luis Palacios).
 
+2006-04-20: Version 0.9.9
+
+- Updated for vdr-1.3.47.
+
+2006-04-23: Version 0.9.10
+
+- Added STRIP option for Makefile (Thanks to Ville Skytt<74>).
+- Modified APIVERSION code in Makefile.
+
+2006-04-30: Version 1.0.0
+
+- Updated for vdr-1.4.0.
+- Modified APIVERSION code in Makefile.
+- Updated german translation (Thanks to Andreas Brachold).
+
+2006-06-06: Version 1.0.1
+
+- Fixed device switching priority (Thanks to Andreas Brugger).
+- Fixed device switching back to the primary device.

Makefile

@@ -9,6 +9,9 @@
 # NTSC on/off 
 #FEMON_NTSC = 1
 
+# Strip debug symbols?  Set eg. to /bin/true if not
+STRIP = strip
+
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
@@ -17,7 +20,7 @@ PLUGIN = femon
 
 ### The version number of this plugin (taken from the main source file):
 
-VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ print $$6 }' | sed -e 's/[";]//g')
+VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).h | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
 ### The C++ compiler and options:
 
@@ -26,7 +29,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -35,9 +37,9 @@ TMPDIR = /tmp
 
 -include $(VDRDIR)/Make.config
 
-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
@@ -46,7 +48,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -85,10 +87,10 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
 ifndef FEMON_DEBUG
-	@strip $(LIBDIR)/$@.$(VDRVERSION)
+	@$(STRIP) $@
 endif
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)

femon.c

@@ -15,8 +15,8 @@
 #include "femontools.h"
 #include "femon.h"
 
-#if defined(VDRVERSNUM) && VDRVERSNUM < 10344
-#error "You don't exist! Go away! Upgrade yourself!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10400
+#error "VDR-1.4.0 API version or greater is required!"
 #endif
 
 cPluginFemon::cPluginFemon()

femon.h

@@ -11,9 +11,9 @@
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.9.8";
-static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
-static const char *MAINMENUENTRY  = "Signal Information";
+static const char VERSION[]       = "1.0.1";
+static const char DESCRIPTION[]   = "DVB Signal Information Monitor (OSD)";
+static const char MAINMENUENTRY[] = "Signal Information";
 
 class cPluginFemon : public cPlugin {
 public:
@@ -27,6 +27,8 @@ public:
   virtual bool Start(void);
   virtual void Stop(void);
   virtual void Housekeeping(void);
+  virtual void MainThreadHook(void) {}
+  virtual cString Active(void) { return NULL; }
   virtual const char *MainMenuEntry(void) { return (femonConfig.hidemenu ? NULL : tr(MAINMENUENTRY)); }
   virtual cOsdObject *MainMenuAction(void);
   virtual cMenuSetupPage *SetupMenu(void);

femonclient-0.0.1/Makefile

@@ -11,7 +11,7 @@ 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')
+VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
 ### The C++ compiler and options:
 
@@ -20,27 +20,26 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
-VDRDIR = ../../..
-LIBDIR = ../../lib
+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"):
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
-ARCHIVE = svcintf-$(VERSION)
+ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR)/PLUGINS/src/femon/
+INCLUDES += -I$(VDRDIR)/include -I$(VDRDIR)/PLUGINS/src/femon/
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
@@ -68,7 +67,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(PLUGIN).o
 	$(CXX) $(CXXFLAGS) -shared $(PLUGIN).o -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)

femonclient-0.0.1/femonclient.c

@@ -11,9 +11,9 @@
 #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";
+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:

femoni18n.c

@@ -736,7 +736,7 @@ const tI18nPhrase Phrases[] = {
     "Auto", // <20>esky (Czech)
   },
   { "None", // English
-    "None", // Deutsch
+    "Nichts", // Deutsch
     "None", // Slovenski
     "None", // Italiano
     "None", // Nederlands
@@ -758,7 +758,7 @@ const tI18nPhrase Phrases[] = {
     "None", // <20>esky (Czech)
   },
   { "Off", // English
-    "Off", // Deutsch
+    "Aus", // Deutsch
     "Off", // Slovenski
     "Off", // Italiano
     "Off", // Nederlands
@@ -780,7 +780,7 @@ const tI18nPhrase Phrases[] = {
     "Off", // <20>esky (Czech)
   },
   { "On", // English
-    "On", // Deutsch
+    "Ein", // Deutsch
     "On", // Slovenski
     "On", // Italiano
     "On", // Nederlands
@@ -1506,7 +1506,7 @@ const tI18nPhrase Phrases[] = {
     "", // <20>esky (Czech)
   },
   { "Audio Coding Mode", // English
-    "Audio Coding Modus", // Deutsch
+    "Audiokodierung", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands
@@ -1792,7 +1792,7 @@ const tI18nPhrase Phrases[] = {
     "", // <20>esky (Czech)
   },
   { "Voice Over (VO)", // English
-    "<EFBFBD>berlagerte Stimme (VO)", // Deutsch
+    "<EFBFBD>berlagerte Stimme (VO)", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands
@@ -2056,7 +2056,7 @@ const tI18nPhrase Phrases[] = {
     "", // <20>esky (Czech)
   },
   { "Analog", // English
-    "", // Deutsch
+    "Analog", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands
@@ -2078,7 +2078,7 @@ const tI18nPhrase Phrases[] = {
     "", // <20>esky (Czech)
   },
   { "Free to Air", // English
-    "Free to Air", // Deutsch
+    "Frei empfangbar", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands

femonosd.c

@@ -995,24 +995,26 @@ void cFemonOsd::SetAudioTrack(int Index, const char * const *Tracks)
 bool cFemonOsd::DeviceSwitch(int direction)
 {
   Dprintf("%s()\n", __PRETTY_FUNCTION__);
-  int device = cDevice::ActualDevice()->DeviceNumber();                            
+  int device = cDevice::ActualDevice()->DeviceNumber();
   direction = sgn(direction);
   if (device >= 0) {
      cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
-     for (int i = 0; i < cDevice::NumDevices() - 1; i++) {                         
+     for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
         if (direction) {
-           if (++device >= cDevice::NumDevices()) device = 0;                     
+           if (++device >= cDevice::NumDevices())
+              device = 0;
            }
         else {
-           if (--device < 0) device = cDevice::NumDevices() - 1;
+           if (--device < 0)
+              device = cDevice::NumDevices() - 1;
            }
-        if (cDevice::GetDevice(device)->ProvidesChannel(channel)) {
+        if (cDevice::GetDevice(device)->ProvidesChannel(channel, 0)) {
            Dprintf("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, direction, device);
-           // here should be added some checks, if the device is really available (i.e. not recording)
            cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
            cControl::Shutdown();
            cDevice::GetDevice(device)->SwitchChannel(channel, true);
-           // does this work with primary devices ?
+           if (cDevice::GetDevice(device) == cDevice::PrimaryDevice())
+              cDevice::GetDevice(device)->ForceTransferMode();
            cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
            cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
            return (true);