From fd29e5c4cc26cd853a03ac7b0e08b367b7070c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 12 Jun 2016 17:08:04 +0200 Subject: ControllerInterface: Don't pass m_devices to the backends Previously, the devices vector would be passed to all backends. They would then manually push_back to it to add new devices. This was fine but caused issues when trying to add synchronisation. Instead, backends now call AddDevice() to fill m_devices so that it is not accessible from the outside. --- Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp | 10 +++++----- Source/Core/InputCommon/ControllerInterface/DInput/DInput.h | 3 +-- .../InputCommon/ControllerInterface/DInput/DInputJoystick.cpp | 5 +++-- .../InputCommon/ControllerInterface/DInput/DInputJoystick.h | 2 +- .../ControllerInterface/DInput/DInputKeyboardMouse.cpp | 5 +++-- .../ControllerInterface/DInput/DInputKeyboardMouse.h | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/DInput') diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp index 09227b5932..83394852af 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Common/StringUtil.h" - #include "InputCommon/ControllerInterface/DInput/DInput.h" +#include "Common/StringUtil.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" #include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h" @@ -44,7 +44,7 @@ std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device) return result; } -void Init(std::vector& devices, HWND hwnd) +void Init(HWND hwnd) { IDirectInput8* idi8; if (FAILED(DirectInput8Create(GetModuleHandle(nullptr), DIRECTINPUT_VERSION, IID_IDirectInput8, @@ -53,8 +53,8 @@ void Init(std::vector& devices, HWND hwnd) return; } - InitKeyboardMouse(idi8, devices, hwnd); - InitJoystick(idi8, devices, hwnd); + InitKeyboardMouse(idi8, hwnd); + InitJoystick(idi8, hwnd); idi8->Release(); } diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h index 2f5e2f83a7..94e4cb4fe3 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h @@ -10,7 +10,6 @@ #include #include "InputCommon/ControllerInterface/DInput/DInput8.h" -#include "InputCommon/ControllerInterface/Device.h" namespace ciface { @@ -21,6 +20,6 @@ BOOL CALLBACK DIEnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVO BOOL CALLBACK DIEnumDevicesCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef); std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device); -void Init(std::vector& devices, HWND hwnd); +void Init(HWND hwnd); } } diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp index bf2c1f3e7e..ea059fde73 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp @@ -6,6 +6,7 @@ #include #include +#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/DInput/DInput.h" #include "InputCommon/ControllerInterface/DInput/DInputJoystick.h" #include "InputCommon/ControllerInterface/DInput/XInputFilter.h" @@ -16,7 +17,7 @@ namespace DInput { #define DATA_BUFFER_SIZE 32 -void InitJoystick(IDirectInput8* const idi8, std::vector& devices, HWND hwnd) +void InitJoystick(IDirectInput8* const idi8, HWND hwnd) { std::list joysticks; idi8->EnumDevices(DI8DEVCLASS_GAMECTRL, DIEnumDevicesCallback, (LPVOID)&joysticks, @@ -60,7 +61,7 @@ void InitJoystick(IDirectInput8* const idi8, std::vector& devices Joystick* js = new Joystick(/*&*i, */ js_device, name_counts[joystick.tszInstanceName]++); // only add if it has some inputs/outputs if (js->Inputs().size() || js->Outputs().size()) - devices.push_back(js); + g_controller_interface.AddDevice(js); else delete js; } diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h index 9a14e910de..d66c28cfba 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h @@ -11,7 +11,7 @@ namespace ciface { namespace DInput { -void InitJoystick(IDirectInput8* const idi8, std::vector& devices, HWND hwnd); +void InitJoystick(IDirectInput8* const idi8, HWND hwnd); class Joystick : public ForceFeedback::ForceFeedbackDevice { diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp index 92c8514825..3d9b692ba0 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -4,6 +4,7 @@ #include +#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/DInput/DInput.h" #include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h" @@ -31,7 +32,7 @@ static const struct // lil silly static HWND m_hwnd; -void InitKeyboardMouse(IDirectInput8* const idi8, std::vector& devices, HWND _hwnd) +void InitKeyboardMouse(IDirectInput8* const idi8, HWND _hwnd) { m_hwnd = _hwnd; @@ -56,7 +57,7 @@ void InitKeyboardMouse(IDirectInput8* const idi8, std::vector& de if (SUCCEEDED( mo_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE))) { - devices.push_back(new KeyboardMouse(kb_device, mo_device)); + g_controller_interface.AddDevice(new KeyboardMouse(kb_device, mo_device)); return; } } diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h index 1ba9022f9d..38de8e219d 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h @@ -13,7 +13,7 @@ namespace ciface { namespace DInput { -void InitKeyboardMouse(IDirectInput8* const idi8, std::vector& devices, HWND _hwnd); +void InitKeyboardMouse(IDirectInput8* const idi8, HWND _hwnd); class KeyboardMouse : public Core::Device { -- cgit v1.2.3