encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-17 17:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android/openslES: set audio in paused/resumed state for Android event loop

Browse Source 
And also in "stopped" state before closing the device.
This commit is contained in:
Sylvain Becker
2019-01-14 12:33:29 +01:00
parent 59c8c7b684
commit 955d87894b
3 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/video/android/SDL_androidevents.c
View File

@@ -30,9 +30,10 @@
#include "SDL_androidkeyboard.h"
#include "SDL_androidwindow.h"
#if !SDL_AUDIO_DISABLED
/* Can't include sysaudio "../../audio/android/SDL_androidaudio.h"
* because of THIS redefinition */
#if !SDL_AUDIO_DISABLED && SDL_AUDIO_DRIVER_ANDROID
extern void ANDROIDAUDIO_ResumeDevices(void);
extern void ANDROIDAUDIO_PauseDevices(void);
#else
@@ -40,6 +41,14 @@ static void ANDROIDAUDIO_ResumeDevices(void) {}
static void ANDROIDAUDIO_PauseDevices(void) {}
#endif
#if !SDL_AUDIO_DISABLED && SDL_AUDIO_DRIVER_OPENSLES
extern void openslES_ResumeDevices(void);
extern void openslES_PauseDevices(void);
#else
static void openslES_ResumeDevices(void) {}
static void openslES_PauseDevices(void) {}
#endif
/* Number of 'type' events in the event queue */
static int
SDL_NumberOfEvents(Uint32 type)
@@ -95,12 +104,14 @@ Android_PumpEvents(_THIS)
SDL_UnlockMutex(Android_ActivityMutex);
ANDROIDAUDIO_PauseDevices();
openslES_PauseDevices();
if (SDL_SemWait(Android_ResumeSem) == 0) {
isPaused = 0;
ANDROIDAUDIO_ResumeDevices();
openslES_ResumeDevices();
/* Restore the GL Context from here, as this operation is thread dependent */
if (!SDL_HasEvent(SDL_QUIT)) {
@@ -111,7 +122,6 @@ Android_PumpEvents(_THIS)
/* Make sure SW Keyboard is restored when an app becomes foreground */
if (SDL_IsTextInputActive()) {
SDL_VideoDevice *_this = SDL_GetVideoDevice();
Android_StartTextInput(_this); /* Only showTextInput */
}
}
@@ -144,6 +154,7 @@ Android_PumpEvents(_THIS)
isPaused = 0;
ANDROIDAUDIO_ResumeDevices();
openslES_ResumeDevices();
/* Restore the GL Context from here, as this operation is thread dependent */
if (!SDL_HasEvent(SDL_QUIT)) {
@@ -154,7 +165,6 @@ Android_PumpEvents(_THIS)
/* Make sure SW Keyboard is restored when an app becomes foreground */
if (SDL_IsTextInputActive()) {
SDL_VideoDevice *_this = SDL_GetVideoDevice();
Android_StartTextInput(_this); /* Only showTextInput */
}
}
@@ -166,6 +176,7 @@ Android_PumpEvents(_THIS)
SDL_UnlockMutex(Android_ActivityMutex);
ANDROIDAUDIO_PauseDevices();
openslES_PauseDevices();
isPaused = 1;
}