mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-09-21 18:47:32 +02:00
parent dbb726e191 bdd23e0ece
commit 17afd5c87a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/eitd/sectionsd.cpp
View File

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

2
src/gui/components/cc_timer.cpp
View File

@@ -58,7 +58,7 @@ CComponentsTimer::~CComponentsTimer()
void CComponentsTimer::runSharedTimerAction() void CComponentsTimer::runSharedTimerAction()
{ {
//start loop //start loop
string tn = "cc:"+name; tn = "cc:"+name;
set_threadname(tn.c_str()); set_threadname(tn.c_str());
while(tm_enable && tm_interval > 0) { while(tm_enable && tm_interval > 0) {
tm_mutex.lock(); tm_mutex.lock();

2
src/gui/components/cc_timer.h
View File

@@ -65,7 +65,7 @@ class CComponentsTimer : public sigc::trackable
///name for the thread ///name for the thread
std::string name; std::string name;
std::string tn;
///mutex for timer ///mutex for timer
OpenThreads::Mutex tm_mutex; OpenThreads::Mutex tm_mutex;
///slot for restart signals ///slot for restart signals