Skip to content

Commit

Permalink
Use lc3plus.h instead of lc3.h to avoid collision
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
arkq committed Jan 2, 2024
1 parent 176dc88 commit 0eefbf1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -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],
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/a2dp-lc3plus.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <glib.h>

#include <lc3.h>
#include <lc3plus.h>

#include "a2dp.h"
#include "audio.h"
Expand Down
4 changes: 2 additions & 2 deletions src/utils.h
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down Expand Up @@ -46,7 +46,7 @@ const char *aacenc_strerror(AACENC_ERROR err);
#endif

#if ENABLE_LC3PLUS
# include <lc3.h>
# include <lc3plus.h>
const char *lc3plus_strerror(LC3PLUS_Error err);
#endif

Expand Down

0 comments on commit 0eefbf1

Please sign in to comment.