mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11: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
------------------
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
This commit is contained in:
vanhofen
2017-09-25 11:41:44 +02:00
parent 0d9a80486a 05d2a7b8b1
commit 3b0222d2d5
15 changed files with 55 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neutrino.cpp
View File

@@ -2246,10 +2246,10 @@ void CNeutrinoApp::InitSectiondClient()
#if 0
/* TODO: check if still needed */
/* wait for sectionsd to be able to process our registration */
time_t t = time_monotonic_ms();
int64_t t = time_monotonic_ms();
while (! sectionsd_isReady())
sleep(0);
dprintf(DEBUG_NORMAL, "had to wait %ld ms for sectionsd to start up\n", time_monotonic_ms() - t);
dprintf(DEBUG_NORMAL, "had to wait %" PRId64 " ms for sectionsd to start up\n", time_monotonic_ms() - t);
#endif
g_Sectionsd = new CSectionsdClient;
struct timespec t;
@@ -2520,10 +2520,10 @@ TIMER_START();
InitSectiondClient();
/* wait until timerd is ready... */
time_t timerd_wait = time_monotonic_ms();
int64_t timerd_wait = time_monotonic_ms();
while (timerd_signal >= 0)
usleep(100);
dprintf(DEBUG_NORMAL, "had to wait %ld ms for timerd start...\n", time_monotonic_ms() - timerd_wait);
dprintf(DEBUG_NORMAL, "had to wait %" PRId64 " ms for timerd start...\n", time_monotonic_ms() - timerd_wait);
InitTimerdClient();
// volume