Merge remote-tracking branch 'check/next-cc'

needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit

src/system/settings.h

@@ -44,7 +44,11 @@
 
 #include <string>
 
+#ifdef BOXMODEL_APOLLO
+#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 14
+#else
 #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 13
+#endif
 
 struct SNeutrinoSettings
 {
@@ -54,6 +58,11 @@ struct SNeutrinoSettings
 	int analog_mode1;
 	int analog_mode2;
 	int video_43mode;
+#ifdef BOXMODEL_APOLLO
+	int brightness;
+	int contrast;
+	int saturation;
+#endif
 	char current_volume;
 	int current_volume_step;
 	int channel_mode;
@@ -117,6 +126,7 @@ struct SNeutrinoSettings
 	int rounded_corners;
 	int ci_standby_reset;
 	int ci_clock;
+	int ci_ignore_messages;
 	int radiotext_enable;
 	
 	//vcr
@@ -403,6 +413,9 @@ struct SNeutrinoSettings
 	std::string screenshot_dir;
 
 	int key_current_transponder;
+	int key_pip_close;
+	int key_pip_setup;
+	int key_pip_swap;
 
 	int cacheTXT;
 	int minimode;
@@ -431,6 +444,7 @@ struct SNeutrinoSettings
 	int channellist_foot;
 	int channellist_new_zap_mode;
 	int channellist_sort_mode;
+	int channellist_numeric_adjust;
 	char repeat_blocker[4];
 	char repeat_genericblocker[4];
 	int remote_control_hardware;
@@ -692,34 +706,40 @@ const int PARENTALLOCK_PROMPT_ONSIGNAL       = 3;
 
 class CScanSettings
 {
-public:
-	CConfigFile	configfile;
-	int		bouquetMode;
-	int		scanType;
+	public:
+		CConfigFile	configfile;
+		int		bouquetMode;
+		int		scanType;
 
-	char                      satNameNoDiseqc[50];
-	delivery_system_t         delivery_system;
-	int		scan_nit;
-	int		scan_nit_manual;
-	int		scan_bat;
-	int		scan_fta_flag;
-	int		scan_reset_numbers;
-	int		scan_logical_numbers;
-	int		scan_logical_hd;
-	int		TP_fec;
-	int		TP_pol;
-	int		TP_mod;
-	char		TP_freq[10];
-	char		TP_rate[9];
-	int		fast_type;
-	int		fast_op;
-	int		cable_nid;
+		delivery_system_t         delivery_system;
+		int		scan_nit;
+		int		scan_nit_manual;
+		int		scan_bat;
+		int		scan_fta_flag;
+		int		scan_reset_numbers;
+		int		scan_logical_numbers;
+		int		scan_logical_hd;
+		int		fast_type;
+		int		fast_op;
+		int		cable_nid;
 
-	CScanSettings();
+		char		satName[50];
+		int		sat_TP_fec;
+		int		sat_TP_pol;
+		char		sat_TP_freq[10];
+		char		sat_TP_rate[9];
 
-	//void useDefaults(const delivery_system_t _delivery_system);
-	bool loadSettings(const char * const fileName, const delivery_system_t _delivery_system);
-	bool saveSettings(const char * const fileName);
+		char		cableName[50];
+		int		cable_TP_mod;
+		int		cable_TP_fec;
+		char		cable_TP_freq[10];
+		char		cable_TP_rate[9];
+
+		CScanSettings();
+
+		//void useDefaults(const delivery_system_t _delivery_system);
+		bool loadSettings(const char * const fileName, const delivery_system_t _delivery_system);
+		bool saveSettings(const char * const fileName);
 };