configure.ac: bump revision to 3.4.1

TODO: 	This should be controlled inside header base class.
	paint() method seems suitable.
	I Will try to implement it soon.

README.md

@@ -0,0 +1 @@
+Neutrino-HD ツ

acinclude.m4

@@ -82,21 +82,33 @@ check_path () {
 
 ])
 
+dnl expand nested ${foo}/bar
+AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2"
+	for __CNT in false false false false true; do dnl max 5 levels of indirection
+
+		$1=`eval echo "$__$1"`
+		echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable
+		__$1="${$1}"
+	done
+	$__CNT && AC_MSG_ERROR([can't expand variable $1=$2]) dnl bail out if we did not expand
+])
+
 AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[
 AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
 	_$2=$withval
 	if test "$TARGET" = "cdk"; then
-		$2=`eval echo "$TARGET_PREFIX$withval"`
+		$2=`eval echo "$TARGET_PREFIX$withval"` # no indirection possible IMNSHO
 	else
 		$2=$withval
 	fi
 	TARGET_$2=${$2}
 ],[
-	$2="\${$3}$5"
+	# RFC 1925: "you can always add another level of indirection..."
+	TUXBOX_EXPAND_VARIABLE($2,"${$3}$5")
 	if test "$TARGET" = "cdk"; then
-		_$2=`eval echo "${target$3}$5"`
+		TUXBOX_EXPAND_VARIABLE(_$2,"${target$3}$5")
 	else
-		_$2=`eval echo "${$3}$5"`
+		_$2=${$2}
 	fi
 	TARGET_$2=$_$2
 ])
@@ -123,43 +135,58 @@ if test "$TARGET" = "cdk"; then
 fi
 
 TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config,
-	[--with-configdir=PATH   ],[where to find the config files])
+	[--with-configdir=PATH         ],[where to find the config files])
 
 TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,/tuxbox,
-	[--with-datadir=PATH     ],[where to find data])
+	[--with-datadir=PATH           ],[where to find data])
 
 TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
-	[--with-fontdir=PATH     ],[where to find the fonts])
+	[--with-fontdir=PATH           ],[where to find the fonts])
 
 TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
-	[--with-gamesdir=PATH    ],[where games data is stored])
+	[--with-gamesdir=PATH          ],[where games data is stored])
 
 TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
-	[--with-libdir=PATH      ],[where to find the internal libs])
+	[--with-libdir=PATH            ],[where to find the internal libs])
 
 TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
-	[--with-plugindir=PATH   ],[where to find the plugins])
+	[--with-plugindir=PATH         ],[where to find the plugins])
+
+TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins,
+	[--with-plugindir_var=PATH     ],[where to find the plugins in /var])
+
+TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins,
+	[--with-plugindir_mnt=PATH     ],[where to find the the extern plugins])
 
 TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins,
-	[--with-luaplugindir=PATH   ],[where to find Lua plugins])
+	[--with-luaplugindir=PATH      ],[where to find Lua plugins])
 
 TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale,
-	[--with-localedir=PATH     ],[where to find the locale])
+	[--with-localedir=PATH         ],[where to find the locale])
+
+TUXBOX_APPS_DIRECTORY_ONE(localedir_var,LOCALEDIR_VAR,localstatedir,/var,/tuxbox/locale,
+	[--with-localedir_var=PATH     ],[where to find the locale in /var])
 
 TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share, /tuxbox/neutrino/themes,
-	[--with-themesdir=PATH     ],[where to find the themes])
+	[--with-themesdir=PATH         ],[where to find the themes])
+
+TUXBOX_APPS_DIRECTORY_ONE(themesdir_var,THEMESDIR_VAR,localstatedir,/var,/tuxbox/themes,
+	[--with-themesdir_var=PATH     ],[where to find the themes in /var])
 
 TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share, /tuxbox/neutrino/icons,
-	[--with-iconsdir=PATH     ],[where to find the icons])
+	[--with-iconsdir=PATH          ],[where to find the icons])
+
+TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var,ICONSDIR_VAR,localstatedir,/var,/tuxbox/icons,
+	[--with-iconsdir_var=PATH      ],[where to find the icons in /var])
 
 TUXBOX_APPS_DIRECTORY_ONE(private_httpddir,PRIVATE_HTTPDDIR,datadir,/share,/tuxbox/neutrino/httpd,
-	[--with-private_httpddir=PATH     ],[where to find the the private httpd files])
+	[--with-private_httpddir=PATH  ],[where to find the the private httpd files])
 
 TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/httpd,
-	[--with-public_httpddir=PATH     ],[where to find the the public httpd files])
+	[--with-public_httpddir=PATH   ],[where to find the the public httpd files])
 
 TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted,
-	[--with-hosted_httpddir=PATH     ],[where to find the the hosted files])
+	[--with-hosted_httpddir=PATH   ],[where to find the the hosted files])
 ])
 
 dnl automake <= 1.6 needs this specifications
@@ -302,6 +329,7 @@ if $PKG_CONFIG --exists "$2" ; then
 	AC_MSG_RESULT(yes)
 	$1_CFLAGS=$($PKG_CONFIG --cflags "$2")
 	$1_LIBS=$($PKG_CONFIG --libs "$2")
+	$1_EXISTS=yes
 else
 	AC_MSG_RESULT(no)
 fi
@@ -312,7 +340,7 @@ AC_SUBST($1_LIBS)
 
 AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
-if test -z "$$1_CFLAGS" ; then
+if test x"$$1_EXISTS" != xyes; then
 	AC_MSG_ERROR([could not find package $2]);
 fi
 ])

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(tuxbox-neutrino,1.0.1)
+AC_INIT(Tuxbox-Neutrino,3.4.1)
 AM_INIT_AUTOMAKE([1.0.1 nostdinc])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
@@ -89,8 +89,29 @@ fi
 AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
 
 # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
-TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)
-TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
+TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
+TUXBOX_APPS_LIB_PKGCONFIG(FREETYPE,freetype2)
+CPPFLAGS+=" $(freetype-config --cflags)"
+AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher])
+	AC_TRY_CPP([
+		#include <ft2build.h>
+		#include FT_FREETYPE_H
+		#if FREETYPE_MAJOR < 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR < 5)
+		#error Freetype version too low.
+		#endif
+		],
+		[AC_MSG_RESULT(yes)],
+		[AC_MSG_ERROR([Need FreeType library version 2.5.0 or higher])
+	])
+
+# fallback to curl-config (which is ugly for cross-compilation)
+if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then
+	TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)
+fi
+# fallback to freetype-config (which is ugly for cross-compilation)
+if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then
+	TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
+fi
 
 TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
 TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
@@ -212,7 +233,7 @@ if test "$BOXTYPE" = "coolstream"; then
 if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream'
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
 
 if test "$BOXMODEL" = "apollo"; then
 if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
@@ -221,34 +242,20 @@ fi
 if test -e ${srcdir}/lib/libcoolstream2/cs_frontpanel.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.])
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2'
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private'
 fi
 fi
 
 # hack to define a short filename also for out-of-tree build
-if test `dirname $0` = `pwd`; then
+if test `dirname $0` = `pwd` || test "$0" = ./configure; then
 	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__=__FILE__'
+	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__=__FILE__'
 else
 	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__="\"$(subst $(srcdir)/,,$(abspath $<))\""'
+	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__="\"$(subst $(top_srcdir)/,,$(abspath $<))\""'
 fi
-#
-# Check for libtdservicedb - the new one - for testing only
-#
-#CSL_VERSION=0.0.1
-#FCSL_VERSION=`$PKG_CONFIG --modversion libcoolstream`
-#AC_MSG_CHECKING(for package libcoolstream >= $CSL_VERSION)
-#if $PKG_CONFIG --atleast-version $CSL_VERSION libcoolstream ; then
-      #AC_MSG_RESULT(found (version $FCSL_VERSION))
-      #LIBCS_CFLAGS=`$PKG_CONFIG --cflags libcoolstream`
-      #LIBCS_LIBS=`$PKG_CONFIG --libs libcoolstream`
-#else
-      #AC_MSG_ERROR([
-#*** libcoolstream $CSL_VERSION or newer is required! ***
-  #])
-#fi
+
 AC_SUBST(HWLIB_CFLAGS)
-AC_SUBST(LIBCS_CFLAGS)
-AC_SUBST(LIBCS_LIBS)
 AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(VORBISIDEC_CFLAGS)
@@ -259,64 +266,81 @@ AC_SUBST(BLURAY_LIBS)
 
 AC_OUTPUT([
 Makefile
-lib/Makefile
-lib/libconfigfile/Makefile
-lib/connection/Makefile
-lib/libeventserver/Makefile
-lib/libmd5sum/Makefile
-lib/libnet/Makefile
-lib/xmltree/Makefile
-lib/jsoncpp/Makefile
-lib/sectionsdclient/Makefile
-lib/timerdclient/Makefile
-lib/libtriple/Makefile
-lib/libtuxtxt/Makefile
-lib/libdvbsub/Makefile
-lib/libupnpclient/Makefile
-lib/libiw/Makefile
-lib/luaclient/Makefile
-src/lcddisplay/Makefile
-src/nhttpd/Makefile
-src/nhttpd/web/Makefile
-src/nhttpd/web/images/Makefile
-src/nhttpd/web/scripts/Makefile
-src/nhttpd/web/languages/Makefile
-src/nhttpd/web/styles/Makefile
-src/nhttpd/tuxboxapi/Makefile
-src/nhttpd/yhttpd_core/Makefile
-src/nhttpd/yhttpd_mods/Makefile
-src/nhttpd/nhttpd.conf
-src/Makefile
-src/daemonc/Makefile
-src/driver/pictureviewer/Makefile
-src/driver/audiodec/Makefile
-src/driver/Makefile
-src/gui/Makefile
-src/gui/bedit/Makefile
-src/gui/components/Makefile
-src/gui/lua/Makefile
-src/gui/widget/Makefile
-src/system/Makefile
-src/system/mtdutils/Makefile
-src/system/mtdutils/lib/Makefile
 data/Makefile
 data/fonts/Makefile
 data/icons/Makefile
+data/icons/buttons/Makefile
+data/icons/filetypes/Makefile
+data/icons/headers/Makefile
+data/icons/hints/Makefile
+data/icons/locale/Makefile
+data/icons/movieplayer/Makefile
+data/icons/radar/Makefile
+data/icons/slider/Makefile
+data/icons/status/Makefile
+data/icons/status/ca/Makefile
+data/icons/status/channel/Makefile
+data/icons/status/markers/Makefile
+data/icons/status/various/Makefile
+data/icons/various/Makefile
 data/inetradio/Makefile
 data/initial/Makefile
 data/iso-codes/Makefile
 data/lcd/Makefile
-data/lcd/icons/Makefile
 data/lcd/clock/Makefile
+data/lcd/icons/Makefile
 data/license/Makefile
 data/locale/Makefile
 data/neutrino-scripts/Makefile
+data/pictures/Makefile
+data/pictures/backgrounds/Makefile
+data/pictures/screensaver/Makefile
 data/scripts/Makefile
 data/themes/Makefile
+data/y-web/Makefile
+data/y-web/images/Makefile
+data/y-web/languages/Makefile
+data/y-web/scripts/Makefile
+data/y-web/styles/Makefile
+lib/Makefile
+lib/connection/Makefile
+lib/jsoncpp/Makefile
+lib/libconfigfile/Makefile
+lib/libdvbsub/Makefile
+lib/libeventserver/Makefile
+lib/libiw/Makefile
+lib/libmd5sum/Makefile
+lib/libnet/Makefile
+lib/libtuxtxt/Makefile
+lib/libupnpclient/Makefile
+lib/luaclient/Makefile
+lib/sectionsdclient/Makefile
+lib/timerdclient/Makefile
+lib/xmltree/Makefile
+src/Makefile
+src/daemonc/Makefile
+src/driver/Makefile
+src/driver/audiodec/Makefile
+src/driver/pictureviewer/Makefile
 src/eitd/Makefile
+src/gui/Makefile
+src/gui/bedit/Makefile
+src/gui/components/Makefile
+src/gui/lua/Makefile
+src/gui/moviebrowser/Makefile
+src/gui/widget/Makefile
+src/lcddisplay/Makefile
+src/nhttpd/Makefile
+src/nhttpd/nhttpd.conf
+src/nhttpd/tuxboxapi/Makefile
+src/nhttpd/yhttpd_core/Makefile
+src/nhttpd/yhttpd_mods/Makefile
+src/system/Makefile
+src/system/mtdutils/Makefile
+src/system/mtdutils/lib/Makefile
 src/timerd/Makefile
 src/zapit/Makefile
+src/zapit/data/Makefile
 src/zapit/lib/Makefile
 src/zapit/src/Makefile
-src/zapit/data/Makefile
 ])

data/Makefile.am

@@ -1,4 +1,16 @@
-SUBDIRS = fonts icons inetradio initial iso-codes license locale scripts themes neutrino-scripts
+SUBDIRS = \
+	fonts \
+	icons \
+	inetradio \
+	initial \
+	iso-codes \
+	license \
+	locale \
+	neutrino-scripts \
+	pictures \
+	scripts \
+	themes \
+	y-web
 
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd

data/cables.xml

@@ -220,11 +220,10 @@
 		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Unitymedia" satfeed="true" flags="9">
-		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="138000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="146000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="154000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="162000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -245,32 +244,27 @@
 		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="682000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="738000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="754000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="762000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="770000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="778000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="794000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="810000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="818000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="826000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="834000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="842000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="850000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="858000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Kabel BW" satfeed="true" flags="9">
 		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -512,22 +506,27 @@
 		<transponder frequency="458000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="466000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="482000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="498000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="506000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="514000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="530000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="546000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
+		<transponder frequency="546000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="570000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
+		<transponder frequency="570000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="578000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Antennengemeinschaft Penig" satfeed="true" flags="9">
 		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="3"/>

data/epgmap.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<zapit>
+	<filter channel_id="b85a1450013e0d49" new_epg_id="ac423070013e213f"/> --rai1
+	<filter channel_id="b12003ee00011072" new_epg_id="ac423070013e213f"/> --rai1
+
+	<filter channel_id="ac9630d4013e4530" new_epg_id="ac423070013e2140"/> --rai2
+	<filter channel_id="b12003ee00011073" new_epg_id="ac423070013e2140"/> --rai2
+
+	<filter channel_id="b12003ee00011074" new_epg_id="ac423070013e2141"/> --rai3
+	<filter channel_id="ac9630d4013e4531" new_epg_id="ac423070013e2141"/> --rai3
+
+	<filter channel_id="ac9630d4013e4534" new_epg_id="ac423070013e2142"/> --rai4
+
+	<filter channel_id="ac9630d4013e4533" new_epg_id="ac421518013e0ce9"/> --raisport1
+	<filter channel_id="b12003ee00011078" new_epg_id="ac423070013e2144"/> --rainews24
+
+	<filter channel_id="b4d6070800c80e26" new_epg_id="b45803fb0001283d"/> --Das Erste
+</zapit>

data/icons/Makefile.am

@@ -1,275 +1,11 @@
-installdir = $(ICONSDIR)
-
-locale = \
-	locale/deutsch.png \
-	locale/english.png
-
-locale_unmaintained = \
-	locale/unmaintained/bayrisch.png \
-	locale/unmaintained/bosanski.png \
-	locale/unmaintained/ch-baslerdeutsch.png \
-	locale/unmaintained/ch-berndeutsch.png \
-	locale/unmaintained/czech.png \
-	locale/unmaintained/francais.png \
-	locale/unmaintained/italiano.png \
-	locale/unmaintained/nederlands.png \
-	locale/unmaintained/polski.png \
-	locale/unmaintained/portugues.png \
-	locale/unmaintained/russkij.png \
-	locale/unmaintained/slovak.png \
-	locale/unmaintained/suomi.png \
-	locale/unmaintained/svenska.png
-
-install_DATA  = $(locale)
-install_DATA += $(locale_unmaintained)
-
-install_DATA += \
-	0.png \
-	1.png \
-	16_9.png \
-	16_9_gray.png \
-	2.png \
-	3.png \
-	4.png \
-	5.png \
-	6.png \
-	7.png \
-	8.png \
-	9.png \
-	ats.png \
-	ats_gray.png \
-	audio.png \
-	audioplay.png \
-	biss_green.png \
-	biss_white.png \
-	biss_yellow.png \
-	blau.png \
-	bookmarkmanager.png \
-	border_lr.png \
-	border_ul.png \
-	btn_backward.png \
-	btn_forward.png \
-	btn_pause.png \
-	btn_play.png \
-	btn_record_active.png \
-	btn_record_inactive.png \
-	btn_stop.png \
-	ca.png \
-	ca2.png \
-	ca2_gray.png \
-	checkmark.png \
-	colors.png \
-	conax_green.png \
-	conax_white.png \
-	conax_yellow.png \
-	cw_green.png \
-	cw_white.png \
-	cw_yellow.png \
-	d_green.png \
-	d_white.png \
-	d_yellow.png \
-	dd.png \
-	dd_avail.png \
-	dd_gray.png \
-	down.png \
-	dummy.png \
-	dummy_small.png \
-	error.png \
-	epg.png \
-	features.png \
-	file.png \
-	folder.png \
-	games.png \
-	gelb.png \
-	gruen.png \
-	help.png \
-	help_small.png \
-	hidden.png \
-	hint_a_pic.png \
-	hint_aplay.png \
-	hint_audio.png \
-	hint_back.png \
-	hint_bedit.png \
-	hint_ci.png \
-	hint_dboxinfo.png \
-	hint_delete.png \
-	hint_extended.png \
-	hint_fileplay.png \
-	hint_games.png \
-	hint_hdd.png \
-	hint_imageinfo.png \
-	hint_inetradio.png \
-	hint_info.png \
-	hint_keys.png \
-	hint_language.png \
-	hint_manage.png \
-	hint_mb.png \
-	hint_media.png \
-	hint_movie.png \
-	hint_network.png \
-	hint_next.png \
-	hint_osd.png \
-	hint_personalize.png \
-	hint_picview.png \
-	hint_plugin.png \
-	hint_protection.png \
-	hint_radiomode.png \
-	hint_reboot.png \
-	hint_recording.png \
-	hint_reload.png \
-	hint_restart.png \
-	hint_save.png \
-	hint_scan.png \
-	hint_scripts.png \
-	hint_service.png \
-	hint_settings.png \
-	hint_shutdown.png \
-	hint_sleeptimer.png \
-	hint_streaminfo.png \
-	hint_swupdate.png \
-	hint_timers.png \
-	hint_tvmode.png \
-	hint_tvradio_switch.png \
-	hint_vfd.png \
-	hint_video.png \
-	hint_ytplay.png \
-	home.png \
-	icon_green.png \
-	icon_movieplayer.png \
-	icon_red.png \
-	icon_yellow.png \
-	icon_ytplay.png \
-	important.png \
-	info.png \
-	info_small.png \
-	information.png \
-	ird_green.png \
-	ird_white.png \
-	ird_yellow.png \
-	keybinding.png \
-	language.png \
-	lcd.png \
-	left.png \
-	local.png \
-	lock.png \
-	lock_passive.png \
-	mainmenue.png \
-	menu.png \
-	menu_small.png \
-	mounted.png \
-	movie.png \
-	mp_b-skip.png \
-	mp_f-skip.png \
-	mp_pause.png \
-	mp_play.png \
-	mp_play_repeat_all.png \
-	mp_play_repeat_track.png \
-	mp3.jpg \
-	mp3.png \
-	mp3-0.jpg \
-	mp3-1.jpg \
-	mp3-2.jpg \
-	mp3-3.jpg \
-	mp3-4.jpg \
-	mp3-5.jpg \
-	mp3-6.jpg \
-	mp3-7.jpg \
-	multimedia.png \
-	mute.png \
-	mute_small.png \
-	mute_zap_gray.png \
-	mute_zap_green.png \
-	nagra_green.png \
-	nagra_white.png \
-	nagra_yellow.png \
-	nds_green.png \
-	nds_white.png \
-	nds_yellow.png \
-	network.png \
-	not_mounted.png \
-	notyet.png \
-	numericpad.png \
-	ok.png \
-	personalize.png \
-	pip.png \
-	power.png \
-	powervu_green.png \
-	powervu_white.png \
-	powervu_yellow.png \
-	radar.pal \
-	radar_red.pal \
-	radar0.raw \
-	radar1.raw \
-	radar2.raw \
-	radar3.raw \
-	radar4.raw \
-	radar5.raw \
-	radar6.raw \
-	radar7.raw \
-	radar8.raw \
-	radar9.raw \
-	radiomode.jpg \
-	radiotextget.png \
-	radiotextoff.png \
-	radiotextwait.png \
-	rclock.png \
-	rec.png \
-	rec_event_marker.png \
-	rec_gray.png \
-	recording.png \
-	res_000.png \
-	res_1080.png \
-	res_1280.png \
-	res_1440.png \
-	res_1920.png \
-	res_288.png \
-	res_352.png \
-	res_382.png \
-	res_480.png \
-	res_528.png \
-	res_544.png \
-	res_576.png \
-	res_704.png \
-	res_720.png \
-	res_hd.png \
-	res_sd.png \
-	right.png \
-	rot.png \
-	scan.jpg \
-	seca_green.png \
-	seca_white.png \
-	seca_yellow.png \
-	settings.png \
-	shell.png \
-	shutdown.jpg \
-	softupdate.png \
-	start.jpg \
-	streaming.png \
-	subt.png \
-	subt_gray.png \
-	timer.png \
-	tuner_1.png \
-	tuner_2.png \
-	tuner_3.png \
-	tuner_4.png \
-	up.png \
-	upnp.png \
-	via_green.png \
-	via_white.png \
-	via_yellow.png \
-	video.png \
-	volume.png \
-	volumebody.png \
-	volumeslider2.png \
-	volumeslider2alpha.png \
-	volumeslider2blue.png \
-	volumeslider2green.png \
-	volumeslider2red.png \
-	vtxt.png \
-	vtxt_gray.png \
-	warning.png \
-	x_green.png \
-	x_white.png \
-	x_yellow.png \
-	zap.png
-
+SUBDIRS = \
+	buttons \
+	filetypes \
+	headers \
+	hints \
+	locale \
+	movieplayer \
+	radar \
+	slider \
+	status \
+	various

data/icons/buttons/Makefile.am

@@ -0,0 +1,42 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	0.png \
+	1.png \
+	2.png \
+	3.png \
+	4.png \
+	5.png \
+	6.png \
+	7.png \
+	8.png \
+	9.png \
+	blau.png \
+	btn_backward.png \
+	btn_forward.png \
+	btn_pause.png \
+	btn_play.png \
+	btn_record_active.png \
+	btn_record_inactive.png \
+	btn_stop.png \
+	down.png \
+	dummy.png \
+	dummy_small.png \
+	gelb.png \
+	gruen.png \
+	help.png \
+	help_small.png \
+	home.png \
+	info.png \
+	info_small.png \
+	left.png \
+	menu.png \
+	menu_small.png \
+	mute_small.png \
+	mute_zap_gray.png \
+	mute_zap_green.png \
+	ok.png \
+	power.png \
+	right.png \
+	rot.png \
+	up.png

data/icons/filetypes/Makefile.am

@@ -0,0 +1,6 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	file.png \
+	folder.png \
+	movie.png

data/icons/headers/Makefile.am

@@ -0,0 +1,31 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	audio.png \
+	bookmarkmanager.png \
+	colors.png \
+	error.png \
+	features.png \
+	games.png \
+	icon_green.png \
+	icon_movieplayer.png \
+	icon_red.png \
+	icon_yellow.png \
+	icon_ytplay.png \
+	information.png \
+	keybinding.png \
+	language.png \
+	lcd.png \
+	mainmenue.png \
+	mp3.png \
+	multimedia.png \
+	network.png \
+	personalize.png \
+	recording.png \
+	settings.png \
+	shell.png \
+	softupdate.png \
+	streaming.png \
+	timer.png \
+	upnp.png \
+	video.png