ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-06-14 03:35:40 +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

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

@ -222,12 +222,12 @@ JNIEXPORT void JNICALL SDL_JAVA_AUDIO_INTERFACE(nativeSetupJNI)(
JNIEnv *env, jclass jcls); JNIEnv *env, jclass jcls);
JNIEXPORT void JNICALL 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);
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);
static JNINativeMethod SDLAudioManager_tab[] = { static JNINativeMethod SDLAudioManager_tab[] = {
{ "nativeSetupJNI", "()I", SDL_JAVA_AUDIO_INTERFACE(nativeSetupJNI) }, { "nativeSetupJNI", "()I", SDL_JAVA_AUDIO_INTERFACE(nativeSetupJNI) },
@ -940,18 +940,22 @@ 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)
{ {
char device_name[64]; if (SDL_GetCurrentAudioDriver() != NULL) {
SDL_snprintf(device_name, sizeof (device_name), "%d", device_id); char device_name[64];
SDL_Log("Adding device with name %s, capture %d", device_name, is_capture); SDL_snprintf(device_name, sizeof(device_name), "%d", device_id);
SDL_AddAudioDevice(is_capture, SDL_strdup(device_name), NULL, (void *) ((size_t) device_id + 1)); 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));
}
} }
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)
{ {
SDL_Log("Removing device with handle %d, capture %d", device_id + 1, is_capture); if (SDL_GetCurrentAudioDriver() != NULL) {
SDL_RemoveAudioDevice(is_capture, (void *) ((size_t) device_id + 1)); SDL_Log("Removing device with handle %d, capture %d", device_id + 1, is_capture);
SDL_RemoveAudioDevice(is_capture, (void *)((size_t)device_id + 1));
}
} }
/* Paddown */ /* Paddown */
@ -1504,9 +1508,9 @@ void Android_DetectDevices(void)
for (int i = 0; i < inputs_length; ++i) { for (int i = 0; i < inputs_length; ++i) {
int device_id = inputs[i]; int device_id = inputs[i];
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 input device with name %s", device_name); SDL_Log("Adding input device with name %s", device_name);
SDL_AddAudioDevice(SDL_TRUE, SDL_strdup(device_name), NULL, (void *) ((size_t) device_id + 1)); SDL_AddAudioDevice(SDL_TRUE, SDL_strdup(device_name), NULL, (void *)((size_t)device_id + 1));
} }
SDL_zeroa(outputs); SDL_zeroa(outputs);
@ -1516,9 +1520,9 @@ void Android_DetectDevices(void)
for (int i = 0; i < outputs_length; ++i) { for (int i = 0; i < outputs_length; ++i) {
int device_id = outputs[i]; int device_id = outputs[i];
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 output device with name %s", device_name); SDL_Log("Adding output device with name %s", device_name);
SDL_AddAudioDevice(SDL_FALSE, SDL_strdup(device_name), NULL, (void *) ((size_t) device_id + 1)); SDL_AddAudioDevice(SDL_FALSE, SDL_strdup(device_name), NULL, (void *)((size_t)device_id + 1));
} }
} }