rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed to smart ptrs and trying to fix event_handler_tests

Browse Source
This commit is contained in:
Jonas Zeunert
2018-07-11 19:00:24 +02:00
parent 26c63d946d
commit 8b9ec68662
12 changed files with 47 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
FlippR-Driver/src/input/EventNotifier.cpp
View File

@@ -26,12 +26,12 @@ EventNotifier::EventNotifier() :
EventNotifier::~EventNotifier()
{
is_running = false;
this->is_running = false;
Event end_event(0, 0, "END");
event_queue->push(end_event);
this->event_queue->push(end_event);
notify_thread.join();
this->notify_thread.join();
delete this->event_queue;
}
@@ -39,25 +39,25 @@ EventNotifier::~EventNotifier()
void EventNotifier::register_event_handler(IEventHandler* handler)
{
std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex);
event_handlers.insert(handler);
this->event_handlers.insert(handler);
}
void EventNotifier::unregister_event_handler(IEventHandler* handler)
{
std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex);
event_handlers.erase(handler);
this->event_handlers.erase(handler);
}
void EventNotifier::distribute_event(Event& event)
{
event_queue->push(event);
this->event_queue->push(event);
}
void EventNotifier::notify()
{
while(is_running)
while(this->is_running)
{
Event event = event_queue->pop();
Event event = this->event_queue->pop();
// TODO schoener machen
if(event.name == "END")
@@ -66,8 +66,8 @@ void EventNotifier::notify()
}
// getting a guard and calling all registered handlers
std::lock_guard event_handler_guard(event_handler_mutex);
for(auto handler : event_handlers)
std::lock_guard event_handler_guard(this->event_handler_mutex);
for(auto handler : this->event_handlers)
{
boost::thread handler_caller(boost::bind(&IEventHandler::handle, handler, event));