mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-08 22:28:28 +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

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0fc3e793a4
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

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-20 15:19:06 +01:00
committed by Thilo Graf
parent 856057de6b
commit eeb21f6510
28 changed files with 233 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/user_menue.cpp
View File

@@ -184,8 +184,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
else
menu->addItem(GenericMenuSeparator);
bool _mode_ts = CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_ts;
bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv) &&
bool _mode_ts = CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_ts;
bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv) &&
(!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty());
bool adzap_active = CAdZapMenu::getInstance()->isActive();
@@ -567,7 +567,7 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
case SNeutrinoSettings::ITEM_NONE:
case SNeutrinoSettings::ITEM_BAR:
case SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION:
if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
if (mode == NeutrinoModes::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
if(loc == NONEXISTANT_LOCALE && !text) {
CWebTVResolution webtvres;
std::string tmp = webtvres.getResolutionValue();
@@ -617,7 +617,7 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
continue;
case SNeutrinoSettings::ITEM_AUDIO_SELECT:
if(loc == NONEXISTANT_LOCALE && !text) {
if (mode == NeutrinoMessages::mode_webtv)
if (mode == NeutrinoModes::mode_webtv)
text = CMoviePlayerGui::getInstance(true).CurrentAudioName().c_str(); // use instance_bg
else if (!g_RemoteControl->current_PIDs.APIDs.empty())
text = g_RemoteControl->current_PIDs.APIDs[
@@ -628,7 +628,7 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
continue;
#if 0
case SNeutrinoSettings::ITEM_RASS:
if (!(CNeutrinoApp::getInstance()->getMode() == CNeutrinoApp::mode_radio && g_Radiotext && g_Radiotext->haveRASS()))
if (!(CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_radio && g_Radiotext && g_Radiotext->haveRASS()))
continue;
#endif
default: