-add lcd menu option: show channalname or clock

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1237 e54a6e83-5905-42d5-8d5c-058d10e6a962

data/locale/deutsch.locale

@@ -648,6 +648,9 @@ keychoosermenu.setnone Keine Taste
 languagesetup.head Sprache und Zeitzonen
 languagesetup.osd Menüsprache
 languagesetup.select Sprache
+lcd_info_line Zeige in Infozeile 
+lcd_info_line_channel Kanalname
+lcd_info_line_clock Uhrzeit
 lcdcontroler.brightness normale Helligkeit
 lcdcontroler.brightnessdeepstandby Deep-Standby Helligkeit
 lcdcontroler.brightnessstandby Standby Helligkeit

data/locale/english.locale

@@ -648,6 +648,9 @@ keychoosermenu.setnone no key
 languagesetup.head Language / Timezone
 languagesetup.osd OSD Language
 languagesetup.select OSD Language
+lcd_info_line Zeige in Infoline
+lcd_info_line_channel Channelname
+lcd_info_line_clock clock
 lcdcontroler.brightness normal Brightness
 lcdcontroler.brightnessdeepstandby DeepStandby Brightness
 lcdcontroler.brightnessstandby Standby Brightness

src/driver/vfd.cpp

@@ -277,7 +277,7 @@ void CVFD::showTime(bool force)
 		return;
 	}
 	if (has_lcd && showclock) {
-		if (mode == MODE_STANDBY) {
+		if (mode == MODE_STANDBY || ( g_settings.lcd_info_line && (MODE_TVRADIO == mode))) {
 			char timestr[21];
 			struct timeb tm;
 			struct tm * t;
@@ -490,7 +490,8 @@ void CVFD::setMode(const MODES m, const char * const title)
 		}
 		showServicename(servicename);
 		showclock = true;
-		//showTime();      /* "showclock = true;" implies that "showTime();" does a "displayUpdate();" */
+		if(g_settings.lcd_info_line)
+			showTime();      /* "showclock = true;" implies that "showTime();" does a "displayUpdate();" */
 		break;
 	case MODE_AUDIO:
 	{

src/gui/vfd_setup.cpp

@@ -89,6 +89,12 @@ const CMenuOptionChooser::keyval LEDMENU_OPTIONS[LEDMENU_OPTION_COUNT] =
 	{ 3, LOCALE_LEDCONTROLER_ON_LED2   }
 };
 
+#define LCD_INFO_OPTION_COUNT 2
+const CMenuOptionChooser::keyval LCD_INFO_OPTIONS[LCD_INFO_OPTION_COUNT] =
+{
+	{ 0, LOCALE_LCD_INFO_LINE_CHANNEL },
+	{ 1, LOCALE_LCD_INFO_LINE_CLOCK }
+};
 
 void CVfdSetup::showSetup()
 {
@@ -123,7 +129,10 @@ void CVfdSetup::showSetup()
 	vfds->addItem(GenericMenuSeparatorLine);
 
 	CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_LCDMENU_STATUSLINE, &g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME], LCDMENU_STATUSLINE_OPTIONS, LCDMENU_STATUSLINE_OPTION_COUNT, vfd_enabled);
+	CMenuOptionChooser* lcd_clock_channelname_menu = new CMenuOptionChooser(LOCALE_LCD_INFO_LINE, &g_settings.lcd_info_line, LCD_INFO_OPTIONS, LCD_INFO_OPTION_COUNT, vfd_enabled);
+
 	vfds->addItem(oj);
+	vfds->addItem(lcd_clock_channelname_menu);
 	
 	vfds->exec(NULL, "");
 	vfds->hide();

src/neutrino.cpp

@@ -777,6 +777,7 @@ printf("***************************** rec dir %s timeshift dir %s\n", g_settings
 		g_settings.lcd_setting[i] = configfile.getInt32(lcd_setting[i].name, lcd_setting[i].default_value);
 	strcpy(g_settings.lcd_setting_dim_time, configfile.getString("lcd_dim_time","0").c_str());
 	strcpy(g_settings.lcd_setting_dim_brightness, configfile.getString("lcd_dim_brightness","0").c_str());
+	g_settings.lcd_info_line = configfile.getInt32("lcd_info_line", 0);//channel name or clock
 
 	//Picture-Viewer
 	strcpy( g_settings.picviewer_slide_time, configfile.getString( "picviewer_slide_time", "10" ).c_str() );
@@ -1287,6 +1288,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 		configfile.setInt32(lcd_setting[i].name, g_settings.lcd_setting[i]);
 	configfile.setString("lcd_dim_time", g_settings.lcd_setting_dim_time);
 	configfile.setString("lcd_dim_brightness", g_settings.lcd_setting_dim_brightness);
+	configfile.setInt32("lcd_info_line", g_settings.lcd_info_line);//channel name or clock
 
 	//Picture-Viewer
 	configfile.setString( "picviewer_slide_time", g_settings.picviewer_slide_time );

src/system/locals.h

@@ -675,6 +675,9 @@ typedef enum
 	LOCALE_LANGUAGESETUP_HEAD,
 	LOCALE_LANGUAGESETUP_OSD,
 	LOCALE_LANGUAGESETUP_SELECT,
+	LOCALE_LCD_INFO_LINE,
+	LOCALE_LCD_INFO_LINE_CHANNEL,
+	LOCALE_LCD_INFO_LINE_CLOCK,
 	LOCALE_LCDCONTROLER_BRIGHTNESS,
 	LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY,
 	LOCALE_LCDCONTROLER_BRIGHTNESSSTANDBY,

src/system/locals_intern.h

@@ -675,6 +675,9 @@ const char * locale_real_names[] =
 	"languagesetup.head",
 	"languagesetup.osd",
 	"languagesetup.select",
+	"lcd_info_line",
+	"lcd_info_line_channel",
+	"lcd_info_line_clock",
 	"lcdcontroler.brightness",
 	"lcdcontroler.brightnessdeepstandby",
 	"lcdcontroler.brightnessstandby",

src/system/settings.h

@@ -391,7 +391,7 @@ struct SNeutrinoSettings
 		LCD_SETTING_COUNT
 	};
 	int lcd_setting[LCD_SETTING_COUNT];
-
+	int lcd_info_line;
 	char lcd_setting_dim_time[4];
 	char lcd_setting_dim_brightness[4];
 	int led_tv_mode;