tanner/logiops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use shared_ptr for devices in DeviceMonitor

Browse Source
This commit is contained in:
pixl
2020-06-17 04:15:00 -04:00
parent 6b895b3015
commit 91954e8a73
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/logid/backend/hidpp/Device.cpp
View File

@@ -45,7 +45,7 @@ Device::Device(const std::string& path, DeviceIndex index):
raw_device->addEventHandler("DEV_" + std::to_string(index), rawEventHandler);
}
void Device::addEventHandler(const std::string& nickname, EventHandler& handler)
void Device::addEventHandler(const std::string& nickname, const std::shared_ptr<EventHandler>& handler)
{
auto it = event_handlers.find(nickname);
assert(it == event_handlers.end());
@@ -61,8 +61,8 @@ void Device::removeEventHandler(const std::string& nickname)
void Device::handleEvent(Report& report)
{
for(auto& handler : event_handlers)
if(handler.second.condition(report))
handler.second.callback(report);
if(handler.second->condition(report))
handler.second->callback(report);
}
Report Device::sendReport(Report& report)

4
src/logid/backend/hidpp/Device.h
View File

@@ -44,7 +44,7 @@ namespace hidpp
void listen(); // Runs asynchronously
void stopListening();
void addEventHandler(const std::string& nickname, EventHandler& handler);
void addEventHandler(const std::string& nickname, const std::shared_ptr<EventHandler>& handler);
void removeEventHandler(const std::string& nickname);
Report sendReport(Report& report);
@@ -56,7 +56,7 @@ namespace hidpp
DeviceIndex index;
uint8_t supported_reports;
std::map<std::string, EventHandler> event_handlers;
std::map<std::string, std::shared_ptr<EventHandler>> event_handlers;
};
} } }

2
src/logid/backend/raw/RawDevice.cpp
View File

@@ -194,7 +194,7 @@ void RawDevice::stopListener()
interruptRead();
}
void RawDevice::addEventHandler(const std::string &nickname, RawEventHandler &handler)
void RawDevice::addEventHandler(const std::string& nickname, RawEventHandler& handler)
{
auto it = event_handlers.find(nickname);
assert(it == event_handlers.end());