mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 19:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android: audio change audio assert when try to open concurrent device to a real error

Browse Source
This commit is contained in:
Sylvain
2023-04-04 09:40:57 +02:00
committed by Sylvain Becker
parent a874f6c993
commit 407b85c506
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/audio/aaudio/SDL_aaudio.c
View File

@@ -75,8 +75,17 @@ static int aaudio_OpenDevice(_THIS, const char *devname)
aaudio_result_t res; aaudio_result_t res;
LOGI(__func__); LOGI(__func__);
SDL_assert((captureDevice == NULL) || !iscapture); if (iscapture) {
SDL_assert((audioDevice == NULL) || iscapture); if (captureDevice) {
return SDL_SetError("An audio capture device is already opened");
}
}
if (!iscapture) {
if (audioDevice) {
return SDL_SetError("An audio playback device is already opened");
}
}
if (iscapture) { if (iscapture) {
if (!Android_JNI_RequestPermission("android.permission.RECORD_AUDIO")) { if (!Android_JNI_RequestPermission("android.permission.RECORD_AUDIO")) {

13
src/audio/android/SDL_androidaudio.c
View File

@@ -40,8 +40,17 @@ static int ANDROIDAUDIO_OpenDevice(_THIS, const char *devname)
SDL_AudioFormat test_format; SDL_AudioFormat test_format;
SDL_bool iscapture = this->iscapture; SDL_bool iscapture = this->iscapture;
SDL_assert((captureDevice == NULL) || !iscapture); if (iscapture) {
SDL_assert((audioDevice == NULL) || iscapture); if (captureDevice) {
return SDL_SetError("An audio capture device is already opened");
}
}
if (!iscapture) {
if (audioDevice) {
return SDL_SetError("An audio playback device is already opened");
}
}
if (iscapture) { if (iscapture) {
captureDevice = this; captureDevice = this;