Merge remote-tracking branch 'tuxbox/master'

needs buildfixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 514cb3ed1e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-09-23 17:01:42 +02:00
167 changed files with 51814 additions and 2779 deletions

View File

@@ -1434,8 +1434,8 @@ void CTimeThread::run()
time_t dvb_time = 0;
bool retry = false; /* if time seems fishy, set to true and try again */
xprintf("%s::run:: starting, pid %d (%lu)\n", name.c_str(), getpid(), pthread_self());
const char *tn = ("sd:" + name).c_str();
set_threadname(tn);
const std::string tn = ("sd:" + name).c_str();
set_threadname(tn.c_str());
addFilters();
DMX::start();
@@ -1571,8 +1571,8 @@ int CSectionThread::Sleep()
void CSectionThread::run()
{
xprintf("%s::run:: starting, pid %d (%lu)\n", name.c_str(), getpid(), pthread_self());
const char *tn = ("sd:" + name).c_str();
set_threadname(tn);
const std::string tn = ("sd:" + name).c_str();
set_threadname(tn.c_str());
if (sections_debug)
dump_sched_info(name);