mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 06:39:46 -06:00
ControllerInterface: Make the ID assigning code common
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:
@ -14,8 +14,8 @@ namespace ciface
|
||||
{
|
||||
namespace OSX
|
||||
{
|
||||
Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void* window)
|
||||
: m_device(device), m_device_name(name), m_index(index)
|
||||
Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, void* window)
|
||||
: m_device(device), m_device_name(name)
|
||||
{
|
||||
// This class should only recieve Keyboard or Keypad devices
|
||||
// Now, filter on just the buttons we can handle sanely
|
||||
@ -98,11 +98,6 @@ std::string Keyboard::GetSource() const
|
||||
return "Keyboard";
|
||||
}
|
||||
|
||||
int Keyboard::GetId() const
|
||||
{
|
||||
return m_index;
|
||||
}
|
||||
|
||||
Keyboard::Key::Key(IOHIDElementRef element, IOHIDDeviceRef device)
|
||||
: m_element(element), m_device(device)
|
||||
{
|
||||
|
Reference in New Issue
Block a user