Updated for vdr-1.3.44.

Minor Makefile changes. Made all symbol data 'const'. Added spanish translation (Thanks to Luis Palacios).
Updated for vdr-1.3.42.
2023-10-10 11:36:53 +00:00 · 2006-03-08 04:20:00 +02:00 · 2006-02-06 04:20:00 +02:00 · 2006-01-25 04:20:00 +02:00
34 changed files with 346 additions and 127 deletions
--- a/20
+++ b/20
@@ -194,3 +194,23 @@ VDR Plugin 'femon' Revision History
 - Added "Duotone" theme for 2bpp on screen displays.
 - Fixed crash bug in femonreceiver.
 - Fixed setup page bug (Thanks to Thomas G<>nther for reporting this one).
+
+2006-01-25: Version 0.9.6
+
+- Updated for vdr-1.3.40.
+- Fixed a translation bug (Thanks to Antti Hartikainen).
+- Fixed AC3 header parsing bug (Thanks to Axel Katzur for reporting this one).
+- Fixed EgalsTry theme (Thanks to Uwe Hanke).
+
+2006-02-06: Version 0.9.7
+
+- Updated for vdr-1.3.42.
+- Added "SilverGreen" theme (Thanks to Rififi77 @ VDRPortal).
+
+2006-03-08: Version 0.9.8
+
+- Updated for vdr-1.3.44.
+- Minor Makefile changes.
+- Made all symbol data 'const'.
+- Added spanish translation (Thanks to Luis Palacios).
+
--- a/12
+++ b/12
@@ -3,6 +3,12 @@
 #
 # $Id$

+# Debugging on/off 
+#FEMON_DEBUG = 1
+
+# NTSC on/off 
+#FEMON_NTSC = 1
+
 # 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.
@@ -45,11 +51,11 @@ INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

 ifdef FEMON_NTSC
-DEFINES += -DFEMON_NTSC
+DEFINES += -DNTSC
 endif

 ifdef FEMON_DEBUG
-DEFINES += -DFEMON_DEBUG
+DEFINES += -DDEBUG
 endif

 .PHONY: all all-redirect
@@ -81,7 +87,7 @@ libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
 ifndef FEMON_DEBUG
-	strip $(LIBDIR)/$@.$(VDRVERSION)
+	@strip $(LIBDIR)/$@.$(VDRVERSION)
 endif

 dist: clean
--- a/femon.c
+++ b/femon.c
@@ -15,7 +15,7 @@
 #include "femontools.h"
 #include "femon.h"

-#if defined(VDRVERSNUM) && VDRVERSNUM < 10336
+#if defined(VDRVERSNUM) && VDRVERSNUM < 10344
 #error "You don't exist! Go away! Upgrade yourself!"
 #endif

@@ -236,6 +236,7 @@ cMenuFemonSetup::cMenuFemonSetup(void)
  themes[eFemonThemeEnigma]        = tr("Enigma");
  themes[eFemonThemeEgalsTry]      = tr("EgalsTry");
  themes[eFemonThemeDuotone]       = tr("Duotone");
+  themes[eFemonThemeSilverGreen]   = tr("SilverGreen");

  data = femonConfig;
  Setup();
--- a/femon.h
+++ b/femon.h
@@ -11,7 +11,7 @@

 #include <vdr/plugin.h>

-static const char *VERSION        = "0.9.5";
+static const char *VERSION        = "0.9.8";
 static const char *DESCRIPTION    = "DVB Signal Information Monitor (OSD)";
 static const char *MAINMENUENTRY  = "Signal Information";

--- a/femoncfg.c
+++ b/femoncfg.c
@@ -24,7 +24,7 @@ cFemonConfig::cFemonConfig(void)
  calcinterval   = 20;
  syslogoutput   = 0;
  showcasystem   = 0;
-#ifdef FEMON_NTSC
+#ifdef NTSC
  osdheight      = 420;
 #else
  osdheight      = 480;
@@ -96,6 +96,7 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
  },
  {
    // eFemonThemeEgalsTry
+    4,          // bpp
    0xCA2B1B9E, // clrBackground
    0xDFBEBAC3, // clrTitleBackground
    0xFF280249, // clrTitleText
@@ -110,11 +111,23 @@ const cFemonTheme femonTheme[eFemonThemeMaxNumber] =
    2,          // bpp
    0x7F000000, // clrBackground
    0xFFFCFCFC, // clrTitleBackground
-    0x7F000000, // clrTitleText                                                                                                              
-    0xFFFCFCFC, // clrActiveText                                                                                                            
+    0x7F000000, // clrTitleText
+    0xFFFCFCFC, // clrActiveText
    0xFFFCFCFC, // clrInactiveText
    0xFFFC1414, // clrRed
    0xFFFCFCFC, // clrYellow
    0xFFFCFCFC, // clrGreen
  },
+  {
+    // eFemonThemeSilverGreen
+    4,          // bpp
+    0xD9526470, // clrBackground
+    0xD9293841, // clrTitleBackground
+    0xFFB3BDCA, // clrTitleText
+    0xFFCE7B00, // clrActiveText
+    0xFFB3BDCA, // clrInactiveText
+    0xFF992900, // clrRed
+    0xFFCE7B00, // clrYellow
+    0xFF336600, // clrGreen
+  },
 };
--- a/femoncfg.h
+++ b/femoncfg.h
@@ -56,6 +56,7 @@ enum eFemonThemes
  eFemonThemeEnigma,
  eFemonThemeEgalsTry,
  eFemonThemeDuotone,
+  eFemonThemeSilverGreen,
  eFemonThemeMaxNumber
 };

--- a/femoni18n.c
+++ b/femoni18n.c
--- a/femonosd.c
+++ b/femonosd.c
@@ -594,7 +594,7 @@ void cFemonOsd::DrawInfoWindow(void)
               break;

          default:
-               snprintf(buf, sizeof(buf), "%s #%d - %s", tr("Terrestial Card"), cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name);
+               snprintf(buf, sizeof(buf), "%s #%d - %s", tr("Terrestrial Card"), cDevice::ActualDevice()->CardIndex(), m_FrontendInfo.name);
               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), buf, femonTheme[femonConfig.theme].clrActiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
               offset += OSDROWHEIGHT;
               m_Osd->DrawText(OSDINFOWIN_X(1), OSDINFOWIN_Y(offset), tr("Frequency"), femonTheme[femonConfig.theme].clrInactiveText, femonTheme[femonConfig.theme].clrBackground, m_Font);
--- a/femonreceiver.c
+++ b/femonreceiver.c
@@ -230,20 +230,71 @@ void cFemonReceiver::GetAC3Info(uint8_t *mbuf, int count)
     m_AC3FrameSize <<= 1;
  m_AC3BitStreamMode = (headr[3] & 7);
  m_AC3AudioCodingMode = (headr[4] & 0xE0) >> 5;
-  if ((m_AC3AudioCodingMode & 0x01) && (m_AC3AudioCodingMode != 0x01)) // if 3 front channels
+  if ((m_AC3AudioCodingMode & 0x01) && (m_AC3AudioCodingMode != 0x01)) {
+     // 3 front channels
     m_AC3CenterMixLevel = (headr[4] & 0x18) >> 3;
-  else
+     if (m_AC3AudioCodingMode & 0x04) {
+        // a surround channel exists
+        m_AC3SurroundMixLevel = (headr[4] & 0x06) >> 1;
+        if (m_AC3AudioCodingMode == 0x02) {
+           // if in 2/0 mode
+           m_AC3DolbySurroundMode = ((headr[4] & 0x01) << 1) | ((headr[5] & 0x80) >> 7);
+           m_AC3LfeOn = (headr[5] & 0x40) >> 6;
+           m_AC3DialogLevel = (headr[5] & 0x3e) >> 1;
+           }
+        else {
+           m_AC3DolbySurroundMode = FR_NOTVALID;
+           m_AC3LfeOn = (headr[4] & 0x01);
+           m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
+           }
+        }
+     else {
+        m_AC3SurroundMixLevel = FR_NOTVALID;
+        if (m_AC3AudioCodingMode == 0x02) {
+           // if in 2/0 mode
+            m_AC3DolbySurroundMode = (headr[4] & 0x06) >> 1;
+            m_AC3LfeOn = (headr[4] & 0x01);
+            m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
+           }
+        else {
+           m_AC3DolbySurroundMode = FR_NOTVALID;
+           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
+           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
+           }
+        }
+     }
+  else {
     m_AC3CenterMixLevel = FR_NOTVALID;
-  if (m_AC3AudioCodingMode & 0x04) //  if a surround channel exists
-     m_AC3SurroundMixLevel = (headr[4] & 0x06) >> 1;
-  else
-     m_AC3SurroundMixLevel = FR_NOTVALID;
-  if (m_AC3AudioCodingMode == 0x02) // if in 2/0 mode
-     m_AC3DolbySurroundMode = ((headr[4] & 1) << 1) | ((headr[5] & 0x80) >> 7);
-  else 
-     m_AC3DolbySurroundMode = FR_NOTVALID;
-  m_AC3LfeOn = (headr[5] & 0x40) >> 6;
-  m_AC3DialogLevel = (headr[5] & 0x3e) >> 1;
+     if (m_AC3AudioCodingMode & 0x04) {
+        // a surround channel exists
+        m_AC3SurroundMixLevel = (headr[4] & 0x18) >> 3;
+        if (m_AC3AudioCodingMode == 0x02) {
+           // if in 2/0 mode
+           m_AC3DolbySurroundMode = (headr[4] & 0x06) >> 1;
+           m_AC3LfeOn = (headr[4] & 0x01);
+           m_AC3DialogLevel = (headr[5] & 0xF8) >> 3;
+           }
+        else {
+           m_AC3DolbySurroundMode = FR_NOTVALID;
+           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
+           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
+           }
+        }
+     else {
+        m_AC3SurroundMixLevel = FR_NOTVALID;
+        if (m_AC3AudioCodingMode == 0x02) {
+           // if in 2/0 mode
+           m_AC3DolbySurroundMode = (headr[4] & 0x18) >> 3;
+           m_AC3LfeOn = (headr[4] & 0x04) >> 2;
+           m_AC3DialogLevel = (headr[4] & 0x03) << 3 | ((headr[5] & 0xE0) >> 5);
+           }
+        else {
+           m_AC3DolbySurroundMode = FR_NOTVALID;
+           m_AC3LfeOn = (headr[4] & 0x10) >> 4;
+           m_AC3DialogLevel = ((headr[4] & 0x0F) << 1) | ((headr[5] & 0x80) >> 7);
+           }
+        }
+     }
 }

 void cFemonReceiver::Activate(bool On)
--- a/femontools.h
+++ b/femontools.h
@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include <vdr/tools.h>

-#ifdef FEMON_DEBUG
+#ifdef DEBUG
 #define Dprintf(x...) printf(x);
 #else
 #define Dprintf(x...) ;
--- a/symbols/ar11.xpm
+++ b/symbols/ar11.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ar11_xpm[] = {
+static const char *const ar11_xpm[] = {
 "26 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/ar169.xpm
+++ b/symbols/ar169.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ar169_xpm[] = {
+static const char *const ar169_xpm[] = {
 "38 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/ar2211.xpm
+++ b/symbols/ar2211.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ar2211_xpm[] = {
+static const char *const ar2211_xpm[] = {
 "52 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/ar43.xpm
+++ b/symbols/ar43.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ar43_xpm[] = {
+static const char *const ar43_xpm[] = {
 "31 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/carrier.xpm
+++ b/symbols/carrier.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * carrier_xpm[] = {
+static const char *const carrier_xpm[] = {
 "96 19 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/device.xpm
+++ b/symbols/device.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * device_xpm[] = {
+static const char *const device_xpm[] = {
 "14 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/dolbydigital.xpm
+++ b/symbols/dolbydigital.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dolbydigital_xpm[] = {
+static const char *const dolbydigital_xpm[] = {
 "31 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/dolbydigital20.xpm
+++ b/symbols/dolbydigital20.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dolbydigital20_xpm[] = {
+static const char *const dolbydigital20_xpm[] = {
 "55 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/dolbydigital51.xpm
+++ b/symbols/dolbydigital51.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dolbydigital51_xpm[] = {
+static const char *const dolbydigital51_xpm[] = {
 "51 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/five.xpm
+++ b/symbols/five.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * five_xpm[] = {
+static const char *const five_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/four.xpm
+++ b/symbols/four.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * four_xpm[] = {
+static const char *const four_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/lock.xpm
+++ b/symbols/lock.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lock_xpm[] = {
+static const char *const lock_xpm[] = {
 "96 19 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/monoleft.xpm
+++ b/symbols/monoleft.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * monoleft_xpm[] = {
+static const char *const monoleft_xpm[] = {
 "17 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/monoright.xpm
+++ b/symbols/monoright.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * monoright_xpm[] = {
+static const char *const monoright_xpm[] = {
 "17 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/ntsc.xpm
+++ b/symbols/ntsc.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ntsc_xpm[] = {
+static const char *const ntsc_xpm[] = {
 "19 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/one.xpm
+++ b/symbols/one.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * one_xpm[] = {
+static const char *const one_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/pal.xpm
+++ b/symbols/pal.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pal_xpm[] = {
+static const char *const pal_xpm[] = {
 "18 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/signal.xpm
+++ b/symbols/signal.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * signal_xpm[] = {
+static const char *const signal_xpm[] = {
 "96 19 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/stereo.xpm
+++ b/symbols/stereo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * stereo_xpm[] = {
+static const char *const stereo_xpm[] = {
 "17 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/sync.xpm
+++ b/symbols/sync.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * sync_xpm[] = {
+static const char *const sync_xpm[] = {
 "96 19 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/three.xpm
+++ b/symbols/three.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * three_xpm[] = {
+static const char *const three_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/two.xpm
+++ b/symbols/two.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * two_xpm[] = {
+static const char *const two_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/viterbi.xpm
+++ b/symbols/viterbi.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * viterbi_xpm[] = {
+static const char *const viterbi_xpm[] = {
 "96 19 2 1",
 ".	c #FFFFFF",
 "+	c #000000",
--- a/symbols/zero.xpm
+++ b/symbols/zero.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * zero_xpm[] = {
+static const char *const zero_xpm[] = {
 "15 18 2 1",
 ".	c #FFFFFF",
 "+	c #000000",