From 09edd8f36f61c092c0a68eba61d3f34b38f03746 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 31 Mar 2014 13:53:21 +0400 Subject: [PATCH] gui/audio_select.cpp: disable analog audio on/off for easy menu mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8bd433aee03238421fa38f466ebd3b85f33d97fb Author: [CST] Focus Date: 2014-03-31 (Mon, 31 Mar 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/audio_select.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp index 5ec7c5fd7..57109bc03 100644 --- a/src/gui/audio_select.cpp +++ b/src/gui/audio_select.cpp @@ -128,11 +128,12 @@ int CAudioSelectMenuHandler::doMenu () AudioSelector.addItem( oj ); - 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); - - 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); + AudioSelector.addItem( oj ); + } CChannelList *channelList = CNeutrinoApp::getInstance ()->channelList; int curnum = channelList->getActiveChannelNumber();