From 0eefbf141d6f44d55fb456ecbe1e8cd03709517b Mon Sep 17 00:00:00 2001 From: Arkadiusz Bokowy Date: Tue, 2 Jan 2024 20:45:12 +0100 Subject: [PATCH] Use lc3plus.h instead of lc3.h to avoid collision The upstream version of the LC3plus codec is shipped with lc3.h file. Unfortunately, such file is shipped with the LC3 codec as well. It seems reasonable to rename the LC3plus codec header file, so it will match the codec name. --- configure.ac | 4 ++-- src/a2dp-lc3plus.c | 2 +- src/utils.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 200a3d132..99be7217b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # BlueALSA - configure.ac -# Copyright (c) 2016-2023 Arkadiusz Bokowy +# Copyright (c) 2016-2024 Arkadiusz Bokowy AC_PREREQ([2.60]) AC_INIT([BlueALSA], @@ -162,7 +162,7 @@ AC_ARG_ENABLE([lc3plus], [AS_HELP_STRING([--enable-lc3plus], [enable LC3plus support])]) AM_CONDITIONAL([ENABLE_LC3PLUS], [test "x$enable_lc3plus" = "xyes"]) AM_COND_IF([ENABLE_LC3PLUS], [ - AC_CHECK_HEADERS([lc3.h], + AC_CHECK_HEADERS([lc3plus.h], [], [AC_MSG_ERROR([LC3plus header file not found])]) # There is no pkg-config support for LC3plus, so we have to check the library # version manually. We will check for the symbols that are available in the diff --git a/src/a2dp-lc3plus.c b/src/a2dp-lc3plus.c index c7fcd3e13..24c9e88f5 100644 --- a/src/a2dp-lc3plus.c +++ b/src/a2dp-lc3plus.c @@ -25,7 +25,7 @@ #include -#include +#include #include "a2dp.h" #include "audio.h" diff --git a/src/utils.h b/src/utils.h index f36a2f288..b5d0541cf 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,6 +1,6 @@ /* * BlueALSA - utils.h - * Copyright (c) 2016-2023 Arkadiusz Bokowy + * Copyright (c) 2016-2024 Arkadiusz Bokowy * * This file is a part of bluez-alsa. * @@ -46,7 +46,7 @@ const char *aacenc_strerror(AACENC_ERROR err); #endif #if ENABLE_LC3PLUS -# include +# include const char *lc3plus_strerror(LC3PLUS_Error err); #endif