mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-26 22:38:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ControllerInterface: Get rid of SetHwnd(), introduce Reinitialize()

Browse source 
Initialize now just takes the handle directly. Reinitialize is added because it is much more straightforward in comparison to doing the Shutdown-Initialize manually.
This commit is contained in:
Lioncash 2014-10-13 12:45:47 -04:00
parent 8912315596
commit b7b2074cc2
5 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View file

@ -41,25 +41,27 @@ ControllerInterface g_controller_interface;
//
// Detect devices and inputs outputs / will make refresh function later
//
void ControllerInterface::Initialize()
void ControllerInterface::Initialize(void* const hwnd)
{
if (m_is_init)
return;
m_hwnd = hwnd;
#ifdef CIFACE_USE_DINPUT
ciface::DInput::Init(m_devices, (HWND)m_hwnd);
ciface::DInput::Init(m_devices, (HWND)hwnd);
#endif
#ifdef CIFACE_USE_XINPUT
ciface::XInput::Init(m_devices);
#endif
#ifdef CIFACE_USE_XLIB
ciface::Xlib::Init(m_devices, m_hwnd);
ciface::Xlib::Init(m_devices, hwnd);
#ifdef CIFACE_USE_X11_XINPUT2
ciface::XInput2::Init(m_devices, m_hwnd);
ciface::XInput2::Init(m_devices, hwnd);
#endif
#endif
#ifdef CIFACE_USE_OSX
ciface::OSX::Init(m_devices, m_hwnd);
ciface::OSX::Init(m_devices, hwnd);
#endif
#ifdef CIFACE_USE_SDL
ciface::SDL::Init(m_devices);
@ -71,6 +73,15 @@ void ControllerInterface::Initialize()
m_is_init = true;
}
void ControllerInterface::Reinitialize()
{
if (!m_is_init)
return;
Shutdown();
Initialize(m_hwnd);
}
//
// DeInit
//
@ -119,16 +130,6 @@ void ControllerInterface::Shutdown()
m_is_init = false;
}
//
// SetHwnd
//
// Sets the hwnd used for some crap when initializing, use before calling Init
//
void ControllerInterface::SetHwnd( void* const hwnd )
{
m_hwnd = hwnd;
}
//
// UpdateInput
//