mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/gui/bedit/bouqueteditor_channels.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 736c1969fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-24 22:37:37 +02:00
parent d9ef178129 107f5023d1
commit e07fc0dd57
12 changed files with 996 additions and 795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/eitd/sectionsd.cpp
View File

@@ -1437,8 +1437,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();
@@ -1574,8 +1574,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);