diff options
| author | Michael Maltese <michaeljosephmaltese@gmail.com> | 2016-10-16 13:39:05 -0700 |
|---|---|---|
| committer | Michael Maltese <michaeljosephmaltese@gmail.com> | 2016-11-30 16:07:55 -0800 |
| commit | 3e69d066f5e9ad0a1097d806c656035398bbb7bc (patch) | |
| tree | dd7ab461e209f81876a2b2145a5595812512eb6c /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | cebb4d84f2a8021a5df2ff2a9d31eba16e1cb5e5 (diff) | |
ControllerInterface: replace Reinitialize with RefreshDevices
The SDL backend crashes when you close a joystick after SDL_Quit has
been called. Some backends don't need to be shutdown and
re-initialized everytime, we can just ask to enumerate devices again.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 45 |
1 files changed, 37 insertions, 8 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 13873ac2dd..635284d2c5 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -55,41 +55,70 @@ void ControllerInterface::Initialize(void* const hwnd) m_hwnd = hwnd; #ifdef CIFACE_USE_DINPUT - ciface::DInput::Init((HWND)hwnd); +// nothing needed #endif #ifdef CIFACE_USE_XINPUT ciface::XInput::Init(); #endif #ifdef CIFACE_USE_XLIB - ciface::XInput2::Init(hwnd); +// nothing needed #endif #ifdef CIFACE_USE_OSX ciface::OSX::Init(hwnd); - ciface::Quartz::Init(hwnd); +// nothing needed for Quartz #endif #ifdef CIFACE_USE_SDL ciface::SDL::Init(); #endif #ifdef CIFACE_USE_ANDROID - ciface::Android::Init(); +// nothing needed #endif #ifdef CIFACE_USE_EVDEV ciface::evdev::Init(); #endif #ifdef CIFACE_USE_PIPES - ciface::Pipes::Init(); +// nothing needed #endif m_is_init = true; + RefreshDevices(); } -void ControllerInterface::Reinitialize() +void ControllerInterface::RefreshDevices() { if (!m_is_init) return; - Shutdown(); - Initialize(m_hwnd); + { + std::lock_guard<std::mutex> lk(m_devices_mutex); + m_devices.clear(); + } + +#ifdef CIFACE_USE_DINPUT + ciface::DInput::PopulateDevices(reinterpret_cast<HWND>(m_hwnd)); +#endif +#ifdef CIFACE_USE_XINPUT + ciface::XInput::PopulateDevices(); +#endif +#ifdef CIFACE_USE_XLIB + ciface::XInput2::PopulateDevices(m_hwnd); +#endif +#ifdef CIFACE_USE_OSX + ciface::OSX::PopulateDevices(m_hwnd); + ciface::Quartz::PopulateDevices(m_hwnd); +#endif +#ifdef CIFACE_USE_SDL + ciface::SDL::PopulateDevices(); +#endif +#ifdef CIFACE_USE_ANDROID + ciface::Android::PopulateDevices(); +#endif +#ifdef CIFACE_USE_EVDEV + ciface::evdev::PopulateDevices(); +#endif +#ifdef CIFACE_USE_PIPES + ciface::Pipes::PopulateDevices(); +#endif } // |