From 8678133e8746fdc20f7d012005ebf2db370ddccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 25 Jun 2016 21:46:39 +0200 Subject: 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. --- Source/Core/InputCommon/ControllerInterface/Device.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/Device.h') diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index c3cddb3a79..23c499ec9d 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -164,12 +164,13 @@ public: Device::Input* FindInput(const std::string& name, const Device* def_dev) const; Device::Output* FindOutput(const std::string& name, const Device* def_dev) const; - const std::vector& Devices() const { return m_devices; } - Device* FindDevice(const DeviceQualifier& devq) const; + std::vector GetAllDeviceStrings() const; + std::string GetDefaultDeviceString() const; + std::shared_ptr FindDevice(const DeviceQualifier& devq) const; protected: - std::mutex m_devices_mutex; - std::vector m_devices; + mutable std::mutex m_devices_mutex; + std::vector> m_devices; }; } } -- cgit v1.2.3