ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-01-03 18:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

androidaudio: same fix as AAudio for pausing thread when backgrounding app.

Browse source 
Reference Issue #8748.
This commit is contained in:
Ryan C. Gordon 2024-01-19 22:15:27 -05:00
parent 109bb2f17e
commit 1e13aa2c98
No known key found for this signature in database
GPG key ID: FA148B892AB48044
2 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/audio/android/SDL_androidaudio.c
View file

@ -148,29 +148,12 @@ AudioBootStrap ANDROIDAUDIO_bootstrap = {
void ANDROIDAUDIO_PauseDevices(void) void ANDROIDAUDIO_PauseDevices(void)
{ {
/* TODO: Handle multiple devices? */ /* TODO: Handle multiple devices? */
struct SDL_PrivateAudioData *private;
if (audioDevice && audioDevice->hidden) { if (audioDevice && audioDevice->hidden) {
private = (struct SDL_PrivateAudioData *)audioDevice->hidden; SDL_LockMutex(audioDevice->mixer_lock);
if (SDL_AtomicGet(&audioDevice->paused)) {
/* The device is already paused, leave it alone */
private->resume = SDL_FALSE;
} else {
SDL_LockMutex(audioDevice->mixer_lock);
SDL_AtomicSet(&audioDevice->paused, 1);
private->resume = SDL_TRUE;
}
} }
if (captureDevice && captureDevice->hidden) { if (captureDevice && captureDevice->hidden) {
private = (struct SDL_PrivateAudioData *)captureDevice->hidden; SDL_LockMutex(captureDevice->mixer_lock);
if (SDL_AtomicGet(&captureDevice->paused)) {
/* The device is already paused, leave it alone */
private->resume = SDL_FALSE;
} else {
SDL_LockMutex(captureDevice->mixer_lock);
SDL_AtomicSet(&captureDevice->paused, 1);
private->resume = SDL_TRUE;
}
} }
} }
@ -178,23 +161,12 @@ void ANDROIDAUDIO_PauseDevices(void)
void ANDROIDAUDIO_ResumeDevices(void) void ANDROIDAUDIO_ResumeDevices(void)
{ {
/* TODO: Handle multiple devices? */ /* TODO: Handle multiple devices? */
struct SDL_PrivateAudioData *private;
if (audioDevice && audioDevice->hidden) { if (audioDevice && audioDevice->hidden) {
private = (struct SDL_PrivateAudioData *)audioDevice->hidden; SDL_UnlockMutex(audioDevice->mixer_lock);
if (private->resume) {
SDL_AtomicSet(&audioDevice->paused, 0);
private->resume = SDL_FALSE;
SDL_UnlockMutex(audioDevice->mixer_lock);
}
} }
if (captureDevice && captureDevice->hidden) { if (captureDevice && captureDevice->hidden) {
private = (struct SDL_PrivateAudioData *)captureDevice->hidden; SDL_UnlockMutex(captureDevice->mixer_lock);
if (private->resume) {
SDL_AtomicSet(&captureDevice->paused, 0);
private->resume = SDL_FALSE;
SDL_UnlockMutex(captureDevice->mixer_lock);
}
} }
} }

3
src/audio/android/SDL_androidaudio.h
View file

@ -30,8 +30,7 @@
struct SDL_PrivateAudioData struct SDL_PrivateAudioData
{ {
/* Resume device if it was paused automatically */ int unused;
int resume;
}; };
void ANDROIDAUDIO_ResumeDevices(void); void ANDROIDAUDIO_ResumeDevices(void);