Merge branch 'dvbsi++'

Update master to 2.11 image version
never used
2025-08-31 01:11:12 +02:00 · 2012-12-09 19:24:05 +04:00 · 2012-12-07 12:01:45 +01:00 · 2012-12-07 11:13:51 +01:00 · 2012-12-06 23:11:56 +01:00 · 2012-12-04 22:14:57 +01:00
656 changed files with 12696 additions and 36350 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ src/zapit/src/pzapit
 src/zapit/src/udpstreampes
 src/drivertool
 src/gui/svn_version.h
+src/gui/git_version.h
--- a/cross-configure.cool
+++ b/cross-configure.cool
@@ -1,6 +1,6 @@
 #!/bin/sh

-PREFIX=/opt/newcross/arm-cx2450x-linux-gnueabi/arm-cx2450x-linux-gnueabi/sys-root/usr
+PREFIX=/opt/arm/arm-cx2450x-linux-gnueabi/arm-cx2450x-linux-gnueabi/sys-root/usr
 CCPATH=
 HOST=arm-cx2450x-linux-gnueabi

@@ -12,11 +12,11 @@ export RANLIB=$CCPATH$HOST-ranlib
 export OBJDUMP=$CCPATH$HOST-objdump
 export STRIP=$CCPATH$HOST-strip

-export CFLAGS="-Wall -Werror -g0 -O2 \
+export CFLAGS="-Wall -Werror -g0 -O2 -fno-strict-aliasing \
 	 -D__KERNEL_STRICT_NAMES -DUSE_NEVIS_GXA \
 	-I"$PWD"/include -I"$PWD"/include/linux/dvb -I"$PREFIX"/include/freetype2"

-export CXXFLAGS="-Wall -Werror -g0 -O2 \
+export CXXFLAGS="-Wall -Werror -g0 -O2 -fno-strict-aliasing \
 	 -D__KERNEL_STRICT_NAMES -DUSE_NEVIS_GXA \
 	-I"$PWD"/include -I"$PWD"/include/linux/dvb -I"$PREFIX"/include/freetype2"

@@ -27,5 +27,5 @@ export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
 export CURL_CONFIG=$PREFIX/bin/curl-config

 ./autogen.sh
-./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --without-driver --with-target=cdk --with-targetprefix="" "$*"
+./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" "$*"

--- a/cross-configure.cool.debug
+++ b/cross-configure.cool.debug
@@ -1,6 +1,6 @@
 #!/bin/sh

-PREFIX=/opt/newcross/arm-cx2450x-linux-gnueabi/arm-cx2450x-linux-gnueabi/sys-root/usr
+PREFIX=/opt/arm/arm-cx2450x-linux-gnueabi/arm-cx2450x-linux-gnueabi/sys-root/usr
 CCPATH=
 HOST=arm-cx2450x-linux-gnueabi

@@ -27,5 +27,5 @@ export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
 export CURL_CONFIG=$PREFIX/bin/curl-config

 ./autogen.sh
-./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --without-driver --with-target=cdk --with-targetprefix="" "$*"
+./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" "$*"

--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,4 +5,4 @@ SUBDIRS += lcd
 endif

 configdir = $(CONFIGDIR)
-config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml
+config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml settingsupdate.conf
--- a/data/cables.xml
+++ b/data/cables.xml
@@ -25,6 +25,7 @@
 		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="522000" 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"/>
@@ -35,6 +36,7 @@
 		<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>
@@ -222,13 +224,12 @@
 		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="396000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -254,11 +255,17 @@
 		<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="722000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="738000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="754000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="762000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="770000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="778000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="794000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="810000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 	</cable>
 	<cable name="Kabel BW" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -1336,5 +1343,25 @@
 		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+	</cable>
+	<cable name="CST Berlin" satfeed="true" flags="9">
+		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="666000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="850000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="858000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+	</cable>
+	<cable name="Ziggo Groningen" satfeed="true" flags="9" nid="9700">
+		<transponder frequency="369000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 	</cable>
 </cables>
--- a/data/icons/0.png
+++ b/data/icons/0.png
--- a/data/icons/1.png
+++ b/data/icons/1.png
--- a/data/icons/16_9.png
+++ b/data/icons/16_9.png
--- a/data/icons/16_9_gray.png
+++ b/data/icons/16_9_gray.png
--- a/data/icons/2.png
+++ b/data/icons/2.png
--- a/data/icons/3.png
+++ b/data/icons/3.png
--- a/data/icons/4.png
+++ b/data/icons/4.png
--- a/data/icons/5.png
+++ b/data/icons/5.png
--- a/data/icons/6.png
+++ b/data/icons/6.png
--- a/data/icons/7.png
+++ b/data/icons/7.png
--- a/data/icons/8.png
+++ b/data/icons/8.png
--- a/data/icons/9.png
+++ b/data/icons/9.png
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,6 +1,29 @@
 installdir = $(DATADIR)/neutrino/icons

-install_DATA = \
+locale = \
+	locale/deutsch.png \
+	locale/english.png
+
+locale_unmaintained = \
+	locale/unmaintained/bayrisch.png \
+	locale/unmaintained/bosanski.png \
+	locale/unmaintained/ch-baslerdeutsch.png \
+	locale/unmaintained/ch-berndeutsch.png \
+	locale/unmaintained/czech.png \
+	locale/unmaintained/francais.png \
+	locale/unmaintained/italiano.png \
+	locale/unmaintained/nederlands.png \
+	locale/unmaintained/polski.png \
+	locale/unmaintained/portugues.png \
+	locale/unmaintained/russkij.png \
+	locale/unmaintained/slovak.png \
+	locale/unmaintained/suomi.png \
+	locale/unmaintained/svenska.png
+
+install_DATA  = $(locale)
+install_DATA += $(locale_unmaintained)
+
+install_DATA += \
 	0.png \
 	1.png \
 	16_9.png \
@@ -16,7 +39,6 @@ install_DATA = \
 	ats.png \
 	ats_gray.png \
 	audio.png \
-	bayrisch.png \
 	biss_green.png \
 	biss_white.png \
 	biss_yellow.png \
@@ -24,15 +46,16 @@ install_DATA = \
 	bookmarkmanager.png \
 	border_lr.png \
 	border_ul.png \
-	bosanski.png \
+	btn_backward.png \
+	btn_forward.png \
+	btn_pause.png \
+	btn_play.png \
 	btn_record_active.png \
 	btn_record_inactive.png \
 	btn_stop.png \
 	ca.png \
 	ca2.png \
 	ca2_gray.png \
-	ch-baslerdeutsch.png \
-	ch-berndeutsch.png \
 	colors.png \
 	conax_green.png \
 	conax_white.png \
@@ -40,7 +63,6 @@ install_DATA = \
 	cw_green.png \
 	cw_white.png \
 	cw_yellow.png \
-	czech.png \
 	d_green.png \
 	d_white.png \
 	d_yellow.png \
@@ -48,25 +70,61 @@ install_DATA = \
 	dd_avail.png \
 	dd_gray.png \
 	ddfill.png \
-	deutsch.png \
 	down.png \
-	dutch.png \
-	ellinika.png \
-	english.png \
 	error.png \
 	features.png \
 	file.png \
 	folder.png \
-	francais.png \
-	french.png \
 	games.png \
 	gelb.png \
 	gruen.png \
 	help.png \
 	help_small.png \
 	hidden.png \
+	hint_aplay.png \
+	hint_audio.png \
+	hint_back.png \
+	hint_bedit.png \
+	hint_ci.png \
+	hint_dboxinfo.png \
+	hint_delete.png \
+	hint_extended.png \
+	hint_fileplay.png \
+	hint_games.png \
+	hint_hdd.png \
+	hint_imageinfo.png \
+	hint_inetradio.png \
+	hint_info.png \
+	hint_keys.png \
+	hint_language.png \
+	hint_manage.png \
+	hint_mb.png \
+	hint_media.png \
+	hint_movie.png \
+	hint_network.png \
+	hint_osd.png \
+	hint_personalize.png \
+	hint_picview.png \
+	hint_protection.png \
+	hint_radiomode.png \
+	hint_reboot.png \
+	hint_recording.png \
+	hint_reload.png \
+	hint_save.png \
+	hint_scan.png \
+	hint_scripts.png \
+	hint_service.png \
+	hint_settings.png \
+	hint_shutdown.png \
+	hint_sleeptimer.png \
+	hint_streaminfo.png \
+	hint_swupdate.png \
+	hint_timers.png \
+	hint_tvmode.png \
+	hint_tvradio_switch.png \
+	hint_vfd.png \
+	hint_video.png \
 	home.png \
-	hungarian.png \
 	icon_green.png \
 	icon_movieplayer.png \
 	icon_red.png \
@@ -78,7 +136,6 @@ install_DATA = \
 	ird_green.png \
 	ird_white.png \
 	ird_yellow.png \
-	italiano.png \
 	keybinding.png \
 	language.png \
 	lcd.png \
@@ -115,16 +172,12 @@ install_DATA = \
 	nds_green.png \
 	nds_white.png \
 	nds_yellow.png \
-	nederlands.png \
 	network.png \
-	norsk.png \
 	not_mounted.png \
 	notyet.png \
 	numericpad.png \
 	ok.png \
 	personalize.png \
-	polski.png \
-	portugues.png \
 	power.png \
 	powervu_green.png \
 	powervu_white.png \
@@ -166,9 +219,7 @@ install_DATA = \
 	res_hd.png \
 	res_sd.png \
 	right.png \
-	romania.png \
 	rot.png \
-	russkij.png \
 	scan.jpg \
 	seca_green.png \
 	seca_white.png \
@@ -176,14 +227,11 @@ install_DATA = \
 	settings.png \
 	shell.png \
 	shutdown.jpg \
-	slovak.png \
 	softupdate.png \
 	start.jpg \
 	streaming.png \
 	subt.png \
 	subt_gray.png \
-	suomi.png \
-	svenska.png \
 	timer.png \
 	tuner_1.png \
 	tuner_2.png \
--- a/data/icons/bayrisch.png
+++ b/data/icons/bayrisch.png
--- a/data/icons/biss_green.png
+++ b/data/icons/biss_green.png
--- a/data/icons/biss_white.png
+++ b/data/icons/biss_white.png
--- a/data/icons/biss_yellow.png
+++ b/data/icons/biss_yellow.png
--- a/data/icons/blau.png
+++ b/data/icons/blau.png
--- a/data/icons/border_lr.png
+++ b/data/icons/border_lr.png
--- a/data/icons/border_ul.png
+++ b/data/icons/border_ul.png
--- a/data/icons/bosanski.png
+++ b/data/icons/bosanski.png
--- a/data/icons/btn_backward.png
+++ b/data/icons/btn_backward.png
--- a/data/icons/btn_forward.png
+++ b/data/icons/btn_forward.png
--- a/data/icons/btn_pause.png
+++ b/data/icons/btn_pause.png
--- a/data/icons/btn_play.png
+++ b/data/icons/btn_play.png
--- a/data/icons/btn_record_active.png
+++ b/data/icons/btn_record_active.png
--- a/data/icons/btn_record_inactive.png
+++ b/data/icons/btn_record_inactive.png
--- a/data/icons/btn_stop.png
+++ b/data/icons/btn_stop.png
--- a/data/icons/ca2.png
+++ b/data/icons/ca2.png
--- a/data/icons/ca2_gray.png
+++ b/data/icons/ca2_gray.png
--- a/data/icons/ch-baslerdeutsch.png
+++ b/data/icons/ch-baslerdeutsch.png
--- a/data/icons/conax_green.png
+++ b/data/icons/conax_green.png
--- a/data/icons/conax_white.png
+++ b/data/icons/conax_white.png
--- a/data/icons/conax_yellow.png
+++ b/data/icons/conax_yellow.png
--- a/data/icons/cw_green.png
+++ b/data/icons/cw_green.png
--- a/data/icons/cw_white.png
+++ b/data/icons/cw_white.png
--- a/data/icons/cw_yellow.png
+++ b/data/icons/cw_yellow.png
--- a/data/icons/d_green.png
+++ b/data/icons/d_green.png
--- a/data/icons/d_white.png
+++ b/data/icons/d_white.png
--- a/data/icons/d_yellow.png
+++ b/data/icons/d_yellow.png
--- a/data/icons/dd.png
+++ b/data/icons/dd.png
--- a/data/icons/dd_avail.png
+++ b/data/icons/dd_avail.png
--- a/data/icons/dd_gray.png
+++ b/data/icons/dd_gray.png
--- a/data/icons/ddfill.png
+++ b/data/icons/ddfill.png
--- a/data/icons/down.png
+++ b/data/icons/down.png
--- a/data/icons/dutch.png
+++ b/data/icons/dutch.png
--- a/data/icons/ellinika.png
+++ b/data/icons/ellinika.png
--- a/data/icons/english.png
+++ b/data/icons/english.png
--- a/data/icons/features.png
+++ b/data/icons/features.png
--- a/data/icons/francais.png
+++ b/data/icons/francais.png
--- a/data/icons/french.png
+++ b/data/icons/french.png
--- a/data/icons/gelb.png
+++ b/data/icons/gelb.png
--- a/data/icons/gruen.png
+++ b/data/icons/gruen.png
--- a/data/icons/help_small.png
+++ b/data/icons/help_small.png
--- a/data/icons/hint_aplay.png
+++ b/data/icons/hint_aplay.png
--- a/data/icons/hint_audio.png
+++ b/data/icons/hint_audio.png
--- a/data/icons/hint_back.png
+++ b/data/icons/hint_back.png
--- a/data/icons/hint_bedit.png
+++ b/data/icons/hint_bedit.png
--- a/data/icons/hint_ci.png
+++ b/data/icons/hint_ci.png
--- a/data/icons/hint_dboxinfo.png
+++ b/data/icons/hint_dboxinfo.png
--- a/data/icons/hint_delete.png
+++ b/data/icons/hint_delete.png
--- a/data/icons/hint_extended.png
+++ b/data/icons/hint_extended.png
--- a/data/icons/hint_fileplay.png
+++ b/data/icons/hint_fileplay.png
--- a/data/icons/hint_games.png
+++ b/data/icons/hint_games.png
--- a/data/icons/hint_hdd.png
+++ b/data/icons/hint_hdd.png
--- a/data/icons/hint_imageinfo.png
+++ b/data/icons/hint_imageinfo.png
--- a/data/icons/hint_inetradio.png
+++ b/data/icons/hint_inetradio.png
--- a/data/icons/hint_info.png
+++ b/data/icons/hint_info.png
--- a/data/icons/hint_keys.png
+++ b/data/icons/hint_keys.png
--- a/data/icons/hint_language.png
+++ b/data/icons/hint_language.png
--- a/data/icons/hint_manage.png
+++ b/data/icons/hint_manage.png
--- a/data/icons/hint_mb.png
+++ b/data/icons/hint_mb.png
--- a/data/icons/hint_media.png
+++ b/data/icons/hint_media.png
--- a/data/icons/hint_movie.png
+++ b/data/icons/hint_movie.png
--- a/data/icons/hint_network.png
+++ b/data/icons/hint_network.png
--- a/data/icons/hint_osd.png
+++ b/data/icons/hint_osd.png
--- a/data/icons/hint_personalize.png
+++ b/data/icons/hint_personalize.png
--- a/data/icons/hint_picview.png
+++ b/data/icons/hint_picview.png
--- a/data/icons/hint_protection.png
+++ b/data/icons/hint_protection.png
--- a/data/icons/hint_radiomode.png
+++ b/data/icons/hint_radiomode.png
--- a/data/icons/hint_reboot.png
+++ b/data/icons/hint_reboot.png
--- a/data/icons/hint_recording.png
+++ b/data/icons/hint_recording.png
--- a/data/icons/hint_reload.png
+++ b/data/icons/hint_reload.png
--- a/data/icons/hint_save.png
+++ b/data/icons/hint_save.png
--- a/data/icons/hint_scan.png
+++ b/data/icons/hint_scan.png
--- a/data/icons/hint_scripts.png
+++ b/data/icons/hint_scripts.png
--- a/data/icons/hint_service.png
+++ b/data/icons/hint_service.png
--- a/data/icons/hint_settings.png
+++ b/data/icons/hint_settings.png
--- a/data/icons/hint_shutdown.png
+++ b/data/icons/hint_shutdown.png
--- a/data/icons/hint_sleeptimer.png
+++ b/data/icons/hint_sleeptimer.png
--- a/data/icons/hint_streaminfo.png
+++ b/data/icons/hint_streaminfo.png
--- a/data/icons/hint_swupdate.png
+++ b/data/icons/hint_swupdate.png
--- a/data/icons/hint_timers.png
+++ b/data/icons/hint_timers.png
--- a/data/icons/hint_tvmode.png
+++ b/data/icons/hint_tvmode.png
--- a/data/icons/hint_tvradio_switch.png
+++ b/data/icons/hint_tvradio_switch.png
--- a/Show More
+++ b/Show More