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

neutrino: revert changes for streaminfo

Browse Source 
sorry, merge error in r1693

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: db5065a357
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-09-17 (Sat, 17 Sep 2011)

Origin message was:
------------------
*neutrino: revert changes for streaminfo

sorry, merge error in r1693

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


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2011-09-17 19:45:23 +00:00
parent 253ce3145b
commit dc30a8e7e9
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);