update to version 3.11.0

support for osmioplus4k added

.gitignore

@@ -1,50 +1,82 @@
-### mostly autoconf crap
+### http://www.gnu.org/software/automake
 Makefile
-autom4te.cache
-*.in
-aclocal.m4
-compile
-config.*
-configure
-depcomp
-install-sh
-*.pc
-libtool
-ltmain.sh
-missing
-stamp-h1
-README
-COPYING
-INSTALL
+Makefile.in
 
-### objects and libs
+### http://www.gnu.org/software/autoconf
+autom4te.cache
+/autoscan.log
+/autoscan-*.log
+/aclocal.m4
+/compile
+/config.guess
+/config.h.in
+/config.log
+/config.status
+/config.sub
+/configure
+/configure.scan
+/depcomp
+/install-sh
+/missing
+/stamp-h*
+
+### https://www.gnu.org/software/libtool/
+/libtool
+/ltmain.sh
+
+### http://www.gnu.org/software/m4/
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+
+### compiled objects and libs
 .libs
-.deps
+*.lo
 *.o
 *.so
-*.lo
-*.a
+*.lai
 *.la
-.*.swp
+*.a
 
-### editor crap
+### dependency files
+.deps
+*.Plo
+*.Po
+
+### diff and patch files
+*.patch
+*.diff
 *.orig
 *.rej
+
+### system generated stuff
+# dolphin
+.directory
+# kate
+*-swp
+.*.swp
+
+### generally excluded files
 *~
+*.pc
+git-*
+go_*
 
 ### binaries that fall out of the build
 lib/sectionsdclient/sectionsdcontrol
-src/neutrino
-src/nhttpd/web/*.js.gz
-src/zapit/src/pzapit
-src/zapit/src/udpstreampes
 src/drivertool
 src/dt
-src/rcsim.h
-src/rcsim
-src/gui/version.h
-src/nhttpd/nhttpd.conf
 src/mdev_helper
+src/neutrino
+src/rcsim
+src/zapit/src/pzapit
+src/zapit/src/udpstreampes
+
+### header files that fall out of the build
+src/rcsim.h
+src/gui/version.h
 local_build_config.h
 
 ### system generated stuff
@@ -52,3 +84,6 @@ local_build_config.h
 .directory
 # kate
 *-swp
+
+### other files that fall out of the build
+src/nhttpd/nhttpd.conf

Makefile.am

@@ -1,6 +1,6 @@
-AUTOMAKE_OPTIONS = gnu
-
 SUBDIRS = lib src data
 
 locale-update:
 	make -C $(top_builddir)/data/locale install-locals
+
+.PHONY: locale-update

acinclude.m4

@@ -24,6 +24,110 @@ if test "$DEBUG" = "yes"; then
 	AC_DEFINE(DEBUG, 1, [enable debugging code])
 fi
 
+# weather
+AC_ARG_WITH(weather-dev-key,
+	AS_HELP_STRING([--with-weather-dev-key=KEY], [API dev key to get data from weather data base, required for additional weather informations]),
+	[WEATHER_DEV_KEY="$withval"],
+	[WEATHER_DEV_KEY=""])
+AC_DEFINE_UNQUOTED([WEATHER_DEV_KEY], ["$WEATHER_DEV_KEY"], [API dev key to get data from weather data base, required for additional weather informations])
+
+AC_ARG_ENABLE([weather-key-manage],
+	AS_HELP_STRING([--enable-weather-key-manage], [Enable manage weather api dev key via gui for additional weather informations @<:@default=yes@:>@]),
+	[enable_weather_key_manage="$enableval"],
+	[enable_weather_key_manage="yes"])
+
+if test "$enable_weather_key_manage" = "yes" ; then
+	AC_DEFINE([ENABLE_WEATHER_KEY_MANAGE], 1, [Enable manage weather api dev key via gui for additional weather informations])
+fi
+# weather end
+
+# tmdb
+AC_ARG_WITH(tmdb-dev-key,
+	AS_HELP_STRING([--with-tmdb-dev-key=KEY], [API dev key to get data from tmdb data base, required for additional epg informations.]),
+	[TMDB_DEV_KEY="$withval"],
+	[TMDB_DEV_KEY=""])
+AC_DEFINE_UNQUOTED([TMDB_DEV_KEY], ["$TMDB_DEV_KEY"], [API dev key to get data from tmdb data base, required for additional epg informations.])
+
+
+AC_ARG_ENABLE([tmdb-key-manage],
+	[AS_HELP_STRING([--enable-tmdb-key-manage], [Enable manage tmdb api dev key via gui for additional epg informations. @<:@default=yes@:>@])],
+	[enable_tmdb_key_manage="$enableval"],
+	[enable_tmdb_key_manage="yes"])
+tmdb_key_manage_val=1
+if test "$enable_tmdb_key_manage" = "no" ; then
+	tmdb_key_manage_val=0
+fi
+AC_DEFINE_UNQUOTED([ENABLE_TMDB_KEY_MANAGE],[$tmdb_key_manage_val],[Enable manage tmdb api dev key via gui for additional epg informations.])
+# end tmdb
+
+
+# omdb
+AC_ARG_WITH(omdb-api-key,
+	AS_HELP_STRING([--with-omdb-api-key=KEY], [API key to get additional epg data from omdb database at http://www.omdbapi.com, this database gets data from imdb service.]),
+	[OMDB_API_KEY="$withval"],
+	[OMDB_API_KEY=""])
+AC_DEFINE_UNQUOTED([OMDB_API_KEY], ["$OMDB_API_KEY"], [API key to get additional epg data from omdb database at http://www.omdbapi.com, this database gets data from imdb service.])
+
+AC_ARG_ENABLE([omdb-key-manage],
+	[AS_HELP_STRING([--enable-omdb-key-manage], [Enable manage omdb (imdb) api dev key via gui for additional epg informations. @<:@default=yes@:>@])],
+	[enable_omdb_key_manage="$enableval"],
+	[enable_omdb_key_manage="yes"])
+omdb_key_manage_val=1
+if test "$enable_omdb_key_manage" = "no" ; then
+	omdb_key_manage_val=0
+fi
+AC_DEFINE_UNQUOTED([ENABLE_OMDB_KEY_MANAGE],[$omdb_key_manage_val],[Enable manage omdb (imdb) api dev key via gui for additional epg informations.])
+# end omdb
+
+
+# youtube
+AC_ARG_WITH(youtube-dev-key,
+	AS_HELP_STRING([--with-youtube-dev-key=KEY], [API dev key for YouTube streaming.]),
+	[YT_DEV_KEY="$withval"],
+	[YT_DEV_KEY=""])
+AC_DEFINE_UNQUOTED([YT_DEV_KEY], ["$YT_DEV_KEY"], [API dev key for YouTube streaming.])
+
+AC_ARG_ENABLE([youtube-key-manage],
+	[AS_HELP_STRING([--enable-youtube-key-manage], [Enable manage youtube dev key via gui for additional epg informations. @<:@default=yes@:>@])],
+	[enable_youtube_key_manage="$enableval"],
+	[enable_youtube_key_manage="yes"])
+youtube_key_manage_val=1
+if test "$enable_youtube_key_manage" = "no" ; then
+	youtube_key_manage_val=0
+fi
+AC_DEFINE_UNQUOTED([ENABLE_YOUTUBE_KEY_MANAGE],[$youtube_key_manage_val], [Enable manage youtube dev key via gui for additional epg informations.])
+
+AC_ARG_ENABLE([youtube-player],
+	[AS_HELP_STRING([--enable-youtube-player], [Enable play and control youtube streams with moviebrowser. @<:@default=yes@:>@])],
+	[enable_youtube_player="$enableval"],
+	[enable_youtube_player="yes"])
+youtube_player_val=1
+if test "$enable_youtube_player" = "no" ; then
+	youtube_player_val=0
+fi
+AC_DEFINE_UNQUOTED([ENABLE_YOUTUBE_PLAYER],[$youtube_player_val], [Enable play and control YouTube streams with moviebrowser.])
+# end youtube
+
+
+# shoutcast
+AC_ARG_WITH(shoutcast-dev-key,
+	AS_HELP_STRING([--with-shoutcast-dev-key=KEY], [API dev key to get stream data lists from ShoutCast service.]),
+	[SHOUTCAST_DEV_KEY="$withval"],
+	[SHOUTCAST_DEV_KEY=""])
+AC_DEFINE_UNQUOTED([SHOUTCAST_DEV_KEY], ["$SHOUTCAST_DEV_KEY"], [API dev key to get stream data lists from ShoutCast service.])
+
+AC_ARG_ENABLE([shoutcast-key-manage],
+	[AS_HELP_STRING([--enable-shoutcast-key-manage], [Enable manage of api dev key to get stream data lists from ShoutCast service via gui. @<:@default=yes@:>@])],
+	[enable_shoutcast_key_manage="$enableval"],
+	[enable_shoutcast_key_manage="yes"])
+shoutcast_key_manage_val=1
+if test "$enable_shoutcast_key_manage" = "no" ; then
+	shoutcast_key_manage_val=0
+fi
+AC_DEFINE_UNQUOTED([ENABLE_SHOUTCAST_KEY_MANAGE],[$shoutcast_key_manage_val], [Enable manage of api dev key to get stream data lists from ShoutCast service via gui.])
+# end shoutcast
+
+
 AC_ARG_WITH(libcoolstream-static-dir,
 	AS_HELP_STRING([--with-libcoolstream-static-dir=PATH], [path for static libcoolstream [[NONE]]]),
 	[LIBCOOLSTREAM_STATIC_DIR="$withval"],
@@ -34,10 +138,17 @@ AC_ARG_ENABLE(libcoolstream-static,
 AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes")
 
 AC_ARG_ENABLE(reschange,
-	AS_HELP_STRING([--enable-reschange], [enable change the osd resolution @<:@default for hd2 and hd51@:>@]),
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]))
+	AS_HELP_STRING([--enable-reschange], [enable to change osd resolution]),
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]))
 AM_CONDITIONAL(ENABLE_RESCHANGE, test "$enable_reschange" = "yes")
 
+# default theme
+AC_ARG_WITH(default-theme,
+	AS_HELP_STRING([--with-default-theme=THEMENAME], [Default theme for gui. Default it is empty for internal fallback to default colors.]),
+	[default_theme="$withval"],
+	[default_theme=""])
+AC_DEFINE_UNQUOTED([DEFAULT_THEME], ["$default_theme"], [Default theme for gui.])
+
 AC_MSG_CHECKING(target)
 
 if test "$TARGET" = "native"; then
@@ -50,9 +161,6 @@ if test "$TARGET" = "native"; then
 	if test "$prefix" = "NONE"; then
 		prefix=/usr/local
 	fi
-	if test "$exec_prefix" = "NONE"; then
-		exec_prefix=$prefix
-	fi
 	targetprefix=$prefix
 	TARGET_PREFIX=$prefix
 	AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix])
@@ -80,6 +188,10 @@ else
 	AC_MSG_ERROR([invalid target $TARGET, choose on from native,cdk]);
 fi
 
+if test "$exec_prefix" = "NONE"; then
+	exec_prefix=$prefix
+fi
+
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_SYS_LARGEFILE
@@ -149,6 +261,12 @@ TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/con
 TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox,
 	[--with-datadir=PATH], [where to find data files])
 
+TUXBOX_APPS_DIRECTORY_ONE(controldir, CONTROLDIR, datadir, /share, /tuxbox/neutrino/control,
+	[--with-controldir=PATH], [where to find control scripts])
+
+TUXBOX_APPS_DIRECTORY_ONE(controldir_var, CONTROLDIR_VAR, localstatedir, /var, /tuxbox/control,
+	[--with-controldir_var=PATH], [where to find control scripts in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts,
 	[--with-fontdir=PATH], [where to find fonts])
 
@@ -161,7 +279,7 @@ TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games
 TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox,
 	[--with-libdir=PATH], [where to find internal libs])
 
-TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins,
+TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, datadir, /share, /tuxbox/neutrino/plugins,
 	[--with-plugindir=PATH], [where to find plugins])
 
 TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tuxbox/plugins,
@@ -170,9 +288,15 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tu
 TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins,
 	[--with-plugindir_mnt=PATH], [where to find external plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins,
+TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, datadir, /share, /tuxbox/neutrino/luaplugins,
 	[--with-luaplugindir=PATH], [where to find Lua plugins])
 
+TUXBOX_APPS_DIRECTORY_ONE(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio,
+	[--with-webradiodir=PATH], [where to find webradio content])
+
+TUXBOX_APPS_DIRECTORY_ONE(webradiodir_var, WEBRADIODIR_VAR, localstatedir, /var, /tuxbox/webradio,
+	[--with-webradiodir_var=PATH], [where to find webradio content in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(webtvdir, WEBTVDIR, datadir, /share, /tuxbox/neutrino/webtv,
 	[--with-webtvdir=PATH], [where to find webtv content])
 
@@ -197,6 +321,12 @@ TUXBOX_APPS_DIRECTORY_ONE(iconsdir, ICONSDIR, datadir, /share, /tuxbox/neutrino/
 TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var, ICONSDIR_VAR, localstatedir, /var, /tuxbox/icons,
 	[--with-iconsdir_var=PATH], [where to find icons in /var])
 
+TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir, LCD4L_ICONSDIR, datadir, /share, /tuxbox/neutrino/lcd/icons,
+	[--with-lcd4liconsdir=PATH], [where to find lcd4linux icons])
+
+TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir_var, LCD4L_ICONSDIR_VAR, localstatedir, /var, /tuxbox/lcd/icons,
+	[--with-lcd4liconsdir_var=PATH], [where to find lcd4linux icons in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(private_httpddir, PRIVATE_HTTPDDIR, datadir, /share, /tuxbox/neutrino/httpd,
 	[--with-private_httpddir=PATH], [where to find private httpd files])
 
@@ -213,6 +343,8 @@ TUXBOX_APPS_DIRECTORY_ONE(flagdir, FLAGDIR, localstatedir, /var, /etc,
 dnl automake <= 1.6 needs this specifications
 AC_SUBST(CONFIGDIR)
 AC_SUBST(DATADIR)
+AC_SUBST(CONTROLDIR)
+AC_SUBST(CONTROLDIR_VAR)
 AC_SUBST(FONTDIR)
 AC_SUBST(FONTDIR_VAR)
 AC_SUBST(GAMESDIR)
@@ -222,6 +354,8 @@ AC_SUBST(PLUGINDIR)
 AC_SUBST(PLUGINDIR_VAR)
 AC_SUBST(PLUGINDIR_MNT)
 AC_SUBST(LUAPLUGINDIR)
+AC_SUBST(WEBRADIODIR)
+AC_SUBST(WEBRADIODIR_VAR)
 AC_SUBST(WEBTVDIR)
 AC_SUBST(WEBTVDIR_VAR)
 AC_SUBST(LOCALEDIR)
@@ -230,6 +364,8 @@ AC_SUBST(THEMESDIR)
 AC_SUBST(THEMESDIR_VAR)
 AC_SUBST(ICONSDIR)
 AC_SUBST(ICONSDIR_VAR)
+AC_SUBST(LCD4L_ICONSDIR)
+AC_SUBST(LCD4L_ICONSDIR_VAR)
 AC_SUBST(PRIVATE_HTTPDDIR)
 AC_SUBST(PUBLIC_HTTPDDIR)
 AC_SUBST(HOSTED_HTTPDDIR)
@@ -310,9 +446,9 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 
 AC_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
-	AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, coolstream, spark, azbox, generic, armbox]),
+	AS_HELP_STRING([--with-boxtype], [valid values: generic, azbox, tripledragon, spark, coolstream, armbox, mipsbox]),
 	[case "${withval}" in
-		tripledragon|coolstream|spark|azbox|generic|armbox)
+		generic|azbox|tripledragon|spark|coolstream|armbox|mipsbox)
 			BOXTYPE="$withval"
 		;;
 		*)
@@ -322,10 +458,18 @@ AC_ARG_WITH(boxtype,
 	[BOXTYPE="generic"])
 
 AC_ARG_WITH(boxmodel,
-	AS_HELP_STRING([--with-boxmodel], [valid for coolstream: hd1, hd2])
-AS_HELP_STRING([], [valid for armbox: hd51])
-AS_HELP_STRING([], [valid for generic: raspi]),
+	AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi])
+AS_HELP_STRING([], [valid for coolstream: hd1, hd2])
+AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, h7, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k, osmioplus4k])
+AS_HELP_STRING([], [valid for mipsbox: vuduo]),
 	[case "${withval}" in
+		generic|raspi)
+			if test "$BOXTYPE" = "generic"; then
+				BOXMODEL="$withval"
+			else
+				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
+			fi
+		;;
 		hd1|hd2)
 			if test "$BOXTYPE" = "coolstream"; then
 				BOXMODEL="$withval"
@@ -345,15 +489,15 @@ AS_HELP_STRING([], [valid for generic: raspi]),
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		hd51)
+		hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|osmioplus4k)
 			if test "$BOXTYPE" = "armbox"; then
 				BOXMODEL="$withval"
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		raspi)
-			if test "$BOXTYPE" = "generic"; then
+		vuduo)
+			if test "$BOXTYPE" = "mipsbox"; then
 				BOXMODEL="$withval"
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
@@ -362,48 +506,149 @@ AS_HELP_STRING([], [valid for generic: raspi]),
 		*)
 			AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
 		;;
-	esac])
+	esac],
+	[BOXMODEL="generic"])
 
 AC_SUBST(BOXTYPE)
 AC_SUBST(BOXMODEL)
 
+AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
 AM_CONDITIONAL(BOXTYPE_AZBOX, test "$BOXTYPE" = "azbox")
 AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon")
-AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
-AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
+AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
+AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox")
 
+# generic
+AM_CONDITIONAL(BOXMODEL_GENERIC, test "$BOXMODEL" = "generic")
+AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
+
+# coolstream
 AM_CONDITIONAL(BOXMODEL_CS_HD1, test "$BOXMODEL" = "hd1")
 AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2")
 
-AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
+# armbox
+AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
+AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
+AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
+AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
+AM_CONDITIONAL(BOXMODEL_OSMIOPLUS4K, test "$BOXMODEL" = "osmioplus4k")
+AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
+AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k")
+AM_CONDITIONAL(BOXMODEL_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k")
+AM_CONDITIONAL(BOXMODEL_VUUNO4K, test "$BOXMODEL" = "vuuno4k")
+AM_CONDITIONAL(BOXMODEL_VUUNO4KSE, test "$BOXMODEL" = "vuuno4kse")
+AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k")
 
-if test "$BOXTYPE" = "azbox"; then
+# mipsbox
+AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
+
+if test "$BOXTYPE" = "generic"; then
+	AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
+elif test "$BOXTYPE" = "azbox"; then
 	AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox])
 elif test "$BOXTYPE" = "tripledragon"; then
 	AC_DEFINE(HAVE_TRIPLEDRAGON, 1, [building for a tripledragon])
-elif test "$BOXTYPE" = "coolstream"; then
-	AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
 elif test "$BOXTYPE" = "spark"; then
 	AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
-elif test "$BOXTYPE" = "generic"; then
-	AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
+elif test "$BOXTYPE" = "coolstream"; then
+	AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
 elif test "$BOXTYPE" = "armbox"; then
 	AC_DEFINE(HAVE_ARM_HARDWARE, 1, [building for an armbox])
+elif test "$BOXTYPE" = "mipsbox"; then
+	AC_DEFINE(HAVE_MIPS_HARDWARE, 1, [building for an mipsbox])
 fi
 
+# BOXTYPEs that use libstb-hal
+case "$BOXTYPE" in
+	coolstream)
+		libstb_hal=no
+	;;
+	*)
+		AC_DEFINE(HAVE_LIBSTB_HAL, 1, [use libstb-hal])
+		libstb_hal=yes
+	;;
+esac
+AM_CONDITIONAL(HAVE_LIBSTB_HAL, test "$libstb_hal" = "yes")
+
 # TODO: do we need more defines?
-if test "$BOXMODEL" = "hd1"; then
+if test "$BOXMODEL" = "generic"; then
+	AC_DEFINE(BOXMODEL_GENERIC, 1, [generic pc])
+elif test "$BOXMODEL" = "raspi"; then
+	AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
+elif test "$BOXMODEL" = "hd1"; then
 	AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee])
 elif test "$BOXMODEL" = "hd2"; then
 	AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
 elif test "$BOXMODEL" = "hd51"; then
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
-elif test "$BOXMODEL" = "raspi"; then
-	AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
+	AC_DEFINE(BOXMODEL_HD51, 1, [hd51])
+elif test "$BOXMODEL" = "hd60"; then
+	AC_DEFINE(BOXMODEL_HD60, 1, [hd60])
+elif test "$BOXMODEL" = "bre2ze4k"; then
+	AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
+elif test "$BOXMODEL" = "h7"; then
+	AC_DEFINE(BOXMODEL_H7, 1, [h7])
+elif test "$BOXMODEL" = "osmioplus4k"; then
+        AC_DEFINE(BOXMODEL_OSMIOPLUS4K, 1, [osmioplus4k])
+elif test "$BOXMODEL" = "vusolo4k"; then
+	AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
+elif test "$BOXMODEL" = "vuduo4k"; then
+	AC_DEFINE(BOXMODEL_VUDUO4K, 1, [vuduo4k])
+elif test "$BOXMODEL" = "vuultimo4k"; then
+	AC_DEFINE(BOXMODEL_VUULTIMO4K, 1, [vuultimo4k])
+elif test "$BOXMODEL" = "vuuno4k"; then
+	AC_DEFINE(BOXMODEL_VUUNO4K, 1, [vuuno4k])
+elif test "$BOXMODEL" = "vuuno4kse"; then
+	AC_DEFINE(BOXMODEL_VUUNO4KSE, 1, [vuuno4kse])
+elif test "$BOXMODEL" = "vuzero4k"; then
+	AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k])
+elif test "$BOXMODEL" = "vuduo"; then
+	AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo])
 fi
+
+# all vuplus BOXMODELs
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
+		AC_DEFINE(BOXMODEL_VUPLUS, 1, [vuplus])
+		vuplus=true
+	;;
+	*)
+		vuplus=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS, test "$vuplus" = "true")
+
+# all vuplus4k BOXMODELs
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
+		AC_DEFINE(BOXMODEL_VUPLUS4K, 1, [vuplus4k])
+		vuplus4k=true
+	;;
+	*)
+		vuplus4k=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS4K, test "$vuplus4k" = "true")
+
+# BOXMODELs that allows to change osd resolution
+case "$BOXMODEL" in
+	hd2|hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|osmioplus4k)
+		AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])
+	;;
+esac
+
+# BOXMODELs that needs GraphLCD support
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuultimo4k|vuuno4kse)
+		AC_DEFINE(ENABLE_GRAPHLCD, 1, [include GraphLCD support])
+		enable_graphlcd=yes
+	;;
+	*)
+		enable_graphlcd=no
+	;;
+esac
+AM_CONDITIONAL(ENABLE_GRAPHLCD, test "$enable_graphlcd" = "yes")
 ])
 
 dnl backward compatiblity

autogen.sh

@@ -6,10 +6,10 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 cd "$srcdir"
-echo "Generating configuration files for $package, please wait...."
+echo "Generating configuration files for $package, please wait ..."
 
 aclocal --force
 libtoolize --force
 autoconf --force
 autoheader --force
-automake --add-missing --force-missing --foreign
+automake --add-missing --force-missing

configure.ac

@@ -1,7 +1,20 @@
-AC_INIT(Tuxbox-Neutrino,3.7.0)
-AM_INIT_AUTOMAKE([1.0.1 nostdinc])
+# explicit defines for separate revision handling
+define(ver_major, 3)
+define(ver_minor, 11)
+define(ver_micro, 0)
+define(neutrino_rel_cycle, ver_major.ver_minor)
+
+AC_INIT(Tuxbox-Neutrino,ver_major.ver_minor.ver_micro)
+AM_INIT_AUTOMAKE([nostdinc foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
+AC_DEFINE(RELEASE_CYCLE, "2.5", [Release cycle information; used in update code; only relevant for flash image releases ])
+
+AC_DEFINE(PACKAGE_VERSION_MAJOR, ver_major, [Major version number])
+AC_DEFINE(PACKAGE_VERSION_MINOR, ver_minor, [Minor version number])
+AC_DEFINE(PACKAGE_VERSION_MICRO, ver_micro, [Micro version number])
+AC_DEFINE(PACKAGE_VERSION_NEUTRINO_REL_CYCLE, neutrino_rel_cycle, [Neutrino release cycle])
+
 TUXBOX_APPS
 TUXBOX_APPS_DIRECTORY
 TUXBOX_APPS_PKGCONFIG
@@ -10,7 +23,7 @@ TUXBOX_BOXTYPE
 AC_PROG_CC
 AC_PROG_CXX
 AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
+LT_INIT
 
 # Add build information to local_build_config.h.tmp
 # -------------------------------------------------
@@ -132,7 +145,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
 TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
 TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
 
-if test "$BOXTYPE" = "armbox"; then
+if test "$BOXTYPE" = "armbox" -o "$BOXTYPE" = "mipsbox"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
 fi
 
@@ -141,12 +154,22 @@ if test "$BOXTYPE" = "coolstream"; then
 fi
 
 if test "$BOXTYPE" = "coolstream" ||
+   test "$BOXTYPE" = "armbox" ||
+   test "$BOXTYPE" = "mipsbox" ||
    test "$BOXTYPE" = "generic" ||
    test "$BOXTYPE" = "tripledragon" ||
    test "$BOXTYPE" = "spark"; then
 	AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots])
 fi
 
+AC_ARG_ENABLE(lcd4linux,
+	AS_HELP_STRING([--enable-lcd4linux], [enable Lcd4Linux support]),
+	,[enable_lcd4linux=no])
+AM_CONDITIONAL(ENABLE_LCD4LINUX, test "$enable_lcd4linux" = "yes")
+if test "$enable_lcd4linux" = "yes"; then
+	AC_DEFINE(ENABLE_LCD4LINUX, 1, [include Lcd4Linux support])
+fi
+
 AC_ARG_ENABLE(keyboard-no-rc,
 	AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control @<:@default=no@:>@]),
 	AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control]))
@@ -276,7 +299,6 @@ if test "$BOXTYPE" = "coolstream"; then
 		HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream'
 	fi
 
-	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/src/zapit/include/private'
 	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/lib/hardware/coolstream'
 fi
 
@@ -303,9 +325,11 @@ AC_SUBST(LUA_CFLAGS)
 AC_SUBST(LUA_LIBS)
 AC_SUBST(BLURAY_LIBS)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 data/Makefile
+data/config/Makefile
+data/control/Makefile
 data/fonts/Makefile
 data/icons/Makefile
 data/icons/buttons/Makefile
@@ -322,6 +346,7 @@ data/icons/status/channel/Makefile
 data/icons/status/markers/Makefile
 data/icons/status/various/Makefile
 data/icons/various/Makefile
+data/icons/weather/Makefile
 data/inetradio/Makefile
 data/initial/Makefile
 data/iso-codes/Makefile
@@ -330,17 +355,29 @@ 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/policy/Makefile
 data/scripts/Makefile
 data/themes/Makefile
+data/themes/Grey-Blue/Makefile
+data/themes/Grey-Blue/icons/Makefile
+data/themes/Grey-Blue/icons/buttons/Makefile
+data/themes/Neutrino-3.0/Makefile
+data/themes/Neutrino-3.0/icons/Makefile
+data/themes/Neutrino-3.0/icons/buttons/Makefile
+data/themes/Olive-3.0/Makefile
+data/themes/Olive-3.0/icons/Makefile
+data/themes/Olive-3.0/icons/buttons/Makefile
+data/webradio/Makefile
+data/webtv/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
+data/zapit/Makefile
 lib/Makefile
 lib/connection/Makefile
 lib/hardware/coolstream/Makefile
@@ -369,6 +406,7 @@ src/gui/components/Makefile
 src/gui/lua/Makefile
 src/gui/moviebrowser/Makefile
 src/gui/widget/Makefile
+src/gui/widget/yaft/Makefile
 src/lcddisplay/Makefile
 src/nhttpd/Makefile
 src/nhttpd/nhttpd.conf
@@ -380,7 +418,8 @@ 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
 ])
+
+AC_OUTPUT

data/Makefile.am

@@ -1,4 +1,6 @@
 SUBDIRS = \
+	config \
+	control \
 	fonts \
 	icons \
 	inetradio \
@@ -6,19 +8,15 @@ SUBDIRS = \
 	iso-codes \
 	license \
 	locale \
-	neutrino-scripts \
 	pictures \
+	policy \
 	scripts \
 	themes \
-	y-web
+	webradio \
+	webtv \
+	y-web \
+	zapit
 
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd
 endif
-
-configdir = $(CONFIGDIR)
-config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml settingsupdate.conf terrestrial.xml bad_package_pattern.list.sample
-
-config_DATA += epglanguages.conf webtv_usr.xml webradio_usr.xml
-install-data-hook:
-	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit

data/bad_package_pattern.list.sample

@@ -1,11 +0,0 @@
--dev$
--doc$
--dbg$
--ptest$
--staticdev$
--locale-
--charmap-
--gconv-
--localedata-
-^locale-base-
-^perl-module-

data/config/Makefile.am

@@ -0,0 +1,12 @@
+installdir = $(CONFIGDIR)
+
+install_DATA = \
+	bad_package_pattern.list.sample \
+	cables.xml \
+	encoding.conf \
+	epglanguages.conf \
+	providermap.xml \
+	satellites.xml \
+	settingsupdate.conf \
+	terrestrial.xml \
+	tobackup.conf

data/config/bad_package_pattern.list.sample

@@ -0,0 +1,99 @@
+^locale-base-
+^perl-module-
+acl
+attr
+attr-
+autoconf
+autofs-
+alsa-server
+avahi
+base-passwd-
+bash-
+bsd
+busybox-
+catchsegv
+-charmap-
+cups
+db-
+-dbg$
+-dev$
+-doc$
+e2fsprogs-
+elfutils
+enca
+fbset-
+fftw
+firmware-
+flex
+fontconfig
+-gconv-
+gdb
+gettext
+git-
+gitweb
+glibc-
+initscripts-
+icu
+jpeg-tools
+kbd-
+kernel
+kmod-
+krb5
+ldd
+lib
+-locale-
+-localedata-
+lttng
+lua-
+m4
+mc-
+mdadm
+mtd-utils
+ncurses
+nfs-utils-
+nscd
+nss
+ntfs-3g-
+ntp-
+openssh-
+openssl-
+opkg-
+pam-
+pango
+pci
+pcr
+pcsc-lite-
+perl-
+pps
+-ptest$
+python-
+python3-
+qemu
+qt
+rsvg
+samba-
+-samba4
+shadow-
+shared-mime-info-
+sln
+sntp
+sqlite
+-src
+-staticdev$
+sysfs
+systemd-
+tar-rmt
+tcp-wrappers
+tzdata-
+tzcode
+udev-
+usbutils-
+util-linux-
+util-macros
+wayland-
+webmin-
+weston-
+wiper
+wpa-supplicant-
+xz
+zsh-

data/config/cables.xml

@@ -184,89 +184,7 @@
 		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 	</cable>
-	<cable name="TeleColumbus Berlin" 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="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="130000" 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="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="322000" 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="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="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="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="466000" symbol_rate="6900000" 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="5"/>
-		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-	</cable>
 	<cable name="Unitymedia" 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="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<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="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"/>
-		<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="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="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="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="Unitymedia BW" 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"/>
@@ -311,64 +229,7 @@
 		<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"/>
-	</cable>
-	<cable name="Primacom Sat Einspeisung" 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="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="137000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="145000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<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="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="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<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="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="746000" 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"/>
-	</cable>
-	<cable name="Primacom Glasfasernetz" satfeed="true" flags="9">
-		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="137000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="145000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<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="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="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"/>
-		<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="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 	</cable>
 	<cable name="NetCologne MultiKabel" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -441,14 +302,15 @@
 		<transponder frequency="778000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
-	<cable name="WTC SN" 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="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+	<cable name="PYUR" satfeed="true" flags="9">
+		<transponder frequency="262000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="270000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="278000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="294000" 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"/>
+		<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="5"/>
@@ -470,7 +332,6 @@
 		<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="506000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="514000" 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"/>
@@ -479,13 +340,14 @@
 		<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="578000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="794000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="810000" 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"/>
 	</cable>
 	<cable name="Göltzschtalbrücke" satfeed="true" flags="9">
+		<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"/>
@@ -534,10 +396,11 @@
 		<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="6111000" fec_inner="0" modulation="3"/>
+		<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"/>
+		<transponder frequency="650000" 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"/>
@@ -1431,86 +1294,80 @@
 		<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="578000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="586000" 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"/>
 		<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="826000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="834000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 	</cable>
 	<cable name="OstTelCom GmbH" satfeed="true" flags="9">
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="578000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="650000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<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="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"/>
 		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="362000" 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="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="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"/>
 		<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="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="514000" 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="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="658000" 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="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<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="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="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"/>
+		<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="5"/>
+		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="714000" 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>
-	<cable name="Ziggo noord-holland" satfeed="true" flags="9" nid="8888">
+	<cable name="Ziggo Noord-Holland" satfeed="true" flags="9" nid="8888">
 		<transponder frequency="514000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 	</cable>
-	<cable name="Ziggo Zuid-holland" satfeed="true" flags="9" nid="5555">
+	<cable name="Ziggo Zuid-Holland" satfeed="true" flags="9" nid="5555">
 		<transponder frequency="372000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 	</cable>
 	<cable name="Upc Brabant" satfeed="true" flags="9" nid="43144">

data/config/epgmap.xml

@@ -16,4 +16,7 @@
 	<filter channel_id="b12003ee00011078" new_epg_id="ac423070013e2144"/> --rainews24
 
 	<filter channel_id="b4d6070800c80e26" new_epg_id="b45803fb0001283d"/> --Das Erste
+
+	<filter channel_id="aa0004210001ef10" >RTL.de</filter> --RTL HD
+	<filter channel_id="b6ba3db8013e4224" >RedlightHD.ero</filter> --Redlight HD
 </zapit>

data/config/terrestrial.xml

@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- useable flags are
+	1 - Network Scan
+	2 - use BAT
+	4 - use ONIT
+	8 - skip NITs of known networks
+	and combinations of this -->
+
+<!-- this file is autogenerated by mk_terrestrial_xml.pl
+     WARNING! It is probably unsuitable for enigma! -->
+<!-- Parameters are (unfortunately, the neutrino parser does not allow default settings,
+     the default is always "0"):
+	* bandwidth:
+		"0"-8MHz "1"-7MHz "2"-6MHz "3"-AUTO 
+	* constellation:
+		"0"-QPSK "1"-QAM16 "2"-QAM32 "3"-QAM64 "4"-QAM128 "5"-QAM256 "6"-AUTO 
+	* transmission_mode:
+		"0"-2k "1"-8k "2"-AUTO 
+	* code_rate_[HL]P:
+		"0"-NONE "1"-1/2 "2"-2/3 "3"-3/4 "4"-4/5 "5"-5/6 "6"-6/7 "7"-7/8 "8"-8/9 "9"-AUTO 
+	* guard_interval:
+		"0"-1/32 "1"-1/16 "2"-1/8 "3"-1/4 "4"-AUTO 
+	* hierarchy:
+		"0"-NONE "1"-1 "2"-2 "3"-4 "4"-AUTO 	-->
+
+<locations>
+	<terrestrial name="DVB-T/T2-Auto" flags="5">
+		<transponder frequency="177500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 05 -->
+		<transponder frequency="184500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 06 -->
+		<transponder frequency="191500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 07 -->
+		<transponder frequency="198500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 08 -->
+		<transponder frequency="205500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 09 -->
+		<transponder frequency="212500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 10 -->
+		<transponder frequency="219500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 11 -->
+		<transponder frequency="226500" bandwidth="1" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 12 -->
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 21 -->
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 22 -->
+		<transponder frequency="490000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 23 -->
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 24 -->
+		<transponder frequency="506000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 25 -->
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 26 -->
+		<transponder frequency="522000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 27 -->
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 28 -->
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 29 -->
+		<transponder frequency="546000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 30 -->
+		<transponder frequency="554000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 31 -->
+		<transponder frequency="562000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 32 -->
+		<transponder frequency="570000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 33 -->
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 34 -->
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 35 -->
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 36 -->
+		<transponder frequency="602000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 37 -->
+		<transponder frequency="610000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 38 -->
+		<transponder frequency="618000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 39 -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 40 -->
+		<transponder frequency="634000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 41 -->
+		<transponder frequency="642000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 42 -->
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 43 -->
+		<transponder frequency="658000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 44 -->
+		<transponder frequency="666000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 45 -->
+		<transponder frequency="674000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 46 -->
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 47 -->
+		<transponder frequency="690000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 48 -->
+		<transponder frequency="698000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 49 -->
+		<transponder frequency="706000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 50 -->
+		<transponder frequency="714000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 51 -->
+		<transponder frequency="722000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 52 -->
+		<transponder frequency="730000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 53 -->
+		<transponder frequency="738000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 54 -->
+		<transponder frequency="746000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 55 -->
+		<transponder frequency="754000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 56 -->
+		<transponder frequency="762000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 57 -->
+		<transponder frequency="770000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 58 -->
+		<transponder frequency="778000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 59 -->
+		<transponder frequency="786000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 60 -->
+		<transponder frequency="794000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 61 -->
+		<transponder frequency="802000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 62 -->
+		<transponder frequency="810000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 63 -->
+		<transponder frequency="818000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 64 -->
+		<transponder frequency="826000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 65 -->
+		<transponder frequency="834000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 66 -->
+		<transponder frequency="842000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 67 -->
+		<transponder frequency="850000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 68 -->
+		<transponder frequency="858000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 69 -->
+	</terrestrial>
+	<terrestrial name="Berlin/Brandenburg (DVB-T2)" flags="5">
+		<transponder frequency="490000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 23 RBB1 Cottbus -->
+		<transponder frequency="506000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 25 RBB1 Berlin Frankfurt/Oder -->
+		<transponder frequency="522000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 27 freenet TV 1 Berlin -->
+		<transponder frequency="554000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 31 freenet TV 2 Berlin -->
+		<transponder frequency="570000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 33 ZDF Berlin Frankfurt/Oder -->
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 36 ZDF Cottbus -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 40 RBB2 Berlin Frankfurt/Oder -->
+		<transponder frequency="642000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 42 freenet TV 3 Berlin -->
+		<transponder frequency="658000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 44 RBB2 Cottbus -->
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 47 -->
+	</terrestrial>
+	<terrestrial name="Braunschweig (Broitzem+Kraftwerk) (DVB-T2)" flags="5">
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 21 freenet TV 2 -->
+		<transponder frequency="490000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 23 ARD -->
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 36 ZDF -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 40 ARD/Dritte -->
+		<transponder frequency="658000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 44 freenet TV 1 -->
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 47 freenet TV 3 -->
+	</terrestrial>
+	<terrestrial name="Bremen-Walle/Bremerhaven (DVB-T2)" flags="5">
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 22 freenet TV 3 -->
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 29 ARD/NDR -->
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 35 ZDF -->
+		<transponder frequency="642000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 42 freenet TV 1 -->
+		<transponder frequency="674000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 46 RB -->
+		<transponder frequency="690000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 48 freenet TV 2 -->
+		<transponder frequency="746000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 55 NDR/NDS -->
+	</terrestrial>
+	<terrestrial name="Duesseldorf/Ruhrgebiet (DVB-T2)" flags="5">
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="698000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="746000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="818000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="826000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="834000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Essen (DVB-T2)" flags="5">
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="690000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="722000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="746000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="762000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Gera (Roschuetz) (DVB-T2)" flags="5">
+		<transponder frequency="506000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 25 ARD -->
+		<transponder frequency="522000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 27 ARD/Dritte -->
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 22 ZDF -->
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 43 freenet TV 1 -->
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 28 freenet TV 2 -->
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 47 freenet TV 3 -->
+	</terrestrial>
+	<terrestrial name="Halle (Stadt) (DVB-T2)" flags="5">
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 24 ARD -->
+		<transponder frequency="610000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 38 ARD/Dritte -->
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 22 ZDF -->
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 43 freenet TV 1 -->
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 28 freenet TV 2 -->
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 26 freenet TV 3 -->
+	</terrestrial>
+	<terrestrial name="Hamburg/Luebeck (DVB-T2)" flags="5">
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="570000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="490000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="546000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="602000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="634000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="666000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="738000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Hanau (DVB-T2)" flags="5">
+		<transponder frequency="522000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="546000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="786000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Hannover/Braunschweig (DVB-T2)" flags="5">
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 21 freenet TV 2 -->
+		<transponder frequency="490000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 23 ARD/NDR -->
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 36 ZDF -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 40 NDR/NDS -->
+		<transponder frequency="658000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 44 freenet TV 1 -->
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 47 freenet TV 3 -->
+	</terrestrial>
+	<terrestrial name="Heidelberg/BadenBaden/Donnersberg/Pforzheim (DVB-T2)" flags="5">
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="698000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="786000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Kiel (DVB-T2)" flags="5">
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="594000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="618000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="666000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="682000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="762000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Koeln/Bonn (DVB-T2)" flags="5">
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="698000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="826000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="834000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Landshut, Passau, Pfarrkirchen (DVB-T2)" flags="5">
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 28 ARD -->
+		<transponder frequency="626000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 40 ARD/Dritte -->
+		<transponder frequency="674000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 46 ZDF -->
+	</terrestrial>
+	<terrestrial name="Leipzig (DVB-T2)" flags="5">
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="530000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="554000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="650000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Muenchen/Suedbayern (DVB-T2)" flags="5">
+		<transponder frequency="514000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 26 freenet TV 2 -->
+		<transponder frequency="546000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 30 ARD/Dritte -->
+		<transponder frequency="554000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 31 ARD -->
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 34 ZDF -->
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 35 freenet TV 1 -->
+		<transponder frequency="690000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 48 freenet TV 3 -->
+	</terrestrial>
+	<terrestrial name="Muenster/NRW (DVB-T2)" flags="5">
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 24 freenet TV 1 -->
+		<transponder frequency="562000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 32 ARD -->
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 34 ARD/Dritte -->
+		<transponder frequency="618000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 39 freenet TV 3 -->
+		<transponder frequency="666000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 45 ZDF -->
+		<transponder frequency="754000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 56 freenet TV 2 -->
+	</terrestrial>
+	<terrestrial name="Nuernberg (Fernmeldeturm) (DVB-T2)" flags="5">
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 24 freenet TV 2 -->
+		<transponder frequency="506000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 25 freenet TV 3 -->
+		<transponder frequency="538000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 29 ARD/Dritte -->
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 34 ZDF -->
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 35 freenet TV 1 -->
+		<transponder frequency="642000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 42 ARD -->
+	</terrestrial>
+	<terrestrial name="Rhein-Main (DVB-T2)" flags="5">
+		<transponder frequency="482000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="602000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="618000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="738000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="778000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Stuttgart-Frauenkopf (DVB-T2)" flags="5">
+		<transponder frequency="474000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="498000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="522000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="586000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="666000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="674000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+		<transponder frequency="698000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />
+	</terrestrial>
+	<terrestrial name="Untersberg bei Salzburg (DVB-T2)" flags="5">
+		<transponder frequency="546000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 30 ARD/Dritte -->
+		<transponder frequency="554000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 31 ARD -->
+		<transponder frequency="578000" bandwidth="0" constellation="6" transmission_mode="2" code_rate_HP="9" code_rate_LP="9" guard_interval="4" hierarchy="0" />	<!-- CH 34 ZDF -->
+	</terrestrial>
+</locations>

data/control/Makefile.am

@@ -0,0 +1,22 @@
+installdir = $(CONTROLDIR)
+
+install_SCRIPTS = \
+	audioplayer.start \
+	audioplayer.end \
+	deepstandby.on \
+	deepstandby.off \
+	flash.start \
+	inactivity.on \
+	\
+	movieplayer.start \
+	movieplayer.end \
+	neutrino.start \
+	pictureviewer.start \
+	pictureviewer.end \
+	recording.timer \
+	recording.start \
+	recording.end \
+	scan.start \
+	scan.stop \
+	standby.on \
+	standby.off

data/control/audioplayer.end

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/audioplayer.start

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/deepstandby.off

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/deepstandby.on

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/inactivity.on

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/movieplayer.end

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0

data/control/movieplayer.start

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# TuxMail sleep
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal sleep
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0

data/control/neutrino.start

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/pictureviewer.end

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/pictureviewer.start

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/recording.end

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0

data/control/recording.start

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# TuxMail sleep
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal sleep
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0

data/control/recording.timer

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/scan.start

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/scan.stop

@@ -0,0 +1,2 @@
+#!/bin/sh
+

data/control/standby.off

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0

data/control/standby.on

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# TuxMail pause
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal pause
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0

data/fonts/Makefile.am

@@ -1,20 +1,34 @@
 installdir = $(FONTDIR)
 
+# NOTE: tuxtxt.otb is the non-ttf font for tuxtxt (UseTTF 0 in tuxtxt2.conf)
+#	Variables neutrino_ttf and tuxtxt_ttf describe aliases for neutrino.ttf and tuxtxt.ttf.
+
+neutrino_ttf = neutrino.ttf
+tuxtxt_ttf = DejaVuLGCSansMono-Bold.ttf
+
 install_DATA = \
-	LiberationSans-Bold.ttf \
-	LiberationSans-BoldItalic.ttf \
-	LiberationSans-Italic.ttf \
+	$(neutrino_ttf) \
+	$(tuxtxt_ttf) \
 	LiberationSans-Regular.ttf \
 	md_khmurabi_10.ttf \
 	micron_bold.ttf \
 	micron_italic.ttf \
 	micron.ttf \
-	neutrino.ttf \
-	pakenham.ttf \
-	DejaVuLGCSansMono-Bold.ttf \
-	tuxtxt.ttf \
 	tuxtxt.otb
 
+
 if BOXMODEL_CS_HD2
 install_DATA += UnDotum.ttf
 endif
+
+install-data-hook:
+	cd $(DESTDIR)$(FONTDIR); \
+		mv $(neutrino_ttf) neutrino.ttf; \
+		mv $(tuxtxt_ttf) tuxtxt.ttf; \
+		ln -sf tuxtxt.ttf shell.ttf
+
+uninstall-hook:
+	cd $(DESTDIR)$(FONTDIR); \
+		rm -f neutrino.ttf; \
+		rm -f tuxtxt.ttf; \
+		rm -f shell.ttf

data/icons/Makefile.am

@@ -8,7 +8,8 @@ SUBDIRS = \
 	radar \
 	slider \
 	status \
-	various
+	various \
+	weather
 
 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)/$(ICONSDIR)/logo

data/icons/buttons/Makefile.am

@@ -14,14 +14,20 @@ install_DATA = \
 	blau.png \
 	btn_backward.png \
 	btn_forward.png \
+	btn_option_off_active.png \
+	btn_option_off_inactive.png \
+	btn_option_on_active.png \
+	btn_option_on_inactive.png \
 	btn_pause.png \
 	btn_play.png \
 	btn_record_active.png \
 	btn_record_inactive.png \
 	btn_stop.png \
+	btn_timer.png \
 	down.png \
 	dummy.png \
 	dummy_small.png \
+	epg.png \
 	gelb.png \
 	gruen.png \
 	help.png \
@@ -30,8 +36,10 @@ install_DATA = \
 	info.png \
 	info_small.png \
 	left.png \
+	longpress.png \
 	menu.png \
 	menu_small.png \
+	mute.png \
 	mute_small.png \
 	mute_zap_gray.png \
 	mute_zap_green.png \

data/icons/headers/Makefile.am

@@ -4,9 +4,11 @@ install_DATA = \
 	audio.png \
 	bookmarkmanager.png \
 	colors.png \
+	edit.png \
 	error.png \
 	features.png \
 	games.png \
+	icon_blue.png \
 	icon_green.png \
 	icon_movieplayer.png \
 	icon_red.png \
@@ -16,11 +18,15 @@ install_DATA = \
 	keybinding.png \
 	language.png \
 	lcd.png \
+	lock.png \
 	mainmenue.png \
+	mp3.png \
 	multimedia.png \
 	network.png \
 	personalize.png \
 	pictureviewer.png \
+	question.png \
+	radiotext.png \
 	recording.png \
 	settings.png \
 	shell.png \

data/icons/hints/Makefile.am

@@ -22,6 +22,7 @@ install_DATA = \
 	hint_info.png \
 	hint_keys.png \
 	hint_language.png \
+	hint_lcd4linux.png \
 	hint_load.png \
 	hint_manage.png \
 	hint_mb.png \
@@ -56,4 +57,6 @@ install_DATA = \
 	hint_tvradio_switch.png \
 	hint_vfd.png \
 	hint_video.png \
+	hint_webtv.png \
+	hint_xmltv.png \
 	hint_ytplay.png

data/icons/status/ca/Makefile.am

@@ -1,6 +1,9 @@
 installdir = $(ICONSDIR)
 
 install_DATA = \
+	bc_green.png \
+	bc_white.png \
+	bc_yellow.png \
 	biss_green.png \
 	biss_white.png \
 	biss_yellow.png \
@@ -34,6 +37,9 @@ install_DATA = \
 	via_green.png \
 	via_white.png \
 	via_yellow.png \
+	vmx_green.png \
+	vmx_white.png \
+	vmx_yellow.png \
 	x_green.png \
 	x_white.png \
 	x_yellow.png

data/icons/status/markers/Makefile.am

@@ -1,6 +1,26 @@
 installdir = $(ICONSDIR)
 
 install_DATA = \
-	checkmark.png \
-	important.png \
-	warning.png
+	marker_dialog_off.png \
+	marker_dialog_ok.png \
+	marker_epg.png \
+	marker_hd.png \
+	marker_hidden.png \
+	marker_lock.png \
+	marker_lock_passive.png \
+	marker_pip.png \
+	marker_radio.png \
+	marker_record.png \
+	marker_record_gray.png \
+	marker_scrambled.png \
+	marker_sd.png \
+	marker_streaming.png \
+	marker_timeshift.png \
+	marker_timeshift_gray.png \
+	marker_tv.png \
+	marker_uhd.png \
+	marker_update_available.png \
+	marker_warning.png \
+	marker_zap.png \
+	mounted.png \
+	not_mounted.png