Fixed device switching priority (Thanks to Andreas Brugger).

Fixed device switching back to the primary device.
Updated for vdr-1.4.0.
2023-10-10 11:36:53 +00:00 · 2006-06-06 04:20:00 +03:00 · 2006-04-30 04:20:00 +03:00 · 2006-04-23 04:20:00 +03:00 · 2006-04-20 04:20:00 +03:00 · 2006-03-08 04:20:00 +02:00
34 changed files with 184 additions and 145 deletions
--- a/27
+++ b/27
@@ -206,3 +206,30 @@ VDR Plugin 'femon' Revision History

 - 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).
+
+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.
--- a/26
+++ b/26
@@ -3,6 +3,15 @@
 #
 # $Id$

+# Debugging on/off 
+#FEMON_DEBUG = 1
+
+# 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.
@@ -11,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:

@@ -20,7 +29,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual

 ### The directory environment:

-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -29,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:

@@ -40,16 +48,16 @@ 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)"'

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

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

 .PHONY: all all-redirect
@@ -79,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)
--- a/femon.c
+++ b/femon.c
@@ -15,8 +15,8 @@
 #include "femontools.h"
 #include "femon.h"

-#if defined(VDRVERSNUM) && VDRVERSNUM < 10342
-#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()
--- a/femon.h
+++ b/femon.h
@@ -11,9 +11,9 @@

 #include <vdr/plugin.h>

-static const char *VERSION        = "0.9.7";
-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);
--- 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;
--- a/femonclient-0.0.1/Makefile
+++ b/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)
--- a/femonclient-0.0.1/femonclient.c
+++ b/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:
--- a/femoni18n.c
+++ b/femoni18n.c
@@ -19,7 +19,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Signaalimittari (OSD)", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Monitorizaci<EFBFBD>n de la se<73>al DVB", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -41,7 +41,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Signaalimittari", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Monitorizaci<EFBFBD>n de la se<73>al DVB", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -63,7 +63,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Sijainti", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Posici<EFBFBD>n", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -85,7 +85,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Korkeus", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Altura", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -107,7 +107,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Vaakakeskitys", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Desplazamiento horizontal", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -129,7 +129,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Oletusn<EFBFBD>ytt<EFBFBD>tila", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Modo de visualizaci<63>n estandar", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -151,7 +151,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "perus", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "B<EFBFBD>sico", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -173,7 +173,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "transponderi", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Transpondedor", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -195,7 +195,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "l<EFBFBD>hete", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Flujo", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -217,7 +217,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Ulkoasu", // suomi
    "", // Polski
-    "", // Espa<70>ol  
+    "Piel", // Espa<70>ol  
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -239,7 +239,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Teema", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Tema", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -261,7 +261,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Klassinen", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Cl<EFBFBD>sico", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -437,7 +437,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Piilota valinta p<><70>valikosta", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Ocultar en el men<65> principal", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -459,7 +459,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "N<EFBFBD>yt<EFBFBD>n p<>ivitysv<73>li [0.1s]", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Intervalo de actualizaci<63>n (0,1)", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -481,7 +481,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "L<EFBFBD>hetteen analysointi", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Analizar el flujo", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -503,7 +503,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Laskennan p<>ivitysv<73>li [0.1s]", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Intervalo de c<>lculo (0,1s)", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -525,7 +525,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Punaisen taso [%]", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "L<EFBFBD>mite de rojo [%s]", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -540,14 +540,14 @@ const tI18nPhrase Phrases[] = {
  { "Green limit [%]", // English
    "Grenze Gr<47>n [%]", // Deutsch
    "", // Slovenski
-    "Limite verde [%]", // Italiano
+    "Limite de verde [%]", // Italiano
    "", // Nederlands
    "", // Portugu<67>s
    "Limite du vert (%)", // Fran<61>ais
    "", // Norsk
    "Vihre<EFBFBD>n taso [%]", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "L<EFBFBD>mite verde [%]", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -569,7 +569,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk   
    "Transponderin tiedot", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Informaci<EFBFBD>n del transpondedor", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -591,7 +591,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Satelliittikortti", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Tarjeta Sat<61>lite", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -613,7 +613,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Kaapelikortti", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Tarjeta Cable", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -635,7 +635,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Terrestriaalikortti", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Tarjeta TDT", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -657,7 +657,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Kirjaa systeemilokiin", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Usar syslog como registro", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -736,7 +736,7 @@ const tI18nPhrase Phrases[] = {
    "Auto", // <20>esky (Czech)
  },
  { "None", // English
-    "None", // Deutsch
+    "Nichts", // Deutsch
    "None", // Slovenski
    "None", // Italiano
    "None", // Nederlands
@@ -745,7 +745,7 @@ const tI18nPhrase Phrases[] = {
    "None", // Norsk
    "ei", // suomi
    "None", // Polski
-    "None", // Espa<70>ol
+    "Ninguno", // Espa<70>ol
    "None", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "None", // Svenska
    "None", // Romaneste
@@ -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
@@ -877,7 +877,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "L<EFBFBD>hetteen tiedot", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Informaci<EFBFBD>n del flujo", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -899,7 +899,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "MPEG-taso", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Nivel MPEG", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -921,7 +921,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Kuvaraita", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Flujo de video", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -943,7 +943,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Bittinopeus", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Tasa de bits", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -965,7 +965,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Ruudunp<EFBFBD>ivitysnopeus", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Tasa de frames", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1009,7 +1009,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Kuvasuhde", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Proporciones de la imagen", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1031,7 +1031,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "varattu", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "reservado", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1053,7 +1053,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "vapaa", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "libre", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1075,7 +1075,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Kuvaformaatti", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Formato de video", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1141,7 +1141,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "tuntematon", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "desconocido", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1163,7 +1163,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Resoluutio", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Resoluci<EFBFBD>n", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1185,7 +1185,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "<EFBFBD><EFBFBD>niraita", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Flujo de audio", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1207,7 +1207,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "N<EFBFBD>ytteenottotaajuus", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Frecuencia de muestreo", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1405,7 +1405,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "ei ilmaistu", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "no indicado", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1449,7 +1449,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "AC-3-<2D><>niraita", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Flujo AC-3", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1471,7 +1471,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Kehyksen koko", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Tama<EFBFBD>o de frame", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1493,7 +1493,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "L<EFBFBD>hetteen tyyppi", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Modo bitstream", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1506,7 +1506,7 @@ const tI18nPhrase Phrases[] = {
    "", // <20>esky (Czech)
  },
  { "Audio Coding Mode", // English
-    "Audio Coding Modus", // Deutsch
+    "Audiokodierung", // Deutsch
    "", // Slovenski
    "", // Italiano
    "", // Nederlands
@@ -1515,7 +1515,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "<EFBFBD><EFBFBD>nikoodaus", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Modo de codificaci<63>n de audio", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1537,7 +1537,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Keskikanavan taso", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Nivel sonoro central", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1559,7 +1559,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Tehostekanavien taso", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Nivel sonoro surround", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1581,7 +1581,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Dolby Surround -tehoste", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Nivel sonoro Dolby Surround", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1603,7 +1603,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "LFE-kanava", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Efectos de baja frecuencia", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1625,7 +1625,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Dialogin normalisointi", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Normalizaci<EFBFBD>n del di<64>logo", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1647,7 +1647,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "P<EFBFBD><EFBFBD>asiallinen (CM)", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Principal (CM)", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1669,7 +1669,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Musiikki ja tehosteet (ME)", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "M<EFBFBD>sica y efectos (ME)", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1691,7 +1691,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "N<EFBFBD>k<EFBFBD>rajoitteinen (VI)", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Imagen deteriorada (VI)", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1713,7 +1713,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Kuulorajoitteinen (HI)", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Hearing deteriorado", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1735,7 +1735,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Vuoropuhelu (D)", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Di<EFBFBD>logo (D)", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1757,7 +1757,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Kommentointi (C)", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Comentario (C)", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1779,7 +1779,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "H<EFBFBD>t<EFBFBD>tiedote (E)", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Emergencia (E)", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -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
@@ -1801,7 +1801,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "P<EFBFBD><EFBFBD>lle puhuttu (VO)", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Voz off (VO)", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1823,7 +1823,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Karaoke", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Karaoke", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1845,7 +1845,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "kan. 1", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Can. 1", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1867,7 +1867,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "kan. 2", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Can. 2", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1889,7 +1889,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "K", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "C", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1911,7 +1911,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "V", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "I", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1933,7 +1933,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "O", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "D", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1955,7 +1955,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "T", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "S", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1977,7 +1977,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "TV", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "SI", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -1999,7 +1999,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "TO", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "SD", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2021,7 +2021,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "N<EFBFBD>yt<EFBFBD> salausj<73>rjestelm<6C>", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Mostrar sistema CA", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2043,7 +2043,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "kiinte<EFBFBD>", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Fijo", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2056,7 +2056,7 @@ const tI18nPhrase Phrases[] = {
    "", // <20>esky (Czech)
  },
  { "Analog", // English
-    "", // Deutsch
+    "Analog", // Deutsch
    "", // Slovenski
    "", // Italiano
    "", // Nederlands
@@ -2065,7 +2065,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "analoginen", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Anal<EFBFBD>gico", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2078,7 +2078,7 @@ const tI18nPhrase Phrases[] = {
    "", // <20>esky (Czech)
  },
  { "Free to Air", // English
-    "Free to Air", // Deutsch
+    "Frei empfangbar", // Deutsch
    "", // Slovenski
    "", // Italiano
    "", // Nederlands
@@ -2087,7 +2087,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "salaamaton", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Free to air", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2109,7 +2109,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "SECA/Mediaguard", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "SECA/Mediguard", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2131,7 +2131,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Viaccess", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Viaccess", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2153,7 +2153,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Irdeto", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Irdeto", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2175,7 +2175,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "NDS/Videoguard", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "NDS/Videoguard", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2197,7 +2197,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "Conax", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "Conax", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2219,7 +2219,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "CryptoWorks", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "CryptoWorks", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2241,7 +2241,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "PowerVu", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "PowerVu", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2263,7 +2263,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "BetaCrypt", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "BetaCrypt", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2285,7 +2285,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk
    "NagraVision", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "NagraVision", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2307,7 +2307,7 @@ const tI18nPhrase Phrases[] = {
    "", // Norsk   
    "SkyCrypt", // suomi
    "", // Polski
-    "", // Espa<70>ol
+    "SkyCrypt", // Espa<70>ol
    "", // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Greek)
    "", // Svenska
    "", // Romaneste
@@ -2321,3 +2321,4 @@ const tI18nPhrase Phrases[] = {
  },
  { NULL }
 };
+
--- a/femonosd.c
+++ b/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);
--- 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",
Author	SHA1	Message	Date
Rolf Ahrenberg	6ce0ca32bd	Fixed device switching priority (Thanks to Andreas Brugger). Fixed device switching back to the primary device.	2006-06-06 04:20:00 +03:00
Rolf Ahrenberg	74a2a1bbe7	Updated for vdr-1.4.0. Modified APIVERSION code in Makefile. Updated german translation (Thanks to Andreas Brachold).	2006-04-30 04:20:00 +03:00
Rolf Ahrenberg	bf85e32d0d	Added STRIP option for Makefile (Thanks to Ville Skyttä). Modified APIVERSION code in Makefile.	2006-04-23 04:20:00 +03:00
Rolf Ahrenberg	caf42f7ace	Updated for vdr-1.3.47.	2006-04-20 04:20:00 +03:00
Rolf Ahrenberg	c2b1e5a187	Updated for vdr-1.3.44. Minor Makefile changes. Made all symbol data 'const'. Added spanish translation (Thanks to Luis Palacios).	2006-03-08 04:20:00 +02:00