mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-20 02:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add SDL_HINT_DIRECTINPUT_ENABLED (on by default)

Browse Source
This commit is contained in:
Jade Macho
2022-06-28 21:03:16 +02:00
committed by Sam Lantinga
parent db7dfece16
commit 6a2e6c82a0
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/windows/SDL_dinputjoystick.c
View File

@@ -24,6 +24,7 @@
#if SDL_JOYSTICK_DINPUT
#include "SDL_hints.h"
#include "SDL_windowsjoystick_c.h"
#include "SDL_dinputjoystick_c.h"
#include "SDL_rawinputjoystick_c.h"
@@ -397,6 +398,12 @@ SDL_DINPUT_JoystickInit(void)
HRESULT result;
HINSTANCE instance;
if (!SDL_GetHintBoolean(SDL_HINT_DIRECTINPUT_ENABLED, SDL_TRUE)) {
/* In some environments, IDirectInput8_Initialize / _EnumDevices can take a minute even with no controllers. */
dinput = NULL;
return 0;
}
result = WIN_CoInitialize();
if (FAILED(result)) {
return SetDIerror("CoInitialize", result);
@@ -539,6 +546,10 @@ err:
void
SDL_DINPUT_JoystickDetect(JoyStick_DeviceData **pContext)
{
if (dinput == NULL) {
return;
}
IDirectInput8_EnumDevices(dinput, DI8DEVCLASS_GAMECTRL, EnumJoystickDetectCallback, pContext, DIEDFL_ATTACHEDONLY);
}