stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'status_xml_epg' of https://github.com/jdembski/tvheadend into jdembski-status_xml_epg

Browse source
This commit is contained in:
Andreas Öman 2011-03-21 22:29:47 +01:00
commit 1dd7dd9018
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/webui/simpleui.c
View file

@ -383,7 +383,7 @@ page_status(http_connection_t *hc,
if (DVR_SCHEDULED == de->de_sched_state)
{
timelefttemp = (int) (de->de_start - now) / 60; // output minutes
timelefttemp = (int) ((de->de_start - now) / 60) - de->de_start_extra; // output minutes
if (timelefttemp < timeleft)
timeleft = timelefttemp;
}
@ -398,19 +398,23 @@ page_status(http_connection_t *hc,
"<date>%02d/%02d/%02d</date>"
"<time>%02d:%02d</time>"
"<unixtime>%d</unixtime>"
"<extra_start>%d</extra_start>"
"</start>"
"<stop>"
"<date>%02d/%02d/%02d</date>"
"<time>%02d:%02d</time>"
"<unixtime>%d</unixtime>"
"<extra_stop>%d</extra_stop>"
"</stop>"
"<title>%s</title>",
a.tm_year + 1900, a.tm_mon, a.tm_mday,
a.tm_hour, a.tm_min,
de->de_start,
de->de_start_extra,
b.tm_year+1900, b.tm_mon, b.tm_mday,
b.tm_hour, b.tm_min,
de->de_stop,
de->de_stop_extra,
de->de_title);
rstatus = val2str(de->de_sched_state, recstatustxt);