Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'

...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

src/gui/scan_setup.h

@@ -32,6 +32,7 @@
 
 #include <gui/widget/menue.h>
 #include <gui/widget/icons.h>
+#include <gui/widget/stringinput_ext.h>
 
 #include <system/setting_helpers.h>
 #include <system/settings.h>
@@ -57,13 +58,9 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
 		CMenuForwarder  *frontendSetup;
 		CMenuForwarder  *fsatSetup;
 		CMenuOptionNumberChooser * ojDiseqcRepeats;
+		CIntInput * nid;
+		CMenuOptionChooser * lcnhd;
 
-		/* dynamic frontend items to be enabled/disabled in notify */
-#if 0
-		CGenericMenuActivate itemsForAdvancedDiseqc;
-		CGenericMenuActivate itemsForNonAdvancedDiseqc;
-		CGenericMenuActivate itemsForAnyDiseqc;
-#endif
 		/* variables for selected frontend */
 		/* diseqc mode */
 		int dmode;
@@ -88,8 +85,8 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
 		int showFrontendSetup(int number);
 		int showScanMenuLnbSetup();
 		int showScanMenuSatFind();
-		void fillSatSelect();
-		void fillCableSelect();
+		void fillSatSelect(CMenuOptionStringChooser *select);
+		void fillCableSelect(CMenuOptionStringChooser *select);
 
 		void addScanMenuFrontendSetup(CMenuWidget *settings);
  		void addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t &satconfig);
@@ -99,6 +96,7 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
  		void addScanMenuFastScan(CMenuWidget *fast_ScanMenu);
 #endif
  		void addScanMenuAutoScan(CMenuWidget *auto_Scan);
+		void addScanMenuCable(CMenuWidget *menu);
 
 		int addScanOptionsItems(CMenuWidget *options_menu, const int &shortcut = 1);
 		int addListFlagsItems(CMenuWidget *listflags_menu, const int &shortcut = 1, bool manual = false);
@@ -130,6 +128,4 @@ class CTPSelectHandler : public CMenuTarget //CScanSetup
 	public:
 		int exec(CMenuTarget* parent,  const std::string &actionkey);
 };
-
-
 #endif