- make lcd4linux configurable

Conflicts:
	configure.ac
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/bouquetlist.cpp
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.h

Signed-off-by: Thilo Graf <dbt@novatux.de>

mostly format and line and build fixes

src/system/flashtool.cpp

@@ -341,6 +341,17 @@ bool CFlashTool::getInfo()
 	return true;
 }
 
+
+void CFlashTool::stopDaemons()
+{
+#ifdef ENABLE_LCD4LINUX
+	if (g_settings.lcd4l_support)
+		LCD4l->StopLCD4l();
+#endif
+
+	CNeutrinoApp::getInstance()->stopDaemonsForFlash();
+}
+
 bool CFlashTool::erase(int globalProgressEnd)
 {
 	erase_info_t lerase;

src/system/flashtool.h

@@ -53,6 +53,7 @@ class CFlashTool
 
 		bool getInfo();
 		bool erase(int globalProgressEnd=-1);
+		void stopDaemons();
 
 	public:
 		CFlashTool();

src/system/settings.h

@@ -931,6 +931,7 @@ struct SNeutrinoSettings
 	int glcd_scroll_speed;
 	int glcd_selected_config;
 #endif
+
 #ifdef ENABLE_LCD4LINUX
 	// lcd4linux
 	int lcd4l_support;
@@ -942,6 +943,7 @@ struct SNeutrinoSettings
 	int lcd4l_skin_radio;
 	int lcd4l_convert;
 #endif
+
 	// lcdd
 	enum LCD_SETTINGS {
 		LCD_BRIGHTNESS         = 0,