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

fixing compile errors

Browse Source
This commit is contained in:
Jonas Zeunert
2018-05-07 11:39:48 +02:00
parent c1a29d8bea
commit 23f04f472f
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
FlippR-Driver/src/input/Detector.cpp
View File

@@ -23,7 +23,6 @@ Detector::Detector(std::map<std::string, char> input_config, std::map<char, Inpu
notify_thread = std::thread(&Detector::notify_handlers, this); notify_thread = std::thread(&Detector::notify_handlers, this);
} }
Detector::~Detector() Detector::~Detector()
{ {
is_running = false; is_running = false;
@@ -34,13 +33,13 @@ Detector::~Detector()
void Detector::register_input_event_handler(InputEventHandler* handler) void Detector::register_input_event_handler(InputEventHandler* handler)
{ {
std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex); LOCK_EVENT_HANDLER();
event_handler.insert(handler); event_handler.insert(handler);
} }
void Detector::unregister_input_event_handler(InputEventHandler* handler) void Detector::unregister_input_event_handler(InputEventHandler* handler)
{ {
std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex); LOCK_EVENT_HANDLER();
event_handler.erase(handler); event_handler.erase(handler);
} }
@@ -55,10 +54,11 @@ void Detector::notify_handlers()
return; return;
} }
InputEvent& event = event_queue.pop(); InputEvent event = event_queue.front();
event_queue.pop();
std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex);
// getting a guard and calling all registered handlers
LOCK_EVENT_HANDLER();
for(auto* handler : event_handler) for(auto* handler : event_handler)
{ {
handler->handle(event); handler->handle(event);
@@ -66,6 +66,7 @@ void Detector::notify_handlers()
} }
} }
void Detector::detect() void Detector::detect()
{ {
while(is_running) while(is_running)
@@ -74,7 +75,7 @@ void Detector::detect()
if(check_inputs(address)) if(check_inputs(address))
{ {
InputEvent& event = input_events.at(address); InputEvent& event = input_events.at(address);
event_queue.queue(event); event_queue.emplace(event);
} }
} }
} }

3
FlippR-Driver/src/input/Detector.h
View File

@@ -16,8 +16,11 @@
#include "InputEvent.h" #include "InputEvent.h"
#define LOCK_EVENT_HANDLER() std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex)
#define SLEEP_DURATION_NANO 900 #define SLEEP_DURATION_NANO 900
namespace Input namespace Input
{ {