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

adf

Browse Source
This commit is contained in:
Neeflix
2018-09-06 00:11:59 +02:00
parent 358fccd1ab
commit 19f3ca4d2a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FlippR-Driver/src/input/InputDriverFactory.cpp
View File

@@ -29,8 +29,8 @@ std::shared_ptr<InputDriver> InputDriverFactory::get_InputDriver(std::istream& i
std::map<std::string, std::shared_ptr<Event>> name_event_map; std::map<std::string, std::shared_ptr<Event>> name_event_map;
create_input_events(matrix_config, address_event_map, name_event_map); create_input_events(matrix_config, address_event_map, name_event_map);
std::shared_ptr<IEventNotifier> event_notifier(event_queue); std::shared_ptr<IEventNotifier> event_notifier(new EventNotifier(event_queue));
std::unique_ptr<IInputGPIOInterface> input_gpio_interface(input_config_stream); std::unique_ptr<IInputGPIOInterface> input_gpio_interface(new InputGPIOInterface(input_config_stream));
std::unique_ptr<IDetector> detector(new Detector(std::move(input_gpio_interface), address_event_map, event_notifier)); std::unique_ptr<IDetector> detector(new Detector(std::move(input_gpio_interface), address_event_map, event_notifier));
return std::shared_ptr<InputDriver>(new InputDriver(event_notifier, std::move(detector), name_event_map)); return std::shared_ptr<InputDriver>(new InputDriver(event_notifier, std::move(detector), name_event_map));
@@ -48,8 +48,7 @@ void InputDriverFactory::create_input_events(json matrix_config, std::map<char,
char address = json_event.at("address").get<json::number_integer_t>(); char address = json_event.at("address").get<json::number_integer_t>();
int priority = json_event.at("priority").get<json::number_integer_t>(); int priority = json_event.at("priority").get<json::number_integer_t>();
Event event(address, priority, name); std::shared_ptr<Event> event_ptr(new Event(address, priority, name));
std::shared_ptr<Event> event_ptr(event);
address_event_map.emplace(address, event_ptr); address_event_map.emplace(address, event_ptr);
name_event_map.emplace(name, event_ptr); name_event_map.emplace(name, event_ptr);