From fdbc846120ef336085f650a1c81898aa271d862d Mon Sep 17 00:00:00 2001 From: Elias Souza Date: Sun, 7 Jun 2026 16:45:29 -0300 Subject: [PATCH] bluez5: Use LDAC_ABR_HANDLE_NULL on ldacBT >= 2.1.0.0 --- spa/plugins/bluez5/a2dp-codec-ldac.c | 6 +++--- spa/plugins/bluez5/meson.build | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spa/plugins/bluez5/a2dp-codec-ldac.c b/spa/plugins/bluez5/a2dp-codec-ldac.c index ceda1621c..98898c5f1 100644 --- a/spa/plugins/bluez5/a2dp-codec-ldac.c +++ b/spa/plugins/bluez5/a2dp-codec-ldac.c @@ -471,11 +471,11 @@ static void *codec_init(const struct media_codec *codec, uint32_t flags, #endif #ifdef ENABLE_LDAC_ABR -#ifdef ENABLE_LDAC_DEC + #ifdef LDAC_ABR_HANDLE_NULL this->ldac_abr = ldac_ABR_get_handle(NULL); -#else + #else this->ldac_abr = ldac_ABR_get_handle(); -#endif + #endif if (this->ldac_abr == NULL) goto error_errno; #endif diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build index e39afd030..2aeab5b9d 100644 --- a/spa/plugins/bluez5/meson.build +++ b/spa/plugins/bluez5/meson.build @@ -138,6 +138,9 @@ if ldac_dep.found() ldac_args = codec_args if ldac_abr_dep.found() ldac_args += [ '-DENABLE_LDAC_ABR' ] + if ldac_abr_dep.version().version_compare('>=2.1.0.0') + ldac_args += [ '-DLDAC_ABR_HANDLE_NULL' ] + endif endif if get_option('bluez5-codec-ldac-dec').allowed() and ldac_dec_dep.found() ldac_args += [ '-DENABLE_LDAC_DEC' ]