ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4273 from fr500/master 

differentiate xbox one controllers
This commit is contained in:
Twinaphex 2016-12-19 00:01:45 +01:00 committed by GitHub
parent 7dce431239 ab56b5f33c
commit e639f12e35
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
input/drivers_joypad/xinput_joypad.c
View File

@ -139,7 +139,7 @@ static INLINE int pad_index_to_xuser_index(unsigned pad)
/* Generic "XInput" instead of "Xbox 360", because there are /* Generic "XInput" instead of "Xbox 360", because there are
* some other non-xbox third party PC controllers. * some other non-xbox third party PC controllers.
*/ */
static const char* const XBOX_CONTROLLER_NAMES[4] = static const char* const XBOX_CONTROLLER_NAMES[4] =
{ {
"XInput Controller (User 1)", "XInput Controller (User 1)",
"XInput Controller (User 2)", "XInput Controller (User 2)",
@ -147,13 +147,25 @@ static const char* const XBOX_CONTROLLER_NAMES[4] =
"XInput Controller (User 4)" "XInput Controller (User 4)"
}; };
static const char* const XBOX_ONE_CONTROLLER_NAMES[4] =
{
"XBOX One Controller (User 1)",
"XBOX One Controller (User 2)",
"XBOX One Controller (User 3)",
"XBOX One Controller (User 4)"
};
const char *xinput_joypad_name(unsigned pad) const char *xinput_joypad_name(unsigned pad)
{ {
int xuser = pad_index_to_xuser_index(pad); int xuser = pad_index_to_xuser_index(pad);
/* Use the real controller name for XBOX One controllers since
they are slightly different */
if (xuser < 0) if (xuser < 0)
return dinput_joypad.name(pad); return dinput_joypad.name(pad);
/* TODO: Different name if disconnected? */
if (strstr(dinput_joypad.name(pad), "Xbox One For Windows"))
return XBOX_ONE_CONTROLLER_NAMES[xuser];
return XBOX_CONTROLLER_NAMES[xuser]; return XBOX_CONTROLLER_NAMES[xuser];
} }