Renamed compiling switches ('DEBUG' to 'FEMON_DEBUG' and 'NTSC_SYSTEM' to 'FEMON_NTSC').

Enabled preliminary support for the device switching.

HISTORY

@@ -156,3 +156,8 @@ VDR Plugin 'femon' Revision History
 
 - 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.

Makefile

@@ -44,12 +44,12 @@ INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
-ifdef NTSC_SYSTEM
-DEFINES += -DNTSC_SYSTEM
+ifdef FEMON_NTSC
+DEFINES += -DFEMON_NTSC
 endif
 
-ifdef DEBUG
-DEFINES += -DDEBUG
+ifdef FEMON_DEBUG
+DEFINES += -DFEMON_DEBUG
 endif
 
 .PHONY: all all-redirect

README

@@ -63,7 +63,7 @@ Ok            - Switch between display modes: basic, transponder, stream, AC-3
 Green         - Select next audio track
 Yellow        - Select audio channel: stereo, mono left, mono right
 Back          - Exit plugin
-(Left/Right   - Switch to next/previous device that provides the current channel)
+Left/Right   - Switch to next/previous device that provides the current channel
 
 Installation:
 
@@ -87,7 +87,7 @@ Notes:
 - 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
+- There's a shrinked default OSD height for NTSC users: make FEMON_NTSC=1
 - The device switching feature is still non-functional.
 
 "Femon - A real womon who lives according to her natural feminine inclinations."

femon.h

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

femoncfg.c

@@ -23,7 +23,7 @@ cFemonConfig::cFemonConfig(void)
   calcinterval   = 20;
   syslogoutput   = 0;
   showcasystem   = 0;
-#ifdef NTSC_SYSTEM
+#ifdef FEMON_NTSC
   osdheight      = 420;
 #else
   osdheight      = 480;

femoncfg.h

@@ -9,7 +9,7 @@
 #ifndef __FEMONCFG_H
 #define __FEMONCFG_H
 
-#ifdef DEBUG
+#ifdef FEMON_DEBUG
 #define Dprintf(x...) printf(x);
 #else
 #define Dprintf(x...) ;

femonosd.c

@@ -1049,7 +1049,7 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
             if (device >= 0) {
                cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel());
                for (int i = 0; i < cDevice::NumDevices() - 1; i++) {
-                   if (NORMALKEY(Key) == kBlue) {
+                   if (NORMALKEY(Key) == kRight) {
                       if (++device >= cDevice::NumDevices()) device = 0;
                       }
                    else {
@@ -1057,8 +1057,11 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
                       }
                    if (cDevice::GetDevice(device)->ProvidesChannel(channel)) {
                       Dprintf("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, Key, device);
-                      // 1) tune the channel on the new device
-                      // 2) make the new device to actual device
+                      cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), 0);
+                      cControl::Shutdown();
+                      cDevice::GetDevice(device)->SwitchChannel(channel, true);
+                      cControl::Launch(new cTransferControl(cDevice::GetDevice(device), channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids()));
+                      cStatus::MsgChannelSwitch(cDevice::PrimaryDevice(), channel->Number());
                       break;
                       }
                    }