Merge branch 'next-cc'

use buttons up/down to change height, left/right to change width, page up/down to change both

.gitignore

@@ -25,6 +25,10 @@ INSTALL
 *.la
 .*.swp
 
+### editor crap
+*.rej
+*~
+
 ### binaries that fall out of the build
 lib/sectionsdclient/sectionsdcontrol
 src/neutrino
@@ -32,4 +36,8 @@ src/nhttpd/web/*.js.gz
 src/zapit/src/pzapit
 src/zapit/src/udpstreampes
 src/drivertool
-src/gui/svn_version.h
+src/dt
+src/rcsim.h
+src/rcsim
+src/gui/version.h
+src/nhttpd/nhttpd.conf

acinclude.m4

@@ -11,7 +11,7 @@ AC_ARG_WITH(target,
 
 AC_ARG_WITH(targetprefix,
 	[  --with-targetprefix=PATH  prefix relative to target root (only applicable in cdk mode)],
-	[targetprefix="$withval"],[targetprefix="NONE"])
+	[TARGET_PREFIX="$withval"],[TARGET_PREFIX="NONE"])
 
 AC_ARG_WITH(debug,
 	[  --without-debug         disable debugging code],
@@ -22,6 +22,11 @@ if test "$DEBUG" = "yes"; then
 	AC_DEFINE(DEBUG,1,[Enable debug messages])
 fi
 
+AC_ARG_ENABLE(tmsdk,
+        AS_HELP_STRING(--enable-tmsdk,         compile inside sdk),
+        ,[enable_tmsdk=no])
+AM_CONDITIONAL(ENABLE_TMSDK,test "$enable_tmsdk" = "yes")
+
 AC_MSG_CHECKING(target)
 
 if test "$TARGET" = "native"; then
@@ -34,6 +39,10 @@ if test "$TARGET" = "native"; then
 	if test "$prefix" = "NONE"; then
 		prefix=/usr/local
 	fi
+	TARGET_PREFIX=$prefix
+	if test "$exec_prefix" = "NONE"; then
+		exec_prefix=$prefix
+	fi
 	targetprefix=$prefix
 elif test "$TARGET" = "cdk"; then
 	AC_MSG_RESULT(cdk)
@@ -46,10 +55,14 @@ elif test "$TARGET" = "cdk"; then
 		CXXFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS"
 	fi
 	if test "$prefix" = "NONE"; then
-		AC_MSG_ERROR(invalid prefix, you need to specify one in cdk mode)
+		AC_MSG_ERROR([invalid prefix, you need to specify one in cdk mode])
 	fi
-	if test "$targetprefix" = "NONE"; then
-		targetprefix=""
+	if test "$TARGET_PREFIX" != "NONE"; then
+		AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX",[The targets prefix])
+	fi
+	if test "$TARGET_PREFIX" = "NONE"; then
+		AC_MSG_ERROR([invalid targetprefix, you need to specify one in cdk mode])
+		TARGET_PREFIX=""
 	fi
 	if test "$host_alias" = ""; then
 		cross_compiling=yes
@@ -73,7 +86,7 @@ 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 "${targetprefix}$withval"`
+		$2=`eval echo "$TARGET_PREFIX$withval"`
 	else
 		$2=$withval
 	fi
@@ -88,7 +101,6 @@ AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
 	TARGET_$2=$_$2
 ])
 
-dnl automake <= 1.6 don't support this
 dnl AC_SUBST($2)
 AC_DEFINE_UNQUOTED($2,"$_$2",$7)
 AC_SUBST(TARGET_$2)
@@ -102,10 +114,12 @@ if test "$TARGET" = "cdk"; then
 	sysconfdir="\${prefix}/etc"
 	localstatedir="\${prefix}/var"
 	libdir="\${prefix}/lib"
-	targetdatadir="\${targetprefix}/share"
-	targetsysconfdir="\${targetprefix}/etc"
-	targetlocalstatedir="\${targetprefix}/var"
-	targetlibdir="\${targetprefix}/lib"
+	mntdir="\${prefix}/mnt"
+	targetdatadir="\${TARGET_PREFIX}/share"
+	targetsysconfdir="\${TARGET_PREFIX}/etc"
+	targetlocalstatedir="\${TARGET_PREFIX}/var"
+	targetlibdir="\${TARGET_PREFIX}/lib"
+	targetmntdir="\${TARGET_PREFIX}/mnt"
 fi
 
 TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config,
@@ -129,8 +143,20 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
 TUXBOX_APPS_DIRECTORY_ONE(ucodedir,UCODEDIR,localstatedir,/var,/tuxbox/ucodes,
 	[--with-ucodedir=PATH    ],[where to find the ucodes])
 
-TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share,/tuxbox/neutrino/themes,
+TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share/tuxbox, /neutrino/themes,
 	[--with-themesdir=PATH     ],[where to find the themes (don't change)])
+
+TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share/tuxbox, /neutrino/icons,
+	[--with-iconsdir=PATH     ],[where to find the icons (don't change)])
+
+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])
+
+TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/httpd,
+	[--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])
 ])
 
 dnl automake <= 1.6 needs this specifications
@@ -139,9 +165,14 @@ AC_SUBST(DATADIR)
 AC_SUBST(FONTDIR)
 AC_SUBST(GAMESDIR)
 AC_SUBST(LIBDIR)
+AC_SUBST(MNTDIR)
 AC_SUBST(PLUGINDIR)
 AC_SUBST(UCODEDIR)
 AC_SUBST(THEMESDIR)
+AC_SUBST(ICONSDIR)
+AC_SUBST(PRIVATE_HTTPDDIR)
+AC_SUBST(PUBLIC_HTTPDDIR)
+AC_SUBST(HOSTED_HTTPDDIR)
 dnl end workaround
 
 AC_DEFUN([TUXBOX_APPS_ENDIAN],[
@@ -216,18 +247,18 @@ if test "$$1_CONFIG" != "no"; then
 	if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then
 		AC_MSG_$3([could not find a suitable version of $2]);
 	else
-                if test "$1" = "CURL"; then
-                	$1_CFLAGS=$($$1_CONFIG --cflags)
+		if test "$1" = "CURL"; then
+			$1_CFLAGS=$($$1_CONFIG --cflags)
 			$1_LIBS=$($$1_CONFIG --libs)
 		else
-	    		if test "$1" = "FREETYPE"; then
-	            		$1_CFLAGS=$($$1_CONFIG --cflags)
-	            		$1_LIBS=$($$1_CONFIG --libs)
-	    		else
-	            		$1_CFLAGS=$($$1_CONFIG --prefix=$targetprefix --cflags)
-	            		$1_LIBS=$($$1_CONFIG --prefix=$targetprefix --libs)
+			if test "$1" = "FREETYPE"; then
+			$1_CFLAGS=$($$1_CONFIG --cflags)
+				$1_LIBS=$($$1_CONFIG --libs)
+			else
+				$1_CFLAGS=$($$1_CONFIG --prefix=$TARGET_PREFIX --cflags)
+				$1_LIBS=$($$1_CONFIG --prefix=$TARGET_PREFIX --libs)
 			fi
-	        fi
+		fi
 	fi
 fi
 
@@ -398,9 +429,17 @@ AC_ARG_WITH(boxtype,
 	esac], [BOXTYPE="coolstream"])
 
 AC_ARG_WITH(boxmodel,
-	[  --with-boxmodel         valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025
+	[  --with-boxmodel         valid for coolstream: nevis, apollo
+                          valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025
                           valid for ipbox: ip200, ip250, ip350, ip400],
 	[case "${withval}" in
+		nevis|apollo)
+			if test "$BOXTYPE" = "coolstream"; then
+				BOXMODEL="$withval"
+			else
+				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
+			fi
+			;;
 		dm500|dm500plus|dm600pvr|dm56x0|dm7000|dm7020|dm7025)
 			if test "$BOXTYPE" = "dreambox"; then
 				BOXMODEL="$withval"
@@ -418,7 +457,7 @@ AC_ARG_WITH(boxmodel,
 		*)
 			AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
 			;;
-	esac],
+	esac], [BOXMODEL="nevis"]
 	[if test "$BOXTYPE" = "dreambox" -o "$BOXTYPE" = "ipbox" && test -z "$BOXMODEL"; then
 		AC_MSG_ERROR([Dreambox/IPBox needs --with-boxmodel])
 	fi])
@@ -433,6 +472,9 @@ AM_CONDITIONAL(BOXTYPE_IPBOX, test "$BOXTYPE" = "ipbox")
 AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
 
+AM_CONDITIONAL(BOXMODEL_NEVIS,test "$BOXMODEL" = "nevis")
+AM_CONDITIONAL(BOXMODEL_APOLLO,test "$BOXMODEL" = "apollo")
+
 AM_CONDITIONAL(BOXMODEL_DM500,test "$BOXMODEL" = "dm500")
 AM_CONDITIONAL(BOXMODEL_DM500PLUS,test "$BOXMODEL" = "dm500plus")
 AM_CONDITIONAL(BOXMODEL_DM600PVR,test "$BOXMODEL" = "dm600pvr")
@@ -459,7 +501,11 @@ elif test "$BOXTYPE" = "generic"; then
 fi
 
 # TODO: do we need more defines?
-if test "$BOXMODEL" = "dm500"; then
+if test "$BOXMODEL" = "nevis"; then
+	AC_DEFINE(BOXMODEL_NEVIS, 1, [coolstream hd1/neo/neo2/zee])
+elif test "$BOXMODEL" = "apollo"; then
+	AC_DEFINE(BOXMODEL_APOLLO, 1, [coolstream tank])
+elif test "$BOXMODEL" = "dm500"; then
 	AC_DEFINE(BOXMODEL_DM500, 1, [dreambox 500])
 elif test "$BOXMODEL" = "ip200"; then
 	AC_DEFINE(BOXMODEL_IP200, 1, [ipbox 200])

autorun.sh

@@ -0,0 +1,19 @@
+export LD_LIBRARY_PATH=/var/lib
+export PATH=${PATH}:/var/bin:/var/plugins
+
+echo "### Starting NEUTRINO ###"
+
+cd /tmp
+/bin/neutrino > /dev/null 2> /dev/null
+
+/bin/sync
+/bin/sync
+
+if [ -e /tmp/.reboot ] ; then
+    /bin/dt -t"Rebooting..."
+    /sbin/reboot -f
+else
+    /bin/dt -t"Panic..."
+    sleep 5
+    /sbin/reboot -f
+fi

configure.ac

@@ -53,6 +53,10 @@ TUXBOX_APPS_LIB_PKGCONFIG_CHECK(MAD,libmad)
 if test -z "$MAD_CFLAGS" ; then
 	TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
 fi
+TUXBOX_APPS_LIB_PKGCONFIG_CHECK(OGG,ogg)
+if test -z "$OGG_CFLAGS" ; then
+	TUXBOX_APPS_LIB_PKGCONFIG(OGG,ogg)
+fi
 TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
 TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
 TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
@@ -114,7 +118,35 @@ if test "$enable_upnp" = "yes"; then
 	AC_DEFINE(ENABLE_UPNP,1,[include UPNP support - currently broken])
 fi
 
-AC_CHECK_HEADERS(coolstream/nevis_ir.h)
+AC_ARG_ENABLE(cleanup,
+	[  --enable-cleanup                  enable cleanup on exit],
+	[AC_DEFINE(EXIT_CLEANUP,1,[enable cleanup on exit])])
+
+AC_ARG_ENABLE(pip,
+	[  --enable-pip                  enable picture in picture support],
+	[AC_DEFINE(ENABLE_PIP,1,[enable picture in picture support])])
+
+
+AM_CONDITIONAL(ENABLE_TEST_MENU,test "$enable_testmenu" = "yes")
+if test "$enable_testmenu" = "yes"; then
+	AC_DEFINE(ENABLE_TEST_MENU,1,[include test menu in neutrino main menu - not recommended for general users!])
+fi
+
+
+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
+
+if test "$BOXMODEL" = "apollo"; then
+if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
+	AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
+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
+fi
+fi
 
 #
 # Check for libtdservicedb - the new one - for testing only
@@ -153,6 +185,7 @@ lib/libtriple/Makefile
 lib/libtuxtxt/Makefile
 lib/libdvbsub/Makefile
 lib/libupnpclient/Makefile
+lib/libiw/Makefile
 src/lcddisplay/Makefile
 src/nhttpd/Makefile
 src/nhttpd/web/Makefile
@@ -163,6 +196,7 @@ src/nhttpd/tuxboxapi/Makefile
 src/nhttpd/tuxboxapi/coolstream/Makefile
 src/nhttpd/yhttpd_core/Makefile
 src/nhttpd/yhttpd_mods/Makefile
+src/nhttpd/nhttpd.conf
 src/Makefile
 src/daemonc/Makefile
 src/driver/pictureviewer/Makefile
@@ -170,17 +204,21 @@ src/driver/audiodec/Makefile
 src/driver/Makefile
 src/gui/Makefile
 src/gui/bedit/Makefile
+src/gui/components/Makefile
 src/gui/widget/Makefile
 src/system/Makefile
 data/Makefile
 data/fonts/Makefile
 data/icons/Makefile
 data/inetradio/Makefile
+data/initial/Makefile
 data/iso-codes/Makefile
 data/lcd/Makefile
 data/lcd/icons/Makefile
 data/lcd/clock/Makefile
+data/license/Makefile
 data/locale/Makefile
+data/neutrino-scripts/Makefile
 data/scripts/Makefile
 data/themes/Makefile
 src/eitd/Makefile
@@ -188,5 +226,12 @@ src/timerd/Makefile
 src/zapit/Makefile
 src/zapit/lib/Makefile
 src/zapit/src/Makefile
+src/zapit/data/Makefile
 ])
 
+if test "$BOXMODEL" = "apollo"; then
+AC_OUTPUT([
+src/system/mtdutils/Makefile
+src/system/mtdutils/lib/Makefile
+])
+fi

cross-configure.apollo.debug

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+PREFIX=/opt/arm/arm-pnx8400-linux-uclibcgnueabi/arm-pnx8400-linux-uclibcgnueabi/sys-root/usr
+CCPATH=
+HOST=arm-pnx8400-linux-uclibcgnueabi
+
+export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
+export CC=$CCPATH$HOST-gcc
+export AR=$CCPATH$HOST-ar
+export NM=$CCPATH$HOST-nm
+export RANLIB=$CCPATH$HOST-ranlib
+export OBJDUMP=$CCPATH$HOST-objdump
+export STRIP=$CCPATH$HOST-strip
+
+export CFLAGS="-Wall -Wextra -Wshadow -g -ggdb3 \
+	-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard \
+	 -D__KERNEL_STRICT_NAMES -DFB_HW_ACCELERATION \
+	-I"$PWD"/include -I"$PWD"/include/linux/dvb -I"$PREFIX"/include/freetype2"
+
+export CXXFLAGS="-Wall -Wextra -Wshadow -g -ggdb3 \
+	-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard \
+	 -D__KERNEL_STRICT_NAMES -DFB_HW_ACCELERATION \
+	-I"$PWD"/include -I"$PWD"/include/linux/dvb -I"$PREFIX"/include/freetype2"
+
+export LDFLAGS="-L"$PREFIX"/lib -lcurl -lssl -lcrypto -ldl"
+
+export DVB_API_VERSION=3
+export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
+export CURL_CONFIG=$PREFIX/bin/curl-config
+
+./autogen.sh
+./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" --with-boxmodel=apollo --enable-mdev "$@"
+

cross-configure.cool

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PREFIX=/opt/newcross/arm-cx2450x-linux-gnueabi/arm-cx2450x-linux-gnueabi/sys-root/usr
+PREFIX=/opt/arm/arm-cx2450x-linux-gnueabi/arm-cx2450x-linux-gnueabi/sys-root/usr
 CCPATH=
 HOST=arm-cx2450x-linux-gnueabi
 
@@ -12,11 +12,11 @@ export RANLIB=$CCPATH$HOST-ranlib
 export OBJDUMP=$CCPATH$HOST-objdump
 export STRIP=$CCPATH$HOST-strip
 
-export CFLAGS="-Wall -Werror -g0 -O2 \
+export CFLAGS="-Wall -Werror -g0 -O2 -fno-strict-aliasing \
 	 -D__KERNEL_STRICT_NAMES -DUSE_NEVIS_GXA \
 	-I"$PWD"/include -I"$PWD"/include/linux/dvb -I"$PREFIX"/include/freetype2"
 
-export CXXFLAGS="-Wall -Werror -g0 -O2 \
+export CXXFLAGS="-Wall -Werror -g0 -O2 -fno-strict-aliasing \
 	 -D__KERNEL_STRICT_NAMES -DUSE_NEVIS_GXA \
 	-I"$PWD"/include -I"$PWD"/include/linux/dvb -I"$PREFIX"/include/freetype2"
 
@@ -27,5 +27,5 @@ export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
 export CURL_CONFIG=$PREFIX/bin/curl-config
 
 ./autogen.sh
-./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --without-driver --with-target=cdk --with-targetprefix="" "$*"
+./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" "$*"
 

cross-configure.cool.debug

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PREFIX=/opt/newcross/arm-cx2450x-linux-gnueabi/arm-cx2450x-linux-gnueabi/sys-root/usr
+PREFIX=/opt/arm/arm-cx2450x-linux-gnueabi/arm-cx2450x-linux-gnueabi/sys-root/usr
 CCPATH=
 HOST=arm-cx2450x-linux-gnueabi
 
@@ -27,5 +27,5 @@ export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
 export CURL_CONFIG=$PREFIX/bin/curl-config
 
 ./autogen.sh
-./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --without-driver --with-target=cdk --with-targetprefix="" "$*"
+./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" "$*"
 

data/Makefile.am

@@ -1,8 +1,11 @@
-SUBDIRS = fonts icons inetradio iso-codes locale scripts themes
+SUBDIRS = fonts icons inetradio initial iso-codes license locale scripts themes neutrino-scripts
 
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd
 endif
 
 configdir = $(CONFIGDIR)
-config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml
+config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml settingsupdate.conf
+
+install-data-hook:
+	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit

data/cables.xml

@@ -2,7 +2,8 @@
 <cables>
 	<cable name="KMS Muenchen" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -13,29 +14,29 @@
 		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<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="3"/>
-		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<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="583000" 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="5"/>
 		<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"/>
 		<transponder frequency="650000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="666000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="674000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<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="3"/>
+		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
@@ -221,14 +222,14 @@
 	<cable name="Unitymedia" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="396000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -254,15 +255,21 @@
 		<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="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="722000" 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="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="810000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 	</cable>
 	<cable name="Kabel BW" satfeed="true" flags="9">
-		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="121000" 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="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -280,22 +287,18 @@
 		<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="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="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="650000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="666000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="674000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<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="3"/>
-		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="722000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="738000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<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="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"/>
@@ -303,6 +306,9 @@
 		<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="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"/>
 	</cable>
 	<cable name="Primacom Sat Einspeisung" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -508,7 +514,58 @@
 		<transponder frequency="538000" symbol_rate="6790000" fec_inner="0" modulation="3"/>
 		<transponder frequency="540000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
 	</cable>
-	<cable name="M-net Muenchen" satfeed="true" flags="9">
+	<cable name="Antennengemeinschaft Penig" satfeed="true" flags="9">
+		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="322000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="330000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="328000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="346000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="354000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="362000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="370000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="378000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="386000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="394000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="410000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="434000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
+		<transponder frequency="442000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="466000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="514000" 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"/>
+	</cable>
+	<cable name="M-net" satfeed="true" flags="9">
+		<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"/>
+		<transponder frequency="170000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="178000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="186000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="194000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="202000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="210000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="218000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="226000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="234000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="242000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="250000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="258000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="266000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="274000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="282000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="290000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="298000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -1286,4 +1343,52 @@
 		<transponder frequency="786000000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="786000000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
 	</cable>
+	<cable name="Kabel Deutschland - Offensive 2012" satfeed="true" flags="9">
+		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<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="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="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+	</cable>
+	<cable name="CST Berlin" satfeed="true" flags="9">
+		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="314000" 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="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="546000" 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="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="666000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<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="Ziggo Groningen" satfeed="true" flags="9" nid="9700">
+		<transponder frequency="369000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+	</cable>
 </cables>

data/encoding.conf

@@ -5,28 +5,37 @@ gre ISO8859-7
 pol ISO8859-2
 rus ISO8859-5
 bul ISO8859-5
-cn  ISO3166-2 
+cn ISO3166-2
 #Table of transponder using two byte char mappings (VideoTexSuppl)
 #TSID ONID
 0x441 0x1 ISO6937 # RTL
 0x443 0x1 ISO6937 # Eurosport / RTL Austria 
 #
-0x447 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-0x427 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-0x44b 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-0x4ff 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-0x407 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-0x436 0x1 #ASTRA 19.2<EFBFBD> MTV Euro - MTV Networks
-0x42a 0x1 #ASTRA 19.2<EFBFBD> VH1 Classic - MTV Networks
-0xc23 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xc93 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xc95 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xc8b 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xc89 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xbc7 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xc8f 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xc85 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xbc6 0x3 #ASTRA 23.5<EFBFBD> CzechLink
+#0x447 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
+#0x427 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
+#0x44b 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
+#0x4ff 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
+#0x407 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
+#0x436 0x1 #ASTRA 19.2<EFBFBD> MTV Euro - MTV Networks
+#0x42a 0x1 #ASTRA 19.2<EFBFBD> VH1 Classic - MTV Networks
+#
+#0xc23 0x3 #ASTRA 23.5<EFBFBD> CzechLink 10803H
+#0xbc7 0x3 #ASTRA 23.5<EFBFBD> CzechLink 12565H
+#0xc8b 0x3 #ASTRA 23.5<EFBFBD> CzechLink 11914H
+#0xc8f 0x3 #ASTRA 23.5<EFBFBD> CzechLink 11992H
+0xbc6 0x3 #ASTRA 23.5<EFBFBD> 12525V skylink
+0xc85 0x3 #ASTRA 23.5<EFBFBD> 11797H skylink
+0xc87 0x3 #ASTRA 23.5<EFBFBD> 11836H skylink*
+0xc88 0x3 #ASTRA 23.5<EFBFBD> 11856V skylink*
+0xc89 0x3 #ASTRA 23.5<EFBFBD> 11876H skylink
+0xc8a 0x3 #ASTRA 23.5<EFBFBD> 11895V skylink
+0xc8c 0x3 #ASTRA 23.5<EFBFBD> 11934V skylink*
+0xc8e 0x3 #ASTRA 23.5<EFBFBD> 11973V skylink*
+0xc93 0x3 #ASTRA 23.5<EFBFBD> 12070H skylink
+0xc95 0x3 #ASTRA 23.5<EFBFBD> 12109H skylink
+0xc98 0x3 #ASTRA 23.5<EFBFBD> 12168V skylink*
+0xc9a 0x3 #ASTRA 23.5<EFBFBD> 12207V skylink*
+0xc8b 0x3 ISO6397 # skylink 23.5<EFBFBD>E 11914 H 
 #TSID ONID
 0x1 0x601 #UPC Cable Hungary
 0x2 0x601 #UPC Cable Hungary
@@ -43,22 +52,38 @@ cn  ISO3166-2
 0xd 0x601 #UPC Cable Hungary
 0xe 0x601 #UPC Cable Hungary
 0xf 0x601 #UPC Cable Hungary
-# UPC Direct Thor 1.0W
-0x2b2 0x600
-0x2bd 0x600
-0x2be 0x600
-0x2bf 0x600
-0x2c0 0x600
-0x2c1 0x600
-0x2c2 0x600
-0x2c3 0x600
-0x2c4 0x600
-0x2c5 0x600
-0x2c6 0x600
-0x2e 0x46
-0x1 0x1111
-0x2 0x1111
-0x3 0x1111
+# freesat
+0x2bd 0x600 # freesat 0.8<EFBFBD>W 11727 V
+0x2be 0x600 # freesat 0.8<EFBFBD>W 11766 V
+0x2bf 0x600 # freesat 0.8<EFBFBD>W 11804 V
+0x2c0 0x600 # freesat 0.8<EFBFBD>W 11996 V
+0x2c1 0x600 # freesat 0.8<EFBFBD>W 12034 V
+0x2c2 0x600 # freesat 0.8<EFBFBD>W 12073 V
+0x2c3 0x600 # freesat 0.8<EFBFBD>W 11938 H
+0x2c4 0x600 # freesat 0.8<EFBFBD>W 12188 V
+0x2c5 0x600 # freesat 0.8<EFBFBD>W 12265 V
+0x2c6 0x600 # freesat 0.8<EFBFBD>W 11843 V
+0x2c8 0x600 # freesat 0.8<EFBFBD>W 12111 V
+0x26 0x46 # freesat 0.8<EFBFBD>W 11785 H
+0x29 0x46 # freesat 0.8<EFBFBD>W 12015 H
+0x1b 0x2c0 # freesat 0.8<EFBFBD>W 12226 V
+0x5 0x1111 # freesat 0.8<EFBFBD>W 11747 H
+0x7 0x1111 # freesat 0.8<EFBFBD>W 11976 H
+0x65 0x1771 # freesat 0.8<EFBFBD>W 12380 V
+# DigiTV
+0x1 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12687 H
+0x2 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12723 H
+0x3 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12643 H
+0x4 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12527 H
+0x5 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12563 H
+0x6 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12643 V
+0x7 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12607 H
+0x8 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12687 V
+0x9 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12607 V
+0xa 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12563 V
+0xb 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12718 V
+0xc 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 11900 H
+# Cyfra+
 200 318 #Hotbird Eutelsat (Eurosport)
 300 318 #Hotbird Eutelsat (Eurosport, Animal Pl.HD)
 400 318 #Hotbird 13.0 Cyfra+
@@ -83,13 +108,21 @@ cn  ISO3166-2
 13200 113 #Hotbird 13.0 Cyfrowy Polsat
 #Fallback encoding table for following transponders
 #TSID ONID ISO8859-X
-#0x447 0x1 ISO8859-9
-50100 126 ISO8859-9 # Digiturk 7<>E 11.471 V 30.000 3/4
-50200 126 ISO8859-9 # Digiturk 7<>E 11.492 V 30.000 3/4
-50300 126 ISO8859-9 # Digiturk 7<>E 11.639 H 30.000 3/4
-50400 126 ISO8859-9 # Digiturk 7<>E 11.534 V 30.000 3/4
-50600 126 ISO8859-9 # Digiturk 7<>E 11.575 V and 42<34>E 11.729 V 15.555 5/6
-50700 126 ISO8859-9 # Digiturk 7<>E 11.596 H 30.000 3/4
-50800 126 ISO8859-9 # Digiturk 7<>E 11.678 H 30.000 3/4
-50900 126 ISO8859-9 # Digiturk 7<>E 11.513 H 27.500 3/4
-51000 126 ISO8859-9 # Digiturk 7<>E 11.617 V 30.000 3/4
+0x4fb0 0x7e ISO8859-9 # Digiturk 7<>E 10762 V
+0x5014 0x7e ISO8859-9 # Digiturk 7<>E 10803 H
+0x5078 0x7e ISO8859-9 # Digiturk 7<>E 10804 V
+0x5140 0x7e ISO8859-9 # Digiturk 7<>E 10845 V
+0x51a4 0x7e ISO8859-9 # Digiturk 7<>E 10886 H
+0x5208 0x7e ISO8859-9 # Digiturk 7<>E 10928 H
+0x526c 0x7e ISO8859-9 # Digiturk 7<>E 10887 V
+0x52d0 0x7e ISO8859-9 # Digiturk 7<>E 10928 V
+0xa0f0 0x7e ISO8859-9 # Digiturk 7<>E 11455 V
+0xc3b4 0x7e ISO8859-9 # Digiturk 7<>E 11471 H
+0xc418 0x7e ISO8859-9 # Digiturk 7<>E 11492 V
+0xc47c 0x7e ISO8859-9 # Digiturk 7<>E 11637 H
+0xc4e0 0x7e ISO8859-9 # Digiturk 7<>E 11534 V
+0xc5a8 0x7e ISO8859-9 # Digiturk 7<>E 11575 V and 42<34>E 11729 V
+0xc60c 0x7e ISO8859-9 # Digiturk 7<>E 11595 H
+0xc670 0x7e ISO8859-9 # Digiturk 7<>E 11679 H
+0xc6d4 0x7e ISO8859-9 # Digiturk 7<>E 11513 H
+0xc738 0x7e ISO8859-9 # Digiturk 7<>E 11617 V

data/fonts/Makefile.am

@@ -10,3 +10,7 @@ install_DATA = \
 	DejaVuLGCSansMono-Bold.ttf \
 	tuxtxt.ttf \
 	tuxtxt.otb
+
+if BOXMODEL_APOLLO
+install_DATA += UnDotum.ttf
+endif

data/icons/Makefile.am

@@ -1,6 +1,29 @@
 installdir = $(DATADIR)/neutrino/icons
 
-install_DATA = \
+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,7 +39,7 @@ install_DATA = \
 	ats.png \
 	ats_gray.png \
 	audio.png \
-	bayrisch.png \
+	audioplay.png \
 	biss_green.png \
 	biss_white.png \
 	biss_yellow.png \
@@ -24,15 +47,16 @@ install_DATA = \
 	bookmarkmanager.png \
 	border_lr.png \
 	border_ul.png \
-	bosanski.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 \
-	ch-baslerdeutsch.png \
-	ch-berndeutsch.png \
 	colors.png \
 	conax_green.png \
 	conax_white.png \
@@ -40,33 +64,72 @@ install_DATA = \
 	cw_green.png \
 	cw_white.png \
 	cw_yellow.png \
-	czech.png \
 	d_green.png \
 	d_white.png \
 	d_yellow.png \
 	dd.png \
 	dd_avail.png \
 	dd_gray.png \
-	ddfill.png \
-	deutsch.png \
 	down.png \
-	dutch.png \
-	ellinika.png \
-	english.png \
+	dummy.png \
+	dummy_small.png \
 	error.png \
 	features.png \
 	file.png \
 	folder.png \
-	francais.png \
-	french.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_osd.png \
+	hint_personalize.png \
+	hint_picview.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 \
-	hungarian.png \
 	icon_green.png \
 	icon_movieplayer.png \
 	icon_red.png \
@@ -78,7 +141,6 @@ install_DATA = \
 	ird_green.png \
 	ird_white.png \
 	ird_yellow.png \
-	italiano.png \
 	keybinding.png \
 	language.png \
 	lcd.png \
@@ -105,6 +167,7 @@ install_DATA = \
 	mp3-5.jpg \
 	mp3-6.jpg \
 	mp3-7.jpg \
+	multimedia.png \
 	mute.png \
 	mute_small.png \
 	mute_zap_gray.png \
@@ -115,16 +178,13 @@ install_DATA = \
 	nds_green.png \
 	nds_white.png \
 	nds_yellow.png \
-	nederlands.png \
 	network.png \
-	norsk.png \
 	not_mounted.png \
 	notyet.png \
 	numericpad.png \
 	ok.png \
 	personalize.png \
-	polski.png \
-	portugues.png \
+	pip.png \
 	power.png \
 	powervu_green.png \
 	powervu_white.png \
@@ -166,9 +226,7 @@ install_DATA = \
 	res_hd.png \
 	res_sd.png \
 	right.png \
-	romania.png \
 	rot.png \
-	russkij.png \
 	scan.jpg \
 	seca_green.png \
 	seca_white.png \
@@ -176,15 +234,16 @@ install_DATA = \
 	settings.png \
 	shell.png \
 	shutdown.jpg \
-	slovak.png \
 	softupdate.png \
 	start.jpg \
 	streaming.png \
 	subt.png \
 	subt_gray.png \
-	suomi.png \
-	svenska.png \
 	timer.png \
+	tuner_1.png \
+	tuner_2.png \
+	tuner_3.png \
+	tuner_4.png \
 	up.png \
 	upnp.png \
 	via_green.png \