diff --git a/audio/out/ao.c b/audio/out/ao.c index ee20b736a3c3f..0544da2644b86 100644 --- a/audio/out/ao.c +++ b/audio/out/ao.c @@ -57,7 +57,7 @@ extern const struct ao_driver audio_out_sdl; static const struct ao_driver * const audio_out_drivers[] = { // native: -#if HAVE_ANDROID +#if HAVE_AUDIOTRACK &audio_out_audiotrack, #endif #if HAVE_AUDIOUNIT diff --git a/meson.build b/meson.build index 6bba9932d6c8e..b9c102b5d90f9 100644 --- a/meson.build +++ b/meson.build @@ -485,8 +485,7 @@ endif features += {'android': host_machine.system() == 'android'} if features['android'] dependencies += cc.find_library('android') - sources += files('audio/out/ao_audiotrack.c', - 'misc/jni.c', + sources += files('misc/jni.c', 'osdep/android/strnlen.c', 'video/out/android_common.c', 'video/out/vo_mediacodec_embed.c') @@ -869,6 +868,12 @@ if features['openal'] sources += files('audio/out/ao_openal.c') endif +features += {'audiotrack': + get_option('audiotrack').require(features['android']).allowed()} +if features['audiotrack'] + sources += files('audio/out/ao_audiotrack.c') +endif + opensles = cc.find_library('OpenSLES', required: get_option('opensles')) features += {'opensles': opensles.found()} if features['opensles'] diff --git a/meson.options b/meson.options index cba18d42ed361..a2fd8524e01ca 100644 --- a/meson.options +++ b/meson.options @@ -48,6 +48,7 @@ option('coreaudio', type: 'feature', value: 'auto', description: 'CoreAudio audi option('avfoundation', type: 'feature', value: 'auto', description: 'AVFoundation audio output') option('jack', type: 'feature', value: 'auto', description: 'JACK audio output') option('openal', type: 'feature', value: 'disabled', description: 'OpenAL audio output') +option('audiotrack', type: 'feature', value: 'auto', description: 'Android AudioTrack audio output') option('opensles', type: 'feature', value: 'auto', description: 'OpenSL ES audio output') option('oss-audio', type: 'feature', value: 'auto', description: 'OSSv4 audio output') option('pipewire', type: 'feature', value: 'auto', description: 'PipeWire audio output')