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>


Origin commit data
------------------
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 is contained in:
vanhofen
2017-11-20 15:19:06 +01:00
committed by Thilo Graf
parent 98ddee6f63
commit 49b29a81a9
28 changed files with 233 additions and 247 deletions

View File

@@ -129,17 +129,17 @@ void CMenuItem::disableByCondition(const menu_item_disable_cond_t& condition)
int stb_mode = CNeutrinoApp::getInstance()->getMode();
if (condition & DCOND_MODE_TS){
if (stb_mode == CNeutrinoApp::mode_ts)
if (stb_mode == NeutrinoModes::mode_ts)
if (initModeCondition(stb_mode))
return;
}
if (condition & DCOND_MODE_RADIO){
if (stb_mode == CNeutrinoApp::mode_radio)
if (stb_mode == NeutrinoModes::mode_radio)
if (initModeCondition(stb_mode))
return;
}
if (condition & DCOND_MODE_TV){
if (stb_mode == CNeutrinoApp::mode_tv)
if (stb_mode == NeutrinoModes::mode_tv)
if (initModeCondition(stb_mode))
return;
}