From 1c35d9f29f06f0ed0d04e59eb29cfa495901d28c Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 28 Dec 2011 00:19:58 +0000 Subject: [PATCH] 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: https://github.com/neutrino-images/ni-neutrino/commit/5db249b19250c27e078a2be0dd6129d871aa939e Author: Thilo Graf 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 --- src/gui/cec_setup.cpp | 8 +++++--- src/gui/cec_setup.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/cec_setup.cpp b/src/gui/cec_setup.cpp index 923fa4a9d..c716842fb 100644 --- a/src/gui/cec_setup.cpp +++ b/src/gui/cec_setup.cpp @@ -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() diff --git a/src/gui/cec_setup.h b/src/gui/cec_setup.h index d65929126..168dc9d47 100644 --- a/src/gui/cec_setup.h +++ b/src/gui/cec_setup.h @@ -40,7 +40,7 @@ class CCECSetup : public CMenuTarget, CChangeObserver int width; - void showMenu(); + int showMenu(); public: