geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable AAUDIO driver for Android 

I thought this was already enabled for 2.0.16, but apparently not.

Fixes https://github.com/libsdl-org/SDL/issues/3710
main
Sam Lantinga 2021-08-10 14:50:43 -07:00
parent 016b02f24c
commit 6810399352
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1010,7 +1010,7 @@ if(ANDROID)
find_library(ANDROID_OPENSLES_LIBRARY OpenSLES) find_library(ANDROID_OPENSLES_LIBRARY OpenSLES)
list(APPEND EXTRA_LIBS ${ANDROID_DL_LIBRARY} ${ANDROID_OPENSLES_LIBRARY}) list(APPEND EXTRA_LIBS ${ANDROID_DL_LIBRARY} ${ANDROID_OPENSLES_LIBRARY})
set(SDL_AUDIO_DRIVER_AAUDIO 0) set(SDL_AUDIO_DRIVER_AAUDIO 1)
file(GLOB AAUDIO_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/aaudio/*.c) file(GLOB AAUDIO_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/aaudio/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${AAUDIO_AUDIO_SOURCES}) set(SOURCE_FILES ${SOURCE_FILES} ${AAUDIO_AUDIO_SOURCES})

8
WhatsNew.txt
View File

@ -1,6 +1,13 @@
This is a list of major changes in SDL's version history. This is a list of major changes in SDL's version history.
---------------------------------------------------------------------------
2.0.18:
---------------------------------------------------------------------------
Android:
* Added support for audio output and capture using AAudio
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
2.0.16: 2.0.16:
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
@ -30,7 +37,6 @@ Linux:
* Added the hint SDL_HINT_AUDIO_DEVICE_STREAM_ROLE to describe the role of your application for audio control panels * Added the hint SDL_HINT_AUDIO_DEVICE_STREAM_ROLE to describe the role of your application for audio control panels
Android: Android:
* Added support for audio output and capture using AAudio
* Added SDL_AndroidShowToast() to show a lightweight notification * Added SDL_AndroidShowToast() to show a lightweight notification
iOS: iOS:

9
configure.ac
View File

@ -3660,6 +3660,15 @@ case "$host" in
AC_DEFINE(SDL_AUDIO_DRIVER_ANDROID, 1, [ ]) AC_DEFINE(SDL_AUDIO_DRIVER_ANDROID, 1, [ ])
SOURCES="$SOURCES $srcdir/src/audio/android/*.c" SOURCES="$SOURCES $srcdir/src/audio/android/*.c"
SUMMARY_audio="${SUMMARY_audio} android" SUMMARY_audio="${SUMMARY_audio} android"
AC_DEFINE(SDL_AUDIO_DRIVER_OPENSLES, 1, [ ])
SOURCES="$SOURCES $srcdir/src/audio/openslES/*.c"
SUMMARY_audio="${SUMMARY_audio} openslES"
AC_DEFINE(SDL_AUDIO_DRIVER_AAUDIO, 1, [ ])
SOURCES="$SOURCES $srcdir/src/audio/aaudio/*.c"
SUMMARY_audio="${SUMMARY_audio} aaudio"
have_audio=yes have_audio=yes
;; ;;
nto) nto)

2
include/SDL_config.h.in
View File

@ -262,6 +262,7 @@
#undef SDL_FILESYSTEM_DISABLED #undef SDL_FILESYSTEM_DISABLED
/* Enable various audio drivers */ /* Enable various audio drivers */
#undef SDL_AUDIO_DRIVER_AAUDIO
#undef SDL_AUDIO_DRIVER_ALSA #undef SDL_AUDIO_DRIVER_ALSA
#undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC #undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
#undef SDL_AUDIO_DRIVER_ANDROID #undef SDL_AUDIO_DRIVER_ANDROID
@ -283,6 +284,7 @@
#undef SDL_AUDIO_DRIVER_NAS #undef SDL_AUDIO_DRIVER_NAS
#undef SDL_AUDIO_DRIVER_NAS_DYNAMIC #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC
#undef SDL_AUDIO_DRIVER_NETBSD #undef SDL_AUDIO_DRIVER_NETBSD
#undef SDL_AUDIO_DRIVER_OPENSLES
#undef SDL_AUDIO_DRIVER_OSS #undef SDL_AUDIO_DRIVER_OSS
#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
#undef SDL_AUDIO_DRIVER_PAUDIO #undef SDL_AUDIO_DRIVER_PAUDIO

2
include/SDL_config_android.h
View File

@ -143,7 +143,7 @@
/* Enable various audio drivers */ /* Enable various audio drivers */
#define SDL_AUDIO_DRIVER_ANDROID 1 #define SDL_AUDIO_DRIVER_ANDROID 1
#define SDL_AUDIO_DRIVER_OPENSLES 1 #define SDL_AUDIO_DRIVER_OPENSLES 1
#define SDL_AUDIO_DRIVER_AAUDIO 0 #define SDL_AUDIO_DRIVER_AAUDIO 1
#define SDL_AUDIO_DRIVER_DUMMY 1 #define SDL_AUDIO_DRIVER_DUMMY 1
/* Enable various input drivers */ /* Enable various input drivers */