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

Remove SDL_INIT_HAPTIC use 

We don't actually use the haptic API, which is a separate thing from SDL_GameControllerRumble/SDL_JoystickRumble
This commit is contained in:
CasualPokePlayer 2023-11-23 23:08:21 -08:00
parent a605443590
commit 5f6243bd76
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BizHawk.Bizware.Input/SDL2/SDL2InputAdapter.cs
View File

@ -84,7 +84,7 @@ namespace BizHawk.Bizware.Input
SDL2Gamepad.Deinitialize();
if (_sdlInitCalled)
{
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER);
_sdlInitCalled = false;
}
@ -105,14 +105,14 @@ namespace BizHawk.Bizware.Input
// however, let's just test if SDL init works (if it does, 99.9% chance it will on the input thread)
try
{
if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER) != 0)
if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) != 0)
{
throw new($"SDL failed to init, SDL error: {SDL_GetError()}");
}
}
finally
{
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER);
SDL_FlushEvents(SDL_EventType.SDL_FIRSTEVENT, SDL_EventType.SDL_LASTEVENT);
}
@ -137,9 +137,9 @@ namespace BizHawk.Bizware.Input
{
if (!_sdlInitCalled)
{
if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER) != 0)
if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) != 0)
{
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER);
throw new($"SDL failed to init, SDL error: {SDL_GetError()}");
}