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).

HISTORY

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

Makefile

@@ -52,6 +52,9 @@ ifdef DEBUG
 DEFINES += -DDEBUG
 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:
 

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.5";
+static const char *VERSION        = "0.8.7";
 static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
 static const char *MAINMENUENTRY  = "Signal Information";
 

femoncfg.c

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

@@ -50,6 +50,7 @@ enum eFemonThemes
   eFemonThemeClassic,
   eFemonThemeElchi,
   eFemonThemeDeepBlue,
+  eFemonThemeMoronimo,
   eFemonThemeMaxNumber
 };
 

femoni18n.c

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

femonosd.c

@@ -884,7 +884,7 @@ void cFemonOsd::Show(void)
      m_Frontend = -1;
      return;
      }
-  m_Osd = cOsdProvider::NewOsd(((Setup.OSDWidth - OSDWIDTH) / 2) + Setup.OSDLeft, ((Setup.OSDHeight - OSDHEIGHT) / 2) + Setup.OSDTop);
+  m_Osd = cOsdProvider::NewOsd(((Setup.OSDWidth - OSDWIDTH) / 2) + Setup.OSDLeft + femonConfig.osdoffset, ((Setup.OSDHeight - OSDHEIGHT) / 2) + Setup.OSDTop);
   if (m_Osd) {
      tArea Areas1[] = { { 0, 0, OSDWIDTH, OSDHEIGHT, 4 } };
      if (m_Osd->CanHandleAreas(Areas1, sizeof(Areas1) / sizeof(tArea)) == oeOk) {
@@ -1057,9 +1057,8 @@ eOSState cFemonOsd::ProcessKey(eKeys Key)
                       }
                    if (cDevice::GetDevice(device)->ProvidesChannel(channel)) {
                       Dprintf("%s(%d) device(%d)\n", __PRETTY_FUNCTION__, Key, device);
-                      //if (cDevice::ActualDevice() == cTransferControl::ReceiverDevice())
-                      //   cControl::Shutdown();
-                      //cDevice::GetDevice(channel)->SwitchChannel(channel, true);
+                      // 1) tune the channel on the new device
+                      // 2) make the new device to actual device
                       break;
                       }
                    }

femonreceiver.c

@@ -62,7 +62,7 @@ cFemonReceiver::~cFemonReceiver(void)
   Detach();
   if (m_Active) {
      m_Active = false;
-     Cancel(0);
+     Cancel();
      }
 }
 
@@ -259,7 +259,7 @@ void cFemonReceiver::Activate(bool On)
      }
   else if (m_Active) {
      m_Active = false;
-     Cancel(0);
+     Cancel();
      }
 }