mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

- infoviewer: fix indentation in setInfobarTimeout()

Browse Source 
Conflicts:
	src/gui/infoviewer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-01-09 11:14:08 +01:00
committed by Thilo Graf
parent 671949d8f3
commit 87aeec938f
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/infoviewer.cpp
View File

@@ -914,6 +914,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
aspectRatio = 0; aspectRatio = 0;
fileplay = 0; fileplay = 0;
} }
void CInfoViewer::setInfobarTimeout(int timeout_ext) void CInfoViewer::setInfobarTimeout(int timeout_ext)
{ {
int mode = CNeutrinoApp::getInstance()->getMode(); int mode = CNeutrinoApp::getInstance()->getMode();
@@ -922,19 +923,19 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext)
{ {
case NeutrinoModes::mode_radio: case NeutrinoModes::mode_radio:
case NeutrinoModes::mode_webradio: case NeutrinoModes::mode_webradio:
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext);
break; break;
case NeutrinoModes::mode_ts: case NeutrinoModes::mode_ts:
if (CMoviePlayerGui::getInstance().IsAudioPlaying()) if (CMoviePlayerGui::getInstance().IsAudioPlaying())
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_AUDIO] + timeout_ext); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_AUDIO] + timeout_ext);
else else
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_VIDEO] + timeout_ext); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_VIDEO] + timeout_ext);
break; break;
case NeutrinoModes::mode_tv: case NeutrinoModes::mode_tv:
case NeutrinoModes::mode_webtv: case NeutrinoModes::mode_webtv:
default: default:
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + timeout_ext); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + timeout_ext);
break; break;
} }
} }