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

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-25 11:41:44 +02:00
parent cd18fa9ca0 8869126425
commit b6954dec34
15 changed files with 55 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/eitd/xmlutil.cpp
View File

@@ -486,12 +486,12 @@ void *insertEventsfromFile(void * data)
std::string epg_dir = (char *) data;
indexname = epg_dir + "index.xml";
time_t now = time_monotonic_ms();
int64_t now = time_monotonic_ms();
xmlDocPtr index_parser = parseXmlFile(indexname.c_str());
if (index_parser == NULL) {
readEventsFromDir(epg_dir, ev_count);
printf("[sectionsd] Reading Information finished after %ld milliseconds (%d events)\n",
printf("[sectionsd] Reading Information finished after %" PRId64 " milliseconds (%d events)\n",
time_monotonic_ms()-now, ev_count);
reader_ready = true;
pthread_exit(NULL);
@@ -515,7 +515,7 @@ void *insertEventsfromFile(void * data)
xmlFreeDoc(index_parser);
printdate_ms(stdout);
printf("[sectionsd] Reading Information finished after %ld milliseconds (%d events)\n",
printf("[sectionsd] Reading Information finished after %" PRId64 " milliseconds (%d events)\n",
time_monotonic_ms()-now, ev_count);
reader_ready = true;