mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +02:00
Return menu result, to close all menus
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1874 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -74,7 +74,7 @@ int CAudioSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
|
|||||||
parent->hide();
|
parent->hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
showAudioSetup();
|
res = showAudioSetup();
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@@ -111,7 +111,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_AVSYNC_OPTIONS[AUDIOMENU_AVSYNC_OPTIO
|
|||||||
// };
|
// };
|
||||||
|
|
||||||
/* audio settings menu */
|
/* audio settings menu */
|
||||||
void CAudioSetup::showAudioSetup()
|
int CAudioSetup::showAudioSetup()
|
||||||
{
|
{
|
||||||
//menue init
|
//menue init
|
||||||
CMenuWidget* audioSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
|
CMenuWidget* audioSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
|
||||||
@@ -182,10 +182,11 @@ void CAudioSetup::showAudioSetup()
|
|||||||
audioSettings->addItem(mf);
|
audioSettings->addItem(mf);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
audioSettings->exec(NULL, "");
|
int res = audioSettings->exec(NULL, "");
|
||||||
audioSettings->hide();
|
audioSettings->hide();
|
||||||
selected = audioSettings->getSelected();
|
selected = audioSettings->getSelected();
|
||||||
delete audioSettings;
|
delete audioSettings;
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
//sets menu mode to "wizard" or "default"
|
//sets menu mode to "wizard" or "default"
|
||||||
|
@@ -41,7 +41,7 @@ class CAudioSetup : public CMenuTarget
|
|||||||
int width, selected;
|
int width, selected;
|
||||||
bool is_wizard;
|
bool is_wizard;
|
||||||
|
|
||||||
void showAudioSetup();
|
int showAudioSetup();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum AUDIO_SETUP_MODE
|
enum AUDIO_SETUP_MODE
|
||||||
|
Reference in New Issue
Block a user