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

Enabled preliminary support for the device switching.

HISTORY

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

Makefile

@@ -44,14 +44,17 @@ 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
+all-redirect: all
+
 ### The object files (add further files here):
 
 OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femoni18n.o

README

@@ -21,11 +21,9 @@ 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 other parts of plugin code are borrowed from the excellent
-'OSD Picture-In-Picture' plugin by Sascha Volkenandt and Andreas Regel. The
-bitrate calculation algorithm originates from the 'dvbstream' application by
-Dave Chapman and the stream information routines from the 'libdvb' library by
-Metzler Brothers.
+information). The bitrate calculation trick originates from the 'dvbstream'
+application by Dave Chapman and the stream information routines are taken from
+the 'libdvb' library by Metzler Brothers.
 
 Terminology:
 
@@ -65,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:
 
@@ -89,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.c

@@ -102,6 +102,7 @@ cMenuFemonSetup::cMenuFemonSetup(void)
   themes[eFemonThemeClassic]       = tr("Classic");
   themes[eFemonThemeElchi]         = tr("Elchi");
   themes[eFemonThemeDeepBlue]      = tr("DeepBlue");
+  themes[eFemonThemeMoronimo]      = tr("Moronimo");
 
   Setup();
 }

femon.h

@@ -11,7 +11,7 @@
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.8.6";
+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;
@@ -66,5 +66,16 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
     0xFFCE7B00, // clrYellow
     0xFF336600, // clrGreen
   },
+  {
+    // eFemonThemeMoronimo
+    0xDF294A6B, // clrBackground
+    0xDF3E5578, // clrTitleBackground
+    0xFF9BBAD7, // clrTitleText
+    0xFFCE7B00, // clrActiveText
+    0xFF9A9A9A, // clrInactiveText
+    0xFF992900, // clrRed
+    0xFFCE7B00, // clrYellow
+    0xFF336600, // clrGreen
+  },
 };
 

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...) ;
@@ -50,6 +50,7 @@ enum eFemonThemes
   eFemonThemeClassic,
   eFemonThemeElchi,
   eFemonThemeDeepBlue,
+  eFemonThemeMoronimo,
   eFemonThemeMaxNumber
 };
 

femoni18n.c

@@ -17,7 +17,7 @@ const tI18nPhrase Phrases[] = {
     "", // Portugu<67>s
     "", // Fran<61>ais
     "", // Norsk
-    "DVB signaalimittari (OSD)", // suomi
+    "Signaalimittari (OSD)", // suomi
     "", // Polski
     "", // Espa<70>ol
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
@@ -94,7 +94,7 @@ const tI18nPhrase Phrases[] = {
     "", // Dansk
   },
   { "Horizontal offset", // English
-    "", // Deutsch
+    "Horizontaler Offset", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands
@@ -111,7 +111,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
+    "Horisontaalne nihe", // Eesti
     "", // Dansk
   },
   { "Default display mode", // English
@@ -122,7 +122,7 @@ const tI18nPhrase Phrases[] = {
     "", // Portugu<67>s
     "", // Fran<61>ais 
     "", // Norsk
-    "Oletus n<EFBFBD>ytt<EFBFBD>moodi", // suomi
+    "Oletusn<EFBFBD>ytt<EFBFBD>tila", // suomi
     "", // Polski   
     "", // Espa<70>ol  
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
@@ -174,8 +174,8 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>  
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "", // Eesti
-    "transponder", // Dansk
+    "transponder", // Eesti
+    "", // Dansk
   },
   { "stream", // English
     "Stream", // Deutsch
@@ -195,7 +195,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>  
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "striim", // Eesti
+    "voog", // Eesti
     "", // Dansk
   },
   { "Theme", // English
@@ -242,45 +242,66 @@ const tI18nPhrase Phrases[] = {
   },
   { "Elchi", // English
     "Elchi", // Deutsch
-    "", // Slovenski
-    "", // Italiano
-    "", // Nederlands
-    "", // Portugu<67>s
-    "", // Fran<61>ais 
-    "", // Norsk
+    "Elchi", // Slovenski
+    "Elchi", // Italiano
+    "Elchi", // Nederlands
+    "Elchi", // Portugu<67>s
+    "Elchi", // Fran<61>ais 
+    "Elchi", // Norsk
     "Elchi", // suomi
-    "", // Polski   
-    "", // Espa<70>ol  
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
-    "", // Svenska
-    "", // Romaneste
-    "", // Magyar  
-    "", // Catal<61>  
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-    "", // Hrvatski (Croatian)
+    "Elchi", // Polski   
+    "Elchi", // Espa<70>ol  
+    "Elchi", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "Elchi", // Svenska
+    "Elchi", // Romaneste
+    "Elchi", // Magyar  
+    "Elchi", // Catal<61>  
+    "Elchi", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "Elchi", // Hrvatski (Croatian)
     "Elchi", // Eesti
-    "", // Dansk
+    "Elchi", // Dansk
   },
   { "DeepBlue", // English
     "DeepBlue", // Deutsch
-    "", // Slovenski
-    "", // Italiano
-    "", // Nederlands
-    "", // Portugu<67>s
-    "", // Fran<61>ais 
-    "", // Norsk
+    "DeepBlue", // Slovenski
+    "DeepBlue", // Italiano
+    "DeepBlue", // Nederlands
+    "DeepBlue", // Portugu<67>s
+    "DeepBlue", // Fran<61>ais 
+    "DeepBlue", // Norsk
     "DeepBlue", // suomi
-    "", // Polski   
-    "", // Espa<70>ol  
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
-    "", // Svenska
-    "", // Romaneste
-    "", // Magyar  
-    "", // Catal<61>  
-    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
-    "", // Hrvatski (Croatian)
+    "DeepBlue", // Polski   
+    "DeepBlue", // Espa<70>ol  
+    "DeepBlue", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "DeepBlue", // Svenska
+    "DeepBlue", // Romaneste
+    "DeepBlue", // Magyar  
+    "DeepBlue", // Catal<61>  
+    "DeepBlue", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "DeepBlue", // Hrvatski (Croatian)
     "DeepBlue", // Eesti
-    "", // Dansk
+    "DeepBlue", // Dansk
+  },
+  { "Moronimo", // English
+    "Moronimo", // Deutsch
+    "Moronimo", // Slovenski
+    "Moronimo", // Italiano
+    "Moronimo", // Nederlands
+    "Moronimo", // Portugu<67>s
+    "Moronimo", // Fran<61>ais 
+    "Moronimo", // Norsk
+    "Moronimo", // suomi
+    "Moronimo", // Polski   
+    "Moronimo", // Espa<70>ol  
+    "Moronimo", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
+    "Moronimo", // Svenska
+    "Moronimo", // Romaneste
+    "Moronimo", // Magyar  
+    "Moronimo", // Catal<61>  
+    "Moronimo", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
+    "Moronimo", // Hrvatski (Croatian)
+    "Moronimo", // Eesti
+    "Moronimo", // Dansk
   },
   { "Hide main menu entry", // English
     "Hauptmen<EFBFBD>eintrag verstecken", // Deutsch
@@ -342,7 +363,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "Striimi anal<61><6C>s", // Eesti
+    "Voo anal<61><6C>s", // Eesti
     "", // Dansk
   },
   { "Calculation interval [0.1s]", // English
@@ -720,7 +741,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "Striimi info", // Eesti
+    "Voo info", // Eesti
     "", // Dansk
   },
   { "MPEG Layer", // English
@@ -762,7 +783,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "Videostriim", // Eesti
+    "Videovoog", // Eesti
     "", // Dansk
   },
   { "Bitrate", // English
@@ -1014,7 +1035,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "Audiostriim", // Eesti
+    "Audiovoog", // Eesti
     "", // Dansk
   },
   { "Sampling Frequency", // English
@@ -1067,7 +1088,7 @@ const tI18nPhrase Phrases[] = {
     "Apid", // Portugu<67>s
     "Apid", // Fran<61>ais
     "Apid", // Norsk
-    "<EFBFBD><EFBFBD>ni PID", // suomi
+    "<EFBFBD><EFBFBD>ni-PID", // suomi
     "Apid", // Polski
     "Apid", // Espa<70>ol
     "Apid", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
@@ -1088,7 +1109,7 @@ const tI18nPhrase Phrases[] = {
     "Dpid", // Portugu<67>s
     "Dpid", // Fran<61>ais
     "Dpid", // Norsk
-    "Dolby PID", // suomi
+    "Dolby-PID", // suomi
     "Dpid", // Polski
     "Dpid", // Espa<70>ol
     "Dpid", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
@@ -1109,7 +1130,7 @@ const tI18nPhrase Phrases[] = {
     "Nid", // Portugu<67>s
     "Nid", // Fran<61>ais
     "Nid", // Norsk
-    "Verkko ID", // suomi
+    "Verkko-ID", // suomi
     "Nid", // Polski
     "Nid", // Espa<70>ol
     "Nid", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
@@ -1130,7 +1151,7 @@ const tI18nPhrase Phrases[] = {
     "Tid", // Portugu<67>s
     "Tid", // Fran<61>ais
     "Tid", // Norsk
-    "L<EFBFBD>hete ID", // suomi
+    "L<EFBFBD>hete-ID", // suomi
     "Tid", // Polski
     "Tid", // Espa<70>ol
     "Tid", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
@@ -1151,7 +1172,7 @@ const tI18nPhrase Phrases[] = {
     "Rid", // Portugu<67>s
     "Rid", // Fran<61>ais
     "Rid", // Norsk
-    "Radio ID", // suomi
+    "Radio-ID", // suomi
     "Rid", // Polski
     "Rid", // Espa<70>ol
     "Rid", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
@@ -1186,7 +1207,7 @@ const tI18nPhrase Phrases[] = {
     "dB", // Dansk
   },
   { "not indicated", // English
-    "", // Deutsch
+    "nicht angegeben", // Deutsch
     "", // Slovenski
     "", // Italiano
     "", // Nederlands
@@ -1235,7 +1256,7 @@ const tI18nPhrase Phrases[] = {
     "", // Portugu<67>s
     "", // Fran<61>ais
     "", // Norsk
-    "AC-3 <EFBFBD><EFBFBD>niraita", // suomi
+    "AC-3-<EFBFBD><EFBFBD>niraita", // suomi
     "", // Polski
     "", // Espa<70>ol
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
@@ -1245,7 +1266,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "AC-3 striim", // Eesti
+    "AC-3 voog", // Eesti
     "", // Dansk
   },
   { "Frame Size", // English
@@ -1287,7 +1308,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "Bitistriimi t<><74>p", // Eesti
+    "Bitivoo t<><74>p", // Eesti
     "", // Dansk
   },
   { "Audio Coding Mode", // English
@@ -1361,7 +1382,7 @@ const tI18nPhrase Phrases[] = {
     "", // Portugu<67>s
     "", // Fran<61>ais
     "", // Norsk
-    "Dolby Surround -moodi", // suomi
+    "Dolby Surround -tehoste", // suomi
     "", // Polski
     "", // Espa<70>ol
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
@@ -1434,7 +1455,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "CM", // Eesti
+    "T<EFBFBD>iskomplekt (CM)", // Eesti
     "", // Dansk
   },
   { "Music and Effects (ME)", // English
@@ -1665,7 +1686,7 @@ const tI18nPhrase Phrases[] = {
     "", // Catal<61>
     "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Russian)
     "", // Hrvatski (Croatian)
-    "K", // Eesti
+    "C", // Eesti
     "", // Dansk
   },
   { "L", // English "Left"

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;
                       }
                    }