summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/include/system/audio.h16
-rw-r--r--audio_utils/Makefile.am35
-rw-r--r--audio_utils/audio_utils.pc.in10
-rw-r--r--configure.ac1
4 files changed, 48 insertions, 14 deletions
diff --git a/audio/include/system/audio.h b/audio/include/system/audio.h
index 6595631..bedf4ca 100644
--- a/audio/include/system/audio.h
+++ b/audio/include/system/audio.h
@@ -553,14 +553,14 @@ typedef enum {
*/
enum {
AUDIO_CHANNEL_INDEX_HDR = AUDIO_CHANNEL_REPRESENTATION_INDEX << AUDIO_CHANNEL_COUNT_MAX,
- AUDIO_CHANNEL_INDEX_MASK_1 = AUDIO_CHANNEL_INDEX_HDR | (1 << 1) - 1,
- AUDIO_CHANNEL_INDEX_MASK_2 = AUDIO_CHANNEL_INDEX_HDR | (1 << 2) - 1,
- AUDIO_CHANNEL_INDEX_MASK_3 = AUDIO_CHANNEL_INDEX_HDR | (1 << 3) - 1,
- AUDIO_CHANNEL_INDEX_MASK_4 = AUDIO_CHANNEL_INDEX_HDR | (1 << 4) - 1,
- AUDIO_CHANNEL_INDEX_MASK_5 = AUDIO_CHANNEL_INDEX_HDR | (1 << 5) - 1,
- AUDIO_CHANNEL_INDEX_MASK_6 = AUDIO_CHANNEL_INDEX_HDR | (1 << 6) - 1,
- AUDIO_CHANNEL_INDEX_MASK_7 = AUDIO_CHANNEL_INDEX_HDR | (1 << 7) - 1,
- AUDIO_CHANNEL_INDEX_MASK_8 = AUDIO_CHANNEL_INDEX_HDR | (1 << 8) - 1,
+ AUDIO_CHANNEL_INDEX_MASK_1 = AUDIO_CHANNEL_INDEX_HDR | ((1 << 1) - 1),
+ AUDIO_CHANNEL_INDEX_MASK_2 = AUDIO_CHANNEL_INDEX_HDR | ((1 << 2) - 1),
+ AUDIO_CHANNEL_INDEX_MASK_3 = AUDIO_CHANNEL_INDEX_HDR | ((1 << 3) - 1),
+ AUDIO_CHANNEL_INDEX_MASK_4 = AUDIO_CHANNEL_INDEX_HDR | ((1 << 4) - 1),
+ AUDIO_CHANNEL_INDEX_MASK_5 = AUDIO_CHANNEL_INDEX_HDR | ((1 << 5) - 1),
+ AUDIO_CHANNEL_INDEX_MASK_6 = AUDIO_CHANNEL_INDEX_HDR | ((1 << 6) - 1),
+ AUDIO_CHANNEL_INDEX_MASK_7 = AUDIO_CHANNEL_INDEX_HDR | ((1 << 7) - 1),
+ AUDIO_CHANNEL_INDEX_MASK_8 = AUDIO_CHANNEL_INDEX_HDR | ((1 << 8) - 1),
// FIXME FCC_8
};
diff --git a/audio_utils/Makefile.am b/audio_utils/Makefile.am
index ee9fb85..f898dc5 100644
--- a/audio_utils/Makefile.am
+++ b/audio_utils/Makefile.am
@@ -1,18 +1,41 @@
+#compile audio utils
AM_CFLAGS = -Werror -Wall
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = tinysndfile.pc
+pkgconfig_DATA = audio_utils.pc
+EXTRA_DIST = $(pkgconfig_DATA)
+
+AM_CFLAGS += -I $(WORKSPACE)/system/media/audio/include
+AM_CFLAGS += -I $(WORKSPACE)/system/media/audio_utils/include
+
+libraryaudioutils_includedir = $(includedir)/audio/audio_utils
+libraryaudioutils_include_HEADERS = include/audio_utils/primitives.h
+libraryaudioutils_include_HEADERS += include/audio_utils/format.h
+
+audioutils_sources = format.c \
+ channels.c \
+ primitives.c
+
+lib_LTLIBRARIES = libaudioutils.la
+libaudioutils_la_SOURCES = $(audioutils_sources)
+libaudioutils_la_CFLAGS = $(AM_CFLAGS)
+libaudioutils_la_LDFLAGS = -shared
+
+#compile tinysndfile
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA += tinysndfile.pc
EXTRA_DIST = $(pkgconfig_DATA)
AM_CFLAGS += -I $(WORKSPACE)/system/media/audio_utils
AM_CFLAGS += -I $(WORKSPACE)/system/media/audio_utils/include
-library_includedir = $(includedir)/tinysndfile
-library_include_HEADERS = include/audio_utils/sndfile.h
+librarytinysnd_includedir = $(includedir)/tinysndfile
+librarytinysnd_include_HEADERS = include/audio_utils/sndfile.h
-c_sources = tinysndfile.c \
+tinysnd_sources = tinysndfile.c \
primitives.c
-lib_LTLIBRARIES = libtinysndfile.la
-libtinysndfile_la_SOURCES = $(c_sources)
+lib_LTLIBRARIES += libtinysndfile.la
+libtinysndfile_la_SOURCES = $(tinysnd_sources)
libtinysndfile_la_CFLAGS = $(AM_CFLAGS)
diff --git a/audio_utils/audio_utils.pc.in b/audio_utils/audio_utils.pc.in
new file mode 100644
index 0000000..30438d6
--- /dev/null
+++ b/audio_utils/audio_utils.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: audio_utils
+Description: audio_utils library
+Version: @VERSION@
+Libs: -L${libdir} -laudioutils
+Cflags: -I${includedir}
diff --git a/configure.ac b/configure.ac
index 6d55a7b..75465af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ AC_CONFIG_FILES([ \
audio_utils/Makefile \
audio/include/Makefile \
audio_utils/tinysndfile.pc \
+ audio_utils/audio_utils.pc \
audio_route/audio_route.pc
])
AC_OUTPUT