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

neutrino: unify modes handling; ...

Browse Source 
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes
This commit is contained in:
vanhofen
2017-11-20 15:19:06 +01:00
parent dff79725de
commit 8729b26638
28 changed files with 233 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/streaminfo2.cpp
View File

@@ -354,7 +354,7 @@ int CStreamInfo2::exec (CMenuTarget * parent, const std::string &)
if (parent)
parent->hide ();
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio)
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio)
mp = &CMoviePlayerGui::getInstance(true);
else
mp = &CMoviePlayerGui::getInstance();
@@ -579,7 +579,7 @@ void CStreamInfo2::paint_signal_fe_box(int _x, int _y, int w, int h)
tname += ": ";
if (mp)
{
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio)
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio)
tname += "Web-Channel"; // TODO split into WebTV/WebRadio
else
tname += g_Locale->getText(LOCALE_MAINMENU_MOVIEPLAYER);
@@ -826,7 +826,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
if (mp)
{
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio)
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio)
{
// channel
r.key = g_Locale->getText (LOCALE_TIMERLIST_CHANNEL);
@@ -929,7 +929,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
}
}
if (((mp && IS_WEBCHAN(channel->getChannelID()) && CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv) || channel->getVideoPid()) && !(videoDecoder->getBlank()))
if (((mp && IS_WEBCHAN(channel->getChannelID()) && CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv) || channel->getVideoPid()) && !(videoDecoder->getBlank()))
{
videoDecoder->getPictureInfo(xres, yres, framerate);
if (yres == 1088)
@@ -1065,7 +1065,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
v.push_back(r);
// picon
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio)
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio)
{
r.key = "Picon";
r.key += ": ";