- multiformat audioplayer: add separate timeout for infobar

Conflicts:
	src/gui/infoviewer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-10-28 19:13:46 +02:00
committed by Thilo Graf
parent c7d863a809
commit 21f6ec5944
8 changed files with 28 additions and 17 deletions

View File

@@ -925,7 +925,10 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext)
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext);
break;
case NeutrinoModes::mode_ts:
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MOVIE] + timeout_ext);
if (CMoviePlayerGui::getInstance().IsAudioPlayer())
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: