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 'ni/mp' into ni/cst-next

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 8f2cbeb841 73da438ec4
commit af8fe3ebc6
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/timerd/Makefile.am
View File

@@ -1,6 +1,7 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
AM_CPPFLAGS += \
@HWLIB_CFLAGS@ \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \

8
src/timerd/timerd.cpp
View File

@@ -486,12 +486,16 @@ int timerd_main_thread(void *data)
CBasicServer timerd_server;
if (!timerd_server.prepare(TIMERD_UDS_NAME))
if (!timerd_server.prepare(TIMERD_UDS_NAME)) {
*(long *)data = -2; /* signal neutrino that waiting is pointless */
return -1;
}
// Start timer thread
CTimerManager::getInstance();
CTimerManager::getInstance()->wakeup =(bool)data;
CTimerManager::getInstance()->wakeup = !!(*(long *)data);
*(long *)data = -1; /* signal we're up and running */
timerd_server.run(timerd_parse_command, CTimerdMsg::ACTVERSION);
printf("timerd shutdown complete\n");