From ff3480e6370a94e9820c59bde1cd7d1c054c62a7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 6 Nov 2017 00:17:54 +0100 Subject: [PATCH] streaminfo: some mode_webradio fixes Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/5bbbfe3ec03410d0c7caca00a0cb379e05a1f371 Author: vanhofen Date: 2017-11-06 (Mon, 06 Nov 2017) Origin message was: ------------------ - streaminfo: some mode_webradio fixes --- src/gui/streaminfo2.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index 7788435d5..bb0f7b98f 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -116,7 +116,7 @@ int CStreamInfo2::exec (CMenuTarget * parent, const std::string &) if (parent) parent->hide (); - if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv) + if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio) mp = &CMoviePlayerGui::getInstance(true); else mp = &CMoviePlayerGui::getInstance(); @@ -338,8 +338,8 @@ void CStreamInfo2::paint_signal_fe_box(int _x, int _y, int w, int h) tname += ": "; if (mp) { - if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv) - tname += g_Locale->getText(LOCALE_WEBTV_HEAD); + if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio) + tname += "Web-Channel"; // TODO split into WebTV/WebRadio else tname += g_Locale->getText(LOCALE_MAINMENU_MOVIEPLAYER); } @@ -753,7 +753,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) if (mp) { //channel ypos += iheight; - if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv) { + if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio) { snprintf(buf, sizeof(buf), "%s:",g_Locale->getText (LOCALE_TIMERLIST_CHANNEL));//swiped locale g_Font[font_info]->RenderString(xpos, ypos, box_width, buf , COL_MENUCONTENT_TEXT); snprintf(buf, sizeof(buf), "%s", channel->getName().c_str());