jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge remote branch 'stromnet/stromnet-master'

Browse source
This commit is contained in:
Micke Prag 2012-04-13 11:31:49 +02:00
commit e6fc4d3034
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
telldus-core/service/ControllerListener_mac.cpp
View file

@ -21,6 +21,7 @@ public:
CFRunLoopRef gRunLoop; CFRunLoopRef gRunLoop;
io_iterator_t gAddedIter; io_iterator_t gAddedIter;
TelldusCore::EventRef event; TelldusCore::EventRef event;
bool running;
void addUsbFilter(int vid, int pid); void addUsbFilter(int vid, int pid);
static void DeviceAdded(void *refCon, io_iterator_t iterator); static void DeviceAdded(void *refCon, io_iterator_t iterator);
@ -32,11 +33,16 @@ ControllerListener::ControllerListener(TelldusCore::EventRef event)
{ {
d = new PrivateData; d = new PrivateData;
d->event = event; d->event = event;
d->running = true;
d->gRunLoop = NULL;
this->start(); this->start();
} }
ControllerListener::~ControllerListener() { ControllerListener::~ControllerListener() {
CFRunLoopStop(d->gRunLoop); d->running = false;
if(d->gRunLoop != NULL)
CFRunLoopStop(d->gRunLoop);
this->wait(); this->wait();
delete d; delete d;
} }
@ -53,7 +59,10 @@ void ControllerListener::run() {
d->addUsbFilter(0x1781, 0x0c30); d->addUsbFilter(0x1781, 0x0c30);
d->addUsbFilter(0x1781, 0x0c31); d->addUsbFilter(0x1781, 0x0c31);
CFRunLoopRun(); // Race check, if destructor was called really close to thread init,
// running might have gone false. Make sure we don't get stuck
if(d->running)
CFRunLoopRun();
} }
void ControllerListener::PrivateData::addUsbFilter(int vid, int pid) { void ControllerListener::PrivateData::addUsbFilter(int vid, int pid) {