infobar timout: add member to get current timeout modes

Avoids  multiple code in some source files.
This commit is contained in:
2018-04-10 10:25:24 +02:00
parent 557805bc40
commit f9b4aeef8c
4 changed files with 15 additions and 19 deletions

View File

@@ -1410,11 +1410,7 @@ int CChannelList::numericZap(int key)
CZapitChannel* chan = getChannel(chn);
if (doZap) {
int mode = CNeutrinoApp::getInstance()->getMode();
if (
((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::HANDLING_INFOBAR] == 0) ||
((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::HANDLING_INFOBAR_RADIO] == 0)
)
if (!g_InfoViewer->hasTimeout())
g_InfoViewer->killTitle();
if(chan && SameTP(chan)) {
@@ -1536,11 +1532,7 @@ void CChannelList::virtual_zap_mode(bool up)
g_InfoViewer->resetSwitchMode(); //disable virtual_zap_mode
if (doZap) {
int mode = CNeutrinoApp::getInstance()->getMode();
if (
((mode == NeutrinoModes::mode_tv || mode == NeutrinoModes::mode_webtv) && g_settings.timing[SNeutrinoSettings::HANDLING_INFOBAR] == 0) ||
((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio) && g_settings.timing[SNeutrinoSettings::HANDLING_INFOBAR_RADIO] == 0)
)
if (!g_InfoViewer->hasTimeout())
g_InfoViewer->killTitle();
if(channel && SameTP(channel))