From f3edaf12bc95c752b6fb8766a987c29242004f21 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 19 Jul 2021 17:26:59 +0200 Subject: [PATCH] - infoviewer: simplify setInfobarTimeout() Signed-off-by: Thilo Graf --- src/gui/infoviewer.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 9815c3cfa..c8e68112f 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -927,35 +927,22 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext) case NeutrinoModes::mode_radio: case NeutrinoModes::mode_webradio: timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_RADIO]; - if (timeout < 0) - timeout = 0; - timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext); break; case NeutrinoModes::mode_ts: if (CMoviePlayerGui::getInstance().IsAudioPlaying()) - { timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_MEDIA_AUDIO]; - if (timeout < 0) - timeout = 0; - timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext); - } else - { timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_MEDIA_VIDEO]; - if (timeout < 0) - timeout = 0; - timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext); - } break; case NeutrinoModes::mode_tv: case NeutrinoModes::mode_webtv: default: timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR]; - if (timeout < 0) - timeout = 0; - timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext); break; } + if (timeout < 0) + timeout = 0; + timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext); } bool CInfoViewer::showLivestreamInfo()