neutrino: leave cec setup with menu key

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db249b192
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-12-28 (Wed, 28 Dec 2011)

Origin message was:
------------------
*neutrino: leave cec setup with menu key

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


------------------
This commit was generated by Migit
This commit is contained in:
2011-12-28 00:19:58 +00:00
parent 436dbbc483
commit 1c35d9f29f
2 changed files with 6 additions and 4 deletions

View File

@@ -67,7 +67,7 @@ int CCECSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
if (parent)
parent->hide();
showMenu();
res = showMenu();
return res;
}
@@ -81,7 +81,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_MODE_OPTIONS[VIDEOMENU_HDMI_
{ VIDEO_HDMI_CEC_MODE_RECORDER , LOCALE_VIDEOMENU_HDMI_CEC_MODE_RECORDER },
};
void CCECSetup::showMenu()
int CCECSetup::showMenu()
{
//menue init
CMenuWidget *cec = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_CEC);
@@ -98,9 +98,11 @@ void CCECSetup::showMenu()
cec->addItem(cec1);
cec->addItem(cec2);
cec->exec(NULL, "");
int res = cec->exec(NULL, "");
cec->hide();
delete cec;
return res;
}
void CCECSetup::setCECSettings()

View File

@@ -40,7 +40,7 @@ class CCECSetup : public CMenuTarget, CChangeObserver
int width;
void showMenu();
int showMenu();
public: