From 66b82eea083e67ce20534066284e3b34ef73600e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 9 Jan 2018 11:14:08 +0100 Subject: [PATCH] infoviewer: fix indentation in setInfobarTimeout() Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/effdf5b10b1c1c64576971f793bf97a402f091f3 Author: vanhofen Date: 2018-01-09 (Tue, 09 Jan 2018) Origin message was: ------------------ - infoviewer: fix indentation in setInfobarTimeout() --- src/gui/infoviewer.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index c27835bd5..33150e3f9 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -947,6 +947,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap aspectRatio = 0; fileplay = 0; } + void CInfoViewer::setInfobarTimeout(int timeout_ext) { int mode = CNeutrinoApp::getInstance()->getMode(); @@ -955,19 +956,19 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext) { case NeutrinoModes::mode_radio: case NeutrinoModes::mode_webradio: - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext); - break; + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext); + break; case NeutrinoModes::mode_ts: - if (CMoviePlayerGui::getInstance().IsAudioPlaying()) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_AUDIO] + timeout_ext); - else - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_VIDEO] + timeout_ext); - break; + if (CMoviePlayerGui::getInstance().IsAudioPlaying()) + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_AUDIO] + timeout_ext); + else + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MEDIA_VIDEO] + timeout_ext); + break; case NeutrinoModes::mode_tv: case NeutrinoModes::mode_webtv: default: - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + timeout_ext); - break; + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + timeout_ext); + break; } }