mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

infoviewer: simplify setInfobarTimeout()

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89ba2b9636
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-07-19 (Mon, 19 Jul 2021)

Origin message was:
------------------
- infoviewer: simplify setInfobarTimeout()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-07-19 17:26:59 +02:00
parent 69394b1fa6
commit cf6c4a8cc1
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/infoviewer.cpp
View File

@@ -966,35 +966,22 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext)
case NeutrinoModes::mode_radio: case NeutrinoModes::mode_radio:
case NeutrinoModes::mode_webradio: case NeutrinoModes::mode_webradio:
timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_RADIO]; timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_RADIO];
if (timeout < 0)
timeout = 0;
timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext);
break; break;
case NeutrinoModes::mode_ts: case NeutrinoModes::mode_ts:
if (CMoviePlayerGui::getInstance().IsAudioPlaying()) if (CMoviePlayerGui::getInstance().IsAudioPlaying())
{
timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_MEDIA_AUDIO]; timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_MEDIA_AUDIO];
if (timeout < 0)
timeout = 0;
timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext);
}
else else
{
timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_MEDIA_VIDEO]; timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR_MEDIA_VIDEO];
if (timeout < 0)
timeout = 0;
timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext);
}
break; break;
case NeutrinoModes::mode_tv: case NeutrinoModes::mode_tv:
case NeutrinoModes::mode_webtv: case NeutrinoModes::mode_webtv:
default: default:
timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR]; timeout = g_settings.handling_infobar[SNeutrinoSettings::HANDLING_INFOBAR];
break;
}
if (timeout < 0) if (timeout < 0)
timeout = 0; timeout = 0;
timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext); timeoutEnd = CRCInput::calcTimeoutEnd(timeout + timeout_ext);
break;
}
} }
bool CInfoViewer::showLivestreamInfo() bool CInfoViewer::showLivestreamInfo()