ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-06-14 19:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android active driver check (#6850)

Browse source 
Check if a driver is active before attempting to handle the devices.
Otherwise an assertion will fail.
This commit is contained in:
Maido 2022-12-19 17:02:10 +02:00 committed by Sylvain
parent 36c87d9f27
commit 311b02f0b5
No known key found for this signature in database
GPG key ID: 5F87E02E5BC0939E
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/android/SDL_android.c
View file

@ -940,19 +940,23 @@ JNIEXPORT void JNICALL
SDL_JAVA_AUDIO_INTERFACE(addAudioDevice)(JNIEnv *env, jclass jcls, jboolean is_capture, SDL_JAVA_AUDIO_INTERFACE(addAudioDevice)(JNIEnv *env, jclass jcls, jboolean is_capture,
jint device_id) jint device_id)
{ {
if (SDL_GetCurrentAudioDriver() != NULL) {
char device_name[64]; char device_name[64];
SDL_snprintf(device_name, sizeof(device_name), "%d", device_id); SDL_snprintf(device_name, sizeof(device_name), "%d", device_id);
SDL_Log("Adding device with name %s, capture %d", device_name, is_capture); SDL_Log("Adding device with name %s, capture %d", device_name, is_capture);
SDL_AddAudioDevice(is_capture, SDL_strdup(device_name), NULL, (void *)((size_t)device_id + 1)); SDL_AddAudioDevice(is_capture, SDL_strdup(device_name), NULL, (void *)((size_t)device_id + 1));
} }
}
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
SDL_JAVA_AUDIO_INTERFACE(removeAudioDevice)(JNIEnv *env, jclass jcls, jboolean is_capture, SDL_JAVA_AUDIO_INTERFACE(removeAudioDevice)(JNIEnv *env, jclass jcls, jboolean is_capture,
jint device_id) jint device_id)
{ {
if (SDL_GetCurrentAudioDriver() != NULL) {
SDL_Log("Removing device with handle %d, capture %d", device_id + 1, is_capture); SDL_Log("Removing device with handle %d, capture %d", device_id + 1, is_capture);
SDL_RemoveAudioDevice(is_capture, (void *)((size_t)device_id + 1)); SDL_RemoveAudioDevice(is_capture, (void *)((size_t)device_id + 1));
} }
}
/* Paddown */ /* Paddown */
JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativePadDown)( JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativePadDown)(