From dc30a8e7e95e3d242cf4f9625b5e48d3aac7dd4d Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 17 Sep 2011 19:45:23 +0000 Subject: [PATCH] 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 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/db5065a3574b30fe017de9228b3321aaa5675a28 Author: Thilo Graf 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 --- src/gui/streaminfo2.cpp | 14 ++++++-------- src/gui/streaminfo2.h | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index ba0b79c58..55e733494 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -109,13 +109,11 @@ CStreamInfo2::~CStreamInfo2 () ts_close(); } -int CStreamInfo2::exec() +void CStreamInfo2::exec() { paint(paint_mode); doSignalStrengthLoop(); hide(); - - return menu_return::RETURN_EXIT_ALL; } int CStreamInfo2::exec (CMenuTarget * parent, const std::string &) @@ -127,7 +125,7 @@ int CStreamInfo2::exec (CMenuTarget * parent, const std::string &) paint (paint_mode); doSignalStrengthLoop (); hide (); - return menu_return::RETURN_EXIT_ALL; + return menu_return::RETURN_REPAINT; } int CStreamInfo2::doSignalStrengthLoop () @@ -199,7 +197,7 @@ int CStreamInfo2::doSignalStrengthLoop () if(snrscale && sigscale) showSNR (); if(pmt_version != current_pmt_version && delay_counter > delay){ - current_pmt_version = pmt_version; + current_pmt_version = pmt_version; paint_techinfo (x + 10, y+ hheight +5); } delay_counter++; @@ -282,7 +280,7 @@ void CStreamInfo2::paint_signal_fe_box(int _x, int _y, int w, int h) int y1; int xd = w/4; std::string tuner_name = g_Locale->getText(LOCALE_STREAMINFO_SIGNAL); - tuner_name += ": "; + tuner_name += ": "; tuner_name += CFrontend::getInstance()->getInfo()->name; g_Font[font_small]->RenderString(_x, _y+iheight+15, width-10, tuner_name.c_str(), COL_INFOBAR, 0, true); @@ -891,7 +889,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) } } int spaceoffset = 0 ; - + for(i=0 ; i<11; i++){ if(caids[i] == true) if(spaceoffset < array[i]) @@ -971,7 +969,7 @@ int CStreamInfo2::ts_setup () vpid = g_RemoteControl->current_PIDs.PIDs.vpid; if(g_RemoteControl->current_PIDs.APIDs.size() > 0) apid = g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid; - + if(vpid == 0 && apid == 0) return -1; diff --git a/src/gui/streaminfo2.h b/src/gui/streaminfo2.h index a6d40a334..21cafc63e 100644 --- a/src/gui/streaminfo2.h +++ b/src/gui/streaminfo2.h @@ -103,7 +103,7 @@ class CStreamInfo2 : public CMenuTarget CStreamInfo2(); ~CStreamInfo2(); - int exec(); + void exec(); void hide(); int exec(CMenuTarget* parent, const std::string & actionKey);