mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 08:21:07 +02:00
channellist/infoviewer: align calculations for "since-time" of current event
Origin commit data
------------------
Branch: ni/coolstream
Commit: 61a116a2eb
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-11 (Sun, 11 Mar 2018)
Origin message was:
------------------
- channellist/infoviewer: align calculations for "since-time" of current event
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1571,7 +1571,7 @@ void CChannelList::paintDetails(int index)
|
|||||||
char cSeit[50] = {0}; // UTF-8
|
char cSeit[50] = {0}; // UTF-8
|
||||||
|
|
||||||
struct tm *pStartZeit = localtime(&p_event->startTime);
|
struct tm *pStartZeit = localtime(&p_event->startTime);
|
||||||
unsigned seit = ( time(NULL) - p_event->startTime ) / 60;
|
unsigned seit = (time(NULL) - p_event->startTime + 30) / 60;
|
||||||
snprintf(cSeit, sizeof(cSeit), "%s %02d:%02d",(displayNext) ? g_Locale->getText(LOCALE_CHANNELLIST_START):g_Locale->getText(LOCALE_CHANNELLIST_SINCE), pStartZeit->tm_hour, pStartZeit->tm_min);
|
snprintf(cSeit, sizeof(cSeit), "%s %02d:%02d",(displayNext) ? g_Locale->getText(LOCALE_CHANNELLIST_START):g_Locale->getText(LOCALE_CHANNELLIST_SINCE), pStartZeit->tm_hour, pStartZeit->tm_min);
|
||||||
if (displayNext) {
|
if (displayNext) {
|
||||||
snprintf(cNoch, sizeof(cNoch), "(%d %s)", p_event->duration / 60, unit_short_minute);
|
snprintf(cNoch, sizeof(cNoch), "(%d %s)", p_event->duration / 60, unit_short_minute);
|
||||||
|
@@ -1969,7 +1969,7 @@ void CInfoViewer::show_Data (bool calledFromEvent)
|
|||||||
const char *unit_short_minute = g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE);
|
const char *unit_short_minute = g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE);
|
||||||
|
|
||||||
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;
|
unsigned seit = (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;
|
||||||
runningPercent = 0;
|
runningPercent = 0;
|
||||||
if (!timeset)
|
if (!timeset)
|
||||||
|
Reference in New Issue
Block a user