summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@innovatetechnologi.es>2016-06-25 21:46:39 +0200
committerLéo Lam <leo@innovatetechnologi.es>2016-06-25 21:46:39 +0200
commit8678133e8746fdc20f7d012005ebf2db370ddccc (patch)
treeccca4a186be0e8ee93c733c8d2315e5dd0c20db2 /Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
parentafa202738e54652e98e8388a5c6a1541d750e3e6 (diff)
ControllerInterface: Switch to std::shared_ptr
Small cleanup by using std::shared_ptr and getting rid of ciface.Devices() which just returned the m_devices (which defeats the point of making m_devices protected). Incidentally, this should make the code safer when we have different threads accessing devices in the future (for hotplug?). A lot of code use Device references directly so there is no easy way to remove FindDevice() and make those unique_ptrs.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
index 5da77e585a..658a442420 100644
--- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
@@ -68,18 +68,13 @@ void Init()
// Unfortunately udev gives us no way to filter out the non event device interfaces.
// So we open it and see if it works with evdev ioctls or not.
std::string name = GetName(devnode);
- evdevDevice* input = new evdevDevice(devnode, name_counts[name]++);
+ auto input = std::make_shared<evdevDevice>(devnode, name_counts[name]++);
if (input->IsInteresting())
{
- g_controller_interface.AddDevice(input);
+ g_controller_interface.AddDevice(std::move(input));
num_controllers++;
}
- else
- {
- // Either it wasn't a evdev device, or it didn't have at least 8 buttons or two axis.
- delete input;
- }
}
udev_device_unref(dev);
}