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/gui/scan_setup.h

@@ -51,31 +51,44 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
 	
 	private:
 		CMenuOptionStringChooser 	*satSelect;
+		CMenuOptionStringChooser 	*cableSelect;
 		CMenuWidget			*satOnOff;
 
 		/* global items to be enabled/disabled in notify */
 		CMenuForwarder  *fautoScanAll;
 		CMenuForwarder  *frontendSetup;
 		CMenuForwarder  *fsatSetup;
+		CMenuForwarder  *fsatSelect;
+		CMenuOptionChooser * dtype;
+		CMenuOptionChooser * dorder;
 		CMenuForwarder  *uniSetup;
 		CMenuOptionNumberChooser * ojDiseqcRepeats;
 		CIntInput * nid;
 		CMenuOptionChooser * lcnhd;
 
+		CMenuOptionChooser * linkfe;
+		std::string modestr[4];
+
 		/* variables for selected frontend */
 		/* diseqc mode */
 		int dmode;
+		/* frontend setup menu current fe number */
 		int fenumber;
+		/* frontend mode */
+		int femode;
+		/* frontend link to number */
+		int femaster;
 
 		/* flag to allow any operations which can damage recordings */
 		bool allow_start;
+		/* flag to re-init frontends */
+		bool fe_restart;
 
 		bool is_wizard;
 		
 		int fec_count;
 		int freq_length;
 		int r_system;
-		int femode;
 
 		neutrino_locale_t satprov_locale;
 
@@ -84,13 +97,15 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
 		int showScanMenu();
 
 		int showFrontendSetup(int number);
+		int showFrontendSelect(int number);
 		int showScanMenuLnbSetup();
 		int showUnicableSetup();
 		int showScanMenuSatFind();
 		void fillSatSelect(CMenuOptionStringChooser *select);
 		void fillCableSelect(CMenuOptionStringChooser *select);
 
-		void addScanMenuFrontendSetup(CMenuWidget *settings);
+		neutrino_locale_t getModeLocale(int mode);
+		int showScanMenuFrontendSetup();
  		void addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t &satconfig);
  		void addScanMenuManualScan(CMenuWidget *manual_Scan);
  		void addScanMenuAutoScanAll(CMenuWidget *auto_ScanAll);