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

4
lib/libdvbsub/dvbsub.cpp
View File

@@ -15,6 +15,7 @@
#include "PacketQueue.hpp"
#include "helpers.hpp"
#include "dvbsubtitle.h"
#include <system/set_threadname.h>
#define Log2File printf
#define RECVBUFFER_STEPSIZE 1024
@@ -244,6 +245,7 @@ static void* reader_thread(void * /*arg*/)
uint16_t packlen;
uint8_t* buf;
bool bad_startcode = false;
set_threadname("dvbsub:reader");
dmx = new cDemux(0);
#if HAVE_TRIPLEDRAGON
@@ -347,7 +349,7 @@ static void* dvbsub_thread(void* /*arg*/)
{
struct timespec restartWait;
struct timeval now;
set_threadname("dvbsub:main");
sub_debug.print(Debug::VERBOSE, "%s started\n", __FUNCTION__);
if (!dvbSubtitleConverter)
dvbSubtitleConverter = new cDvbSubtitleConverter;

2
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -22,6 +22,7 @@
#include <video.h>
#include <sys/stat.h>
#include <global.h>
#include <system/set_threadname.h>
/* same as in rcinput.h... */
#define KEY_TTTV KEY_FN_1
@@ -1545,6 +1546,7 @@ static void cleanup_fb_pan()
static void* reader_thread(void * /*arg*/)
{
printf("TuxTxt subtitle thread started\n");
set_threadname("tuxtxt:reader");
reader_running = 1;
//ttx_paused = 0;
while(reader_running) {

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);

2
lib/sectionsdclient/sectionsdMsg.h
View File

@@ -92,7 +92,6 @@ struct sectionsd
struct commandSetConfig
{
int scanMode;
int epg_cache;
int epg_old_events;
unsigned int epg_max_events;
@@ -327,7 +326,6 @@ struct sectionsd
//
// setConfig
// data of request:
// int scanMode; -> updating of services and bouquets -> saved in auto_scanning
// int epg_cache; -> in days -> saved in secondsToCache
// int epg_old_events; -> in hours -> saved in oldEventsAre
// unsigned int epg_max_events; -> #of saved events -> saved in max_events

1
lib/sectionsdclient/sectionsdclient.cpp
View File

@@ -208,7 +208,6 @@ void CSectionsdClient::setConfig(const epg_config config)
char* pData = new char[sizeof(sectionsd::commandSetConfig) + config.network_ntpserver.length() + 1 + config.epg_dir.length() + 1];
msg = (sectionsd::commandSetConfig *)pData;
msg->scanMode = config.scanMode;
msg->epg_cache = config.epg_cache;
msg->epg_old_events = config.epg_old_events;
msg->epg_max_events = config.epg_max_events;

1
lib/sectionsdclient/sectionsdclient.h
View File

@@ -163,7 +163,6 @@ class CSectionsdClient : private CBasicClient
typedef struct
{
int scanMode;
int epg_cache;
int epg_old_events;
int epg_max_events;