mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +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

10
src/eitd/sectionsd.cpp
View File

@@ -154,7 +154,7 @@ CSdtThread threadSDT;
#endif
#ifdef DEBUG_EVENT_LOCK
static time_t lockstart = 0;
static int64_t lockstart = 0;
#endif
static int sectionsd_stop = 0;
@@ -209,9 +209,9 @@ inline void unlockEvents(void)
{
#ifdef DEBUG_EVENT_LOCK
if (lockstart) {
time_t tmp = time_monotonic_ms() - lockstart;
int64_t tmp = time_monotonic_ms() - lockstart;
if (tmp > 50)
xprintf("locked ms %d\n", tmp);
xprintf("locked ms %" PRId64 "\n", tmp);
lockstart = 0;
}
#endif
@@ -1488,12 +1488,12 @@ void CTimeThread::run()
* shutdown" hack on with libcoolstream... :-( */
rc = dmx->Read(static_buf, MAX_SECTION_LENGTH, timeoutInMSeconds);
#else
time_t start = time_monotonic_ms();
int64_t start = time_monotonic_ms();
/* speed up shutdown by looping around Read() */
do {
rc = dmx->Read(static_buf, MAX_SECTION_LENGTH, timeoutInMSeconds / 12);
} while (running && rc == 0
&& (time_monotonic_ms() - start) < (time_t)timeoutInMSeconds);
&& (time_monotonic_ms() - start) < (int64_t)timeoutInMSeconds);
#endif
xprintf("%s: get DVB time ch 0x%012" PRIx64 " rc: %d neutrino_sets_time %d\n",
name.c_str(), current_service, rc, messaging_neutrino_sets_time);