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

infoviewer: only show remaining time if time is set

Browse Source 
taken from martiis-neutrino-mp; based on code by seife;
contains an addition to ab42e7f032
This commit is contained in:
svenhoefer
2014-05-07 09:20:39 +02:00
parent ff06822dd0
commit 9d25727660
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/infoviewer.cpp
View File

@@ -254,7 +254,7 @@ void CInfoViewer::paintTime (bool show_dot)
if (!gotTime) if (!gotTime)
gotTime = timeset; gotTime = timeset;
if (! gotTime) if (!gotTime)
return; return;
int clock_x = BoxEndX - time_width - LEFT_OFFSET; int clock_x = BoxEndX - time_width - LEFT_OFFSET;
@@ -465,7 +465,7 @@ void CInfoViewer::show_current_next(bool new_chan, int epgpos)
if (!(info_CurrentNext.flags & (CSectionsdClient::epgflags::has_later | CSectionsdClient::epgflags::has_current | CSectionsdClient::epgflags::not_broadcast))) { if (!(info_CurrentNext.flags & (CSectionsdClient::epgflags::has_later | CSectionsdClient::epgflags::has_current | CSectionsdClient::epgflags::not_broadcast))) {
neutrino_locale_t loc; neutrino_locale_t loc;
if (! gotTime) if (!gotTime)
loc = LOCALE_INFOVIEWER_WAITTIME; loc = LOCALE_INFOVIEWER_WAITTIME;
else if (showButtonBar) else if (showButtonBar)
loc = LOCALE_INFOVIEWER_EPGWAIT; loc = LOCALE_INFOVIEWER_EPGWAIT;
@@ -1672,10 +1672,12 @@ void CInfoViewer::show_Data (bool calledFromEvent)
if (info_CurrentNext.flags & CSectionsdClient::epgflags::has_current) { if (info_CurrentNext.flags & CSectionsdClient::epgflags::has_current) {
int seit = (abs(jetzt - info_CurrentNext.current_zeit.startzeit) + 30) / 60; int seit = (abs(jetzt - info_CurrentNext.current_zeit.startzeit) + 30) / 60;
int rest = (info_CurrentNext.current_zeit.dauer / 60) - seit; int rest = (info_CurrentNext.current_zeit.dauer / 60) - seit;
if (jetzt < info_CurrentNext.current_zeit.startzeit) { runningPercent = 0;
runningPercent = 0; if (!gotTime)
snprintf (runningRest, sizeof(runningRest), "%s %d %s", g_Locale->getText(LOCALE_WORD_IN), seit, unit_short_minute); snprintf(runningRest, sizeof(runningRest), "%d %s", info_CurrentNext.current_zeit.dauer / 60, unit_short_minute);
} else { else if (jetzt < info_CurrentNext.current_zeit.startzeit)
snprintf(runningRest, sizeof(runningRest), "%s %d %s", g_Locale->getText(LOCALE_WORD_IN), seit, unit_short_minute);
else {
runningPercent = (jetzt - info_CurrentNext.current_zeit.startzeit) * 100 / info_CurrentNext.current_zeit.dauer; runningPercent = (jetzt - info_CurrentNext.current_zeit.startzeit) * 100 / info_CurrentNext.current_zeit.dauer;
if (runningPercent > 100) if (runningPercent > 100)
runningPercent = 100; runningPercent = 100;