geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename haptic methods to avoid confusion with joystick: 

`SDL_DINPUT_MaybeAddDevice`->`SDL_DINPUT_HapticMaybeAddDevice`
`SDL_DINPUT_MaybeRemoveDevice`->`SDL_DINPUT_HapticMaybeRemoveDevice`
`SDL_XINPUT_MaybeAddDevice`->`SDL_XINPUT_HapticMaybeAddDevice`
`SDL_XINPUT_MaybeRemoveDevice`->`SDL_XINPUT_HapticMaybeRemoveDevice`
main
Dimitriy Ryazantcev 2021-05-25 12:33:23 +03:00 committed by Sam Lantinga
parent 73dc68a7ae
commit a6da2fbf73
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/haptic/windows/SDL_dinputhaptic.c
View File

@ -61,7 +61,7 @@ static BOOL CALLBACK
EnumHapticsCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext) EnumHapticsCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext)
{ {
(void) pContext; (void) pContext;
SDL_DINPUT_MaybeAddDevice(pdidInstance); SDL_DINPUT_HapticMaybeAddDevice(pdidInstance);
return DIENUM_CONTINUE; /* continue enumerating */ return DIENUM_CONTINUE; /* continue enumerating */
} }
@ -117,7 +117,7 @@ SDL_DINPUT_HapticInit(void)
} }
int int
SDL_DINPUT_MaybeAddDevice(const DIDEVICEINSTANCE * pdidInstance) SDL_DINPUT_HapticMaybeAddDevice(const DIDEVICEINSTANCE * pdidInstance)
{ {
HRESULT ret; HRESULT ret;
LPDIRECTINPUTDEVICE8 device; LPDIRECTINPUTDEVICE8 device;
@ -176,7 +176,7 @@ SDL_DINPUT_MaybeAddDevice(const DIDEVICEINSTANCE * pdidInstance)
} }
int int
SDL_DINPUT_MaybeRemoveDevice(const DIDEVICEINSTANCE * pdidInstance) SDL_DINPUT_HapticMaybeRemoveDevice(const DIDEVICEINSTANCE * pdidInstance)
{ {
SDL_hapticlist_item *item; SDL_hapticlist_item *item;
SDL_hapticlist_item *prev = NULL; SDL_hapticlist_item *prev = NULL;
@ -1188,13 +1188,13 @@ SDL_DINPUT_HapticInit(void)
} }
int int
SDL_DINPUT_MaybeAddDevice(const DIDEVICEINSTANCE * pdidInstance) SDL_DINPUT_HapticMaybeAddDevice(const DIDEVICEINSTANCE * pdidInstance)
{ {
return SDL_Unsupported(); return SDL_Unsupported();
} }
int int
SDL_DINPUT_MaybeRemoveDevice(const DIDEVICEINSTANCE * pdidInstance) SDL_DINPUT_HapticMaybeRemoveDevice(const DIDEVICEINSTANCE * pdidInstance)
{ {
return SDL_Unsupported(); return SDL_Unsupported();
} }

4
src/haptic/windows/SDL_dinputhaptic_c.h
View File

@ -25,8 +25,8 @@
extern int SDL_DINPUT_HapticInit(void); extern int SDL_DINPUT_HapticInit(void);
extern int SDL_DINPUT_MaybeAddDevice(const DIDEVICEINSTANCE *pdidInstance); extern int SDL_DINPUT_HapticMaybeAddDevice(const DIDEVICEINSTANCE *pdidInstance);
extern int SDL_DINPUT_MaybeRemoveDevice(const DIDEVICEINSTANCE *pdidInstance); extern int SDL_DINPUT_HapticMaybeRemoveDevice(const DIDEVICEINSTANCE *pdidInstance);
extern int SDL_DINPUT_HapticOpen(SDL_Haptic * haptic, SDL_hapticlist_item *item); extern int SDL_DINPUT_HapticOpen(SDL_Haptic * haptic, SDL_hapticlist_item *item);
extern int SDL_DINPUT_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick); extern int SDL_DINPUT_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick);
extern int SDL_DINPUT_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick); extern int SDL_DINPUT_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick);

10
src/haptic/windows/SDL_xinputhaptic.c
View File

@ -50,14 +50,14 @@ SDL_XINPUT_HapticInit(void)
if (loaded_xinput) { if (loaded_xinput) {
DWORD i; DWORD i;
for (i = 0; i < XUSER_MAX_COUNT; i++) { for (i = 0; i < XUSER_MAX_COUNT; i++) {
SDL_XINPUT_MaybeAddDevice(i); SDL_XINPUT_HapticMaybeAddDevice(i);
} }
} }
return 0; return 0;
} }
int int
SDL_XINPUT_MaybeAddDevice(const DWORD dwUserid) SDL_XINPUT_HapticMaybeAddDevice(const DWORD dwUserid)
{ {
const Uint8 userid = (Uint8)dwUserid; const Uint8 userid = (Uint8)dwUserid;
SDL_hapticlist_item *item; SDL_hapticlist_item *item;
@ -106,7 +106,7 @@ SDL_XINPUT_MaybeAddDevice(const DWORD dwUserid)
} }
int int
SDL_XINPUT_MaybeRemoveDevice(const DWORD dwUserid) SDL_XINPUT_HapticMaybeRemoveDevice(const DWORD dwUserid)
{ {
const Uint8 userid = (Uint8)dwUserid; const Uint8 userid = (Uint8)dwUserid;
SDL_hapticlist_item *item; SDL_hapticlist_item *item;
@ -377,13 +377,13 @@ SDL_XINPUT_HapticInit(void)
} }
int int
SDL_XINPUT_MaybeAddDevice(const DWORD dwUserid) SDL_XINPUT_HapticMaybeAddDevice(const DWORD dwUserid)
{ {
return SDL_Unsupported(); return SDL_Unsupported();
} }
int int
SDL_XINPUT_MaybeRemoveDevice(const DWORD dwUserid) SDL_XINPUT_HapticMaybeRemoveDevice(const DWORD dwUserid)
{ {
return SDL_Unsupported(); return SDL_Unsupported();
} }

4
src/haptic/windows/SDL_xinputhaptic_c.h
View File

@ -25,8 +25,8 @@
extern int SDL_XINPUT_HapticInit(void); extern int SDL_XINPUT_HapticInit(void);
extern int SDL_XINPUT_MaybeAddDevice(const DWORD dwUserid); extern int SDL_XINPUT_HapticMaybeAddDevice(const DWORD dwUserid);
extern int SDL_XINPUT_MaybeRemoveDevice(const DWORD dwUserid); extern int SDL_XINPUT_HapticMaybeRemoveDevice(const DWORD dwUserid);
extern int SDL_XINPUT_HapticOpen(SDL_Haptic * haptic, SDL_hapticlist_item *item); extern int SDL_XINPUT_HapticOpen(SDL_Haptic * haptic, SDL_hapticlist_item *item);
extern int SDL_XINPUT_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick); extern int SDL_XINPUT_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick);
extern int SDL_XINPUT_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick); extern int SDL_XINPUT_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick);

8
src/joystick/windows/SDL_windowsjoystick.c
View File

@ -429,11 +429,11 @@ WINDOWS_JoystickDetect(void)
if (pCurList->bXInputDevice) { if (pCurList->bXInputDevice) {
#if SDL_HAPTIC_XINPUT #if SDL_HAPTIC_XINPUT
SDL_XINPUT_MaybeRemoveDevice(pCurList->XInputUserId); SDL_XINPUT_HapticMaybeRemoveDevice(pCurList->XInputUserId);
#endif #endif
} else { } else {
#if SDL_HAPTIC_DINPUT #if SDL_HAPTIC_DINPUT
SDL_DINPUT_MaybeRemoveDevice(&pCurList->dxdevice); SDL_DINPUT_HapticMaybeRemoveDevice(&pCurList->dxdevice);
#endif #endif
} }
@ -449,11 +449,11 @@ WINDOWS_JoystickDetect(void)
if (pCurList->send_add_event) { if (pCurList->send_add_event) {
if (pCurList->bXInputDevice) { if (pCurList->bXInputDevice) {
#if SDL_HAPTIC_XINPUT #if SDL_HAPTIC_XINPUT
SDL_XINPUT_MaybeAddDevice(pCurList->XInputUserId); SDL_XINPUT_HapticMaybeAddDevice(pCurList->XInputUserId);
#endif #endif
} else { } else {
#if SDL_HAPTIC_DINPUT #if SDL_HAPTIC_DINPUT
SDL_DINPUT_MaybeAddDevice(&pCurList->dxdevice); SDL_DINPUT_HapticMaybeAddDevice(&pCurList->dxdevice);
#endif #endif
} }