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

Merge branch 'check/next-cc'

Browse Source 
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-11-10 16:55:53 +01:00
parent c47d8a8f9d b08d6cf967
commit b0077cafc5
114 changed files with 7292 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -810,11 +810,14 @@ std::string CControlAPI::_GetBouquetActualEPGItem(CyhookHandler *hh, CZapitChann
firstEPG += hh->outPair("timeElapsed", string_printf("%d", (time(NULL) - event->startTime) / 60), true);
firstEPG += hh->outPair("timeTotal", string_printf("%d", event->duration / 60), true);
firstEPG += hh->outPair("percentage", string_printf("%d", percentage), false);
firstEPG += hh->outPair("eventid", string_printf("%llu", currentNextInfo.current_uniqueKey), true);
if (currentNextInfo.flags & CSectionsdClient::epgflags::has_next) {
timestr = timeString(currentNextInfo.next_zeit.startzeit);
secondEPG += hh->outPair("startTime", timestr, true);
secondEPG += hh->outPair("description", hh->outValue(currentNextInfo.next_name), false);
secondEPG += hh->outPair("timeTotal", string_printf("%d", currentNextInfo.next_zeit.dauer / 60), true);
secondEPG += hh->outPair("eventid", string_printf("%llu", currentNextInfo.next_uniqueKey), true);
}
}