mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-07-21 16:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android: remove pollInputDevice() in favor of InputDeviceListener (#15659)

Browse Source
This commit is contained in:
Sylvain Becker
2026-06-04 05:38:04 +02:00
committed by GitHub
parent 42fc082b5e
commit fc3a96e47a
7 changed files with 85 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/joystick/android/SDL_sysjoystick.c
View File

@@ -535,11 +535,9 @@ done:
SDL_UnlockJoysticks();
}
static void ANDROID_JoystickDetect(void);
static bool ANDROID_JoystickInit(void)
{
ANDROID_JoystickDetect();
Android_JNI_DetectDevices();
return true;
}
@@ -550,16 +548,9 @@ static int ANDROID_JoystickGetCount(void)
static void ANDROID_JoystickDetect(void)
{
/* Support for device connect/disconnect is API >= 16 only,
* so we poll every three seconds
/* Support for device connect/disconnect is implemented using InputDeviceListener
* Ref: http://developer.android.com/reference/android/hardware/input/InputManager.InputDeviceListener.html
*/
static Uint64 timeout = 0;
Uint64 now = SDL_GetTicks();
if (!timeout || now >= timeout) {
timeout = now + 3000;
Android_JNI_PollInputDevices();
}
}
static bool ANDROID_JoystickIsDevicePresent(Uint16 vendor_id, Uint16 product_id, Uint16 version, const char *name)
@@ -596,16 +587,6 @@ static SDL_joylist_item *JoystickByDeviceId(int device_id)
item = item->next;
}
// Joystick not found, try adding it
ANDROID_JoystickDetect();
while (item) {
if (item->device_id == device_id) {
return item;
}
item = item->next;
}
return NULL;
}