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

lcdd: add proper destructor to kill time thread

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44d1d8a808
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-03-03 21:52:21 +01:00
parent 106589507c
commit 88b0fd5fe3
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/driver/lcdd.cpp
View File

@@ -109,6 +109,17 @@ CLCD::CLCD()
*/
has_lcd = false;
clearClock = 0;
fontRenderer = NULL;
thread_started = false;
}
CLCD::~CLCD()
{
if (thread_started) {
thread_started = false;
pthread_join(thrTime, NULL);
}
delete fontRenderer;
}
CLCD* CLCD::getInstance()
@@ -140,9 +151,10 @@ void CLCD::wake_up() {
}
#ifndef BOXMODEL_DM500
void* CLCD::TimeThread(void *)
void* CLCD::TimeThread(void *p)
{
while(1)
((CLCD *)p)->thread_started = true;
while (((CLCD *)p)->thread_started)
{
sleep(1);
struct stat buf;
@@ -152,6 +164,7 @@ void* CLCD::TimeThread(void *)
} else
CLCD::getInstance()->wake_up();
}
printf("CLCD::TimeThread exit\n");
return NULL;
}
#else
@@ -202,7 +215,7 @@ void CLCD::init(const char * fontfile, const char * fontname,
#endif
}
if (pthread_create (&thrTime, NULL, TimeThread, NULL) != 0 )
if (pthread_create (&thrTime, NULL, TimeThread, this) != 0 )
{
perror("[lcdd]: pthread_create(TimeThread)");
return ;