- Switchover remote control neo1 / neo2 (Main Menu -> Settings -> Key Setup -> Remote Control NEO1 off/on)

- Fixed volume control bug (CRCInput::RC_right / CRCInput::RC_left)


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

data/locale/deutsch.locale

@@ -614,6 +614,7 @@ infoviewer.waittime Warte auf Uhrzeit...
 ipsetup.hint_1 Benutzen Sie 0..9 oder hoch/runter
 ipsetup.hint_2 OK speichert, EXIT bricht ab
 keybindingmenu.RC Fernbedienung abstimmen
+keybindingmenu.RC_NEO1 Fernbedienung NEO1
 keybindingmenu.addrecord Aufnahme-Timer hinzufügen
 keybindingmenu.addremind Umschalt-Timer hinzufügen
 keybindingmenu.allchannels_on_ok Kanalliste

data/locale/english.locale

@@ -614,6 +614,7 @@ infoviewer.waittime Waiting for time...
 ipsetup.hint_1 Use 0..9, or use Up/Down,
 ipsetup.hint_2 OK saves, LAME! aborts
 keybindingmenu.RC Tune Remote-Control
+keybindingmenu.RC_NEO1 Remote Control NEO1
 keybindingmenu.addrecord add record timer
 keybindingmenu.addremind add zapto timer
 keybindingmenu.allchannels_on_ok all-services

src/gui/keybind_setup.cpp

@@ -184,6 +184,7 @@ void CKeybindSetup::showKeySetup()
 	keySettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_KEYBINDINGMENU_RC));
 	keySettings->addItem(new CMenuForwarder(LOCALE_KEYBINDINGMENU_REPEATBLOCK, true, g_settings.repeat_blocker, keySettings_repeatBlocker));
 	keySettings->addItem(new CMenuForwarder(LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC, true, g_settings.repeat_genericblocker, keySettings_repeat_genericblocker));
+	keySettings->addItem(new CMenuOptionChooser(LOCALE_KEYBINDINGMENU_RC_NEO1, &g_settings.remote_control_neo1, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
 
 	//user menues
 	keySettings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_USERMENU_HEAD));

src/neutrino.cpp

@@ -726,6 +726,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 	strcpy(g_settings.repeat_blocker, configfile.getString("repeat_blocker", "150").c_str());
 	strcpy(g_settings.repeat_genericblocker, configfile.getString("repeat_genericblocker", "100").c_str());
+	g_settings.remote_control_neo1 = configfile.getInt32( "remote_control_neo1",  0);
 	g_settings.key_bouquet_up = configfile.getInt32( "key_bouquet_up",  CRCInput::RC_right);
 	g_settings.key_bouquet_down = configfile.getInt32( "key_bouquet_down",  CRCInput::RC_left);
 	g_settings.audiochannel_up_down_enable = configfile.getBool("audiochannel_up_down_enable", false);
@@ -1240,6 +1241,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32("channellist_foot"                 , g_settings.channellist_foot);
 	configfile.setString( "repeat_blocker", g_settings.repeat_blocker );
 	configfile.setString( "repeat_genericblocker", g_settings.repeat_genericblocker );
+	configfile.setInt32("remote_control_neo1", g_settings.remote_control_neo1);
 	configfile.setBool  ( "audiochannel_up_down_enable", g_settings.audiochannel_up_down_enable );
 
 	//screen configuration
@@ -2274,7 +2276,10 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
 					showInfo();
 				}
 			    } else
+				if (g_settings.remote_control_neo1 == 0)
 					quickZap( msg );
+				else
+					setVolume(CRCInput::RC_plus, (mode != mode_scart));
 			}
 			else if( msg == (neutrino_msg_t) g_settings.key_subchannel_down ) {
 			   if(g_RemoteControl->subChannels.size()> 0) {
@@ -2286,7 +2291,10 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
 					showInfo();
 				}
 			    } else
+				if (g_settings.remote_control_neo1 == 0)
 					quickZap( msg );
+				else
+					setVolume(CRCInput::RC_minus, (mode != mode_scart));
 			}
 			/* in case key_subchannel_up/down redefined */
 			else if( msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
@@ -3407,7 +3415,7 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
 
 	do {
 		if (msg <= CRCInput::RC_MaxRC) {
-			if (msg == CRCInput::RC_plus || msg == CRCInput::RC_right) { //FIXME
+			if (msg == CRCInput::RC_plus) {
 				if (g_settings.current_volume < 100 - g_settings.current_volume_step)
 					g_settings.current_volume += g_settings.current_volume_step;
 				else
@@ -3416,7 +3424,7 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
 					AudioMute( false, true);
 				}
 			}
-			else if (msg == CRCInput::RC_minus || msg == CRCInput::RC_left) { //FIXME
+			else if (msg == CRCInput::RC_minus) {
 				if (g_settings.current_volume > g_settings.current_volume_step)
 					g_settings.current_volume -= g_settings.current_volume_step;
 				else if ((g_settings.show_mute_icon == 1) && (g_settings.current_volume = 1))

src/system/locals.h

@@ -641,6 +641,7 @@ typedef enum
 	LOCALE_IPSETUP_HINT_1,
 	LOCALE_IPSETUP_HINT_2,
 	LOCALE_KEYBINDINGMENU_RC,
+	LOCALE_KEYBINDINGMENU_RC_NEO1,
 	LOCALE_KEYBINDINGMENU_ADDRECORD,
 	LOCALE_KEYBINDINGMENU_ADDREMIND,
 	LOCALE_KEYBINDINGMENU_ALLCHANNELS_ON_OK,

src/system/locals_intern.h

@@ -641,6 +641,7 @@ const char * locale_real_names[] =
 	"ipsetup.hint_1",
 	"ipsetup.hint_2",
 	"keybindingmenu.RC",
+	"keybindingmenu.RC_NEO1",
 	"keybindingmenu.addrecord",
 	"keybindingmenu.addremind",
 	"keybindingmenu.allchannels_on_ok",

src/system/settings.h

@@ -328,6 +328,7 @@ struct SNeutrinoSettings
 
 	char repeat_blocker[4];
 	char repeat_genericblocker[4];
+	int remote_control_neo1;
 	int audiochannel_up_down_enable;
 
 	//screen configuration