mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix streaminfo menu handler (patch by snafed)

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 99894a26d1
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-09-12 (Mon, 12 Sep 2011)

Origin message was:
------------------
- fix streaminfo menu handler (patch by snafed)

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


------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2011-09-12 16:04:49 +00:00
parent d24741104a
commit 0f627b9e56
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/info_menue.cpp
View File

@@ -79,7 +79,7 @@ void CInfoMenu::showMenu()
info->addIntroItems(); info->addIntroItems();
info->addItem(new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, new CImageInfo(), NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED ), false); info->addItem(new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, new CImageInfo(), NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED ), false);
info->addItem(new CMenuForwarder(LOCALE_EXTRA_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); info->addItem(new CMenuForwarder(LOCALE_EXTRA_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
info->addItem(new CMenuForwarder(LOCALE_STREAMINFO_HEAD, true, NULL, new CStreamInfo2Handler(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); info->addItem(new CMenuForwarder(LOCALE_STREAMINFO_HEAD, true, NULL, new CStreamInfo2(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
info->exec(NULL, ""); info->exec(NULL, "");
info->hide(); info->hide();

6
src/gui/streaminfo2.cpp
View File

@@ -109,13 +109,11 @@ CStreamInfo2::~CStreamInfo2 ()
ts_close(); ts_close();
} }
int CStreamInfo2::exec() void CStreamInfo2::exec()
{ {
paint(paint_mode); paint(paint_mode);
doSignalStrengthLoop(); doSignalStrengthLoop();
hide(); hide();
return menu_return::RETURN_EXIT_ALL;
} }
int CStreamInfo2::exec (CMenuTarget * parent, const std::string &) int CStreamInfo2::exec (CMenuTarget * parent, const std::string &)
@@ -127,7 +125,7 @@ int CStreamInfo2::exec (CMenuTarget * parent, const std::string &)
paint (paint_mode); paint (paint_mode);
doSignalStrengthLoop (); doSignalStrengthLoop ();
hide (); hide ();
return menu_return::RETURN_EXIT_ALL; return menu_return::RETURN_REPAINT;
} }
int CStreamInfo2::doSignalStrengthLoop () int CStreamInfo2::doSignalStrengthLoop ()

2
src/gui/streaminfo2.h
View File

@@ -103,7 +103,7 @@ class CStreamInfo2 : public CMenuTarget
CStreamInfo2(); CStreamInfo2();
~CStreamInfo2(); ~CStreamInfo2();
int exec(); void exec();
void hide(); void hide();
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);