The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-17 12:58:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

ControllerInterface: Make the ID assigning code common

Browse Source 
This makes the device ID assigning code common to all backends, by
moving it to AddDevice() instead of copy-pasting or replicating
the logic in the backends.

Also, to prepare for hotplugging, instead of relying on a name usage
count, the new ID assigning system always starts from ID 0 and tries
to assign the first ID that is not used.
This commit is contained in:
Léo Lam
2016-07-14 10:25:52 +02:00
parent 89a03174cc
commit 788e19f54d
25 changed files with 41 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

@ -35,10 +35,6 @@ static std::string GetJoystickName(int index)
void Init()
{
// this is used to number the joysticks
// multiple joysticks with the same name shall get unique ids starting at 0
std::map<std::string, int> name_counts;
#ifdef USE_SDL_HAPTIC
if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC) >= 0)
{
@ -58,7 +54,7 @@ void Init()
SDL_Joystick* dev = SDL_JoystickOpen(i);
if (dev)
{
auto js = std::make_shared<Joystick>(dev, i, name_counts[GetJoystickName(i)]++);
auto js = std::make_shared<Joystick>(dev, i);
// only add if it has some inputs/outputs
if (js->Inputs().size() || js->Outputs().size())
g_controller_interface.AddDevice(std::move(js));
@ -66,8 +62,8 @@ void Init()
}
}
Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index)
: m_joystick(joystick), m_sdl_index(sdl_index), m_index(index)
Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index)
: m_joystick(joystick), m_sdl_index(sdl_index)
{
// really bad HACKS:
// to not use SDL for an XInput device
@ -290,11 +286,6 @@ std::string Joystick::GetSource() const
return "SDL";
}
int Joystick::GetId() const
{
return m_index;
}
std::string Joystick::Button::GetName() const
{
std::ostringstream ss;