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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 23:04:09 +01:00
parent 8a8036b8b8 6e85f1b0ca
commit ff7b7dfde7
35 changed files with 111 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libtuxtxt/tuxtxt_common.h
View File

@@ -14,6 +14,7 @@
#endif
#include <zapit/include/dmx.h>
#include <system/set_threadname.h>
tuxtxt_cache_struct tuxtxt_cache;
static pthread_mutex_t tuxtxt_cache_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -593,6 +594,7 @@ void *tuxtxt_CacheThread(void * /*arg*/)
unsigned char pagedata[9][23*40];
tstPageinfo *pageinfo_thread;
set_threadname("tuxtxt:cache");
printf("TuxTxt running thread...(%04x)\n",tuxtxt_cache.vtxtpid);
tuxtxt_cache.receiving = 1;
nice(3);