Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'

...needs buildfixing... Conflicts: data/icons/shutdown.jpg data/icons/start.jpg lib/libtuxtxt/tuxtxt.h src/driver/Makefile.am src/driver/audiodec/Makefile.am src/driver/framebuffer.cpp src/driver/record.cpp src/driver/volume.cpp src/gui/audio_setup.cpp src/gui/audioplayer.cpp src/gui/epgview.cpp src/gui/eventlist.cpp src/gui/filebrowser.cpp src/gui/infoviewer.cpp src/gui/keybind_setup.cpp src/gui/miscsettings_menu.cpp src/gui/movieplayer.cpp src/gui/osd_setup.cpp src/gui/scan.cpp src/gui/scan_setup.cpp src/gui/streaminfo2.cpp src/gui/update.cpp src/gui/videosettings.cpp src/gui/widget/menue.cpp src/neutrino.cpp src/neutrino_menue.cpp src/system/Makefile.am src/system/configure_network.cpp src/system/httptool.cpp src/system/setting_helpers.cpp src/timerd/timermanager.cpp src/zapit/include/zapit/frontend_c.h src/zapit/src/Makefile.am src/zapit/src/capmt.cpp src/zapit/src/frontend.cpp src/zapit/src/zapit.cpp Origin commit data ------------------ Commit: adb23b23ee Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de> Date: 2012-10-14 (Sun, 14 Oct 2012)
2025-08-27 15:32:52 +02:00 · 2012-10-14 12:51:07 +02:00
parent 41d55e7c91 890b4f2c0a
commit 345a8a274d
442 changed files with 7648 additions and 4167 deletions
--- a/cross-configure.cool
+++ b/cross-configure.cool
@@ -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/cables.xml
+++ b/data/cables.xml
@@ -35,6 +35,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>
@@ -259,6 +260,12 @@
 		<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="774000" 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
@@ -65,6 +65,48 @@ install_DATA = \
 	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_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 \
--- 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/bosanski.png
+++ b/data/icons/bosanski.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/ch-berndeutsch.png
+++ b/data/icons/ch-berndeutsch.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_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/data/icons/hint_vfd.png
+++ b/data/icons/hint_vfd.png
--- a/data/icons/hint_video.png
+++ b/data/icons/hint_video.png
--- a/data/icons/hungarian.png
+++ b/data/icons/hungarian.png
--- a/data/icons/icon_blue.png
+++ b/data/icons/icon_blue.png
--- a/data/icons/icon_green.png
+++ b/data/icons/icon_green.png
--- a/data/icons/icon_movieplayer.png
+++ b/data/icons/icon_movieplayer.png
--- a/data/icons/icon_red.png
+++ b/data/icons/icon_red.png
--- a/data/icons/icon_yellow.png
+++ b/data/icons/icon_yellow.png
--- a/Show More
+++ b/Show More