mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 08:51:10 +02:00
drop explicit CMenuForwarder icon assignments
Conflicts: src/gui/3dsetup.cpp src/gui/bouquetlist.cpp src/gui/hdd_menu.cpp src/gui/keybind_setup.cpp src/gui/mediaplayer.cpp src/gui/mediaplayer_setup.cpp src/gui/moviebrowser.cpp src/gui/network_setup.cpp src/gui/nfs.cpp src/gui/osd_setup.cpp src/gui/osdlang_setup.cpp src/gui/parentallock_setup.cpp src/gui/personalize.cpp src/gui/proxyserver_setup.cpp src/gui/record_setup.cpp src/gui/scan_setup.cpp src/gui/screensetup.cpp src/gui/settings_manager.cpp src/gui/timerlist.cpp src/gui/update_menue.cpp src/gui/vfd_setup.cpp src/gui/videosettings.cpp src/neutrino_menue.cpp
This commit is contained in:
@@ -130,14 +130,14 @@ int CAudioSelectMenuHandler::doMenu ()
|
||||
CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_MODE,
|
||||
&g_settings.audio_AnalogMode,
|
||||
AUDIOMENU_ANALOGOUT_OPTIONS, AUDIOMENU_ANALOGOUT_OPTION_COUNT,
|
||||
true, audioSetupNotifier, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
|
||||
true, audioSetupNotifier, CRCInput::RC_red);
|
||||
|
||||
AudioSelector.addItem( oj );
|
||||
|
||||
if (!g_settings.easymenu) {
|
||||
oj = new CMenuOptionChooser(LOCALE_AUDIOMENU_ANALOG_OUT, &g_settings.analog_out,
|
||||
OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT,
|
||||
true, audioSetupNotifier, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
|
||||
true, audioSetupNotifier, CRCInput::RC_green);
|
||||
AudioSelector.addItem( oj );
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user