stream-util: Add pa_stream_get_volume_channel_map()

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 66ce8340956125f0ffff8dabbea39c21c1cde5f4..28049eaa83efec1df56e5c6175004ae4a3321306 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -614,6 +614,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \
                pulsecore/authkey.c pulsecore/authkey.h \
                pulsecore/conf-parser.c pulsecore/conf-parser.h \
                pulsecore/core-error.c pulsecore/core-error.h \
+               pulsecore/core-format.c pulsecore/core-format.h \
                pulsecore/core-rtclock.c pulsecore/core-rtclock.h \
                pulsecore/core-util.c pulsecore/core-util.h \
                pulsecore/creds.h \
@@ -687,6 +688,11 @@ libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(X11_CFLAGS)
 libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += $(X11_LIBS)
 endif
 
+if HAVE_SYSTEMD_JOURNAL
+libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(JOURNAL_FLAGS)
+libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += $(JOURNAL_LIBS)
+endif
+
 # proplist-util.h uses these header files, but not the library itself!
 libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS += $(GLIB20_CFLAGS) $(GTK30_CFLAGS)
 
@@ -889,6 +895,7 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES = \
                pulsecore/remap_mmx.c pulsecore/remap_sse.c \
                pulsecore/resampler.c pulsecore/resampler.h \
                pulsecore/rtpoll.c pulsecore/rtpoll.h \
+               pulsecore/stream-util.c pulsecore/stream-util.h \
                pulsecore/mix.c pulsecore/mix.h \
                pulsecore/cpu.h \
                pulsecore/cpu-arm.c pulsecore/cpu-arm.h \
@@ -1322,6 +1329,7 @@ endif
 
 if HAVE_BLUEZ
 modlibexec_LTLIBRARIES += \
+               module-bluetooth-discover.la \
                module-bluetooth-policy.la
 endif
 
@@ -1334,7 +1342,9 @@ endif
 
 if HAVE_BLUEZ_5
 modlibexec_LTLIBRARIES += \
-               module-bluez5-discover.la
+               libbluez5-util.la \
+               module-bluez5-discover.la \
+               module-bluez5-device.la
 endif
 
 if HAVE_OPENSSL
@@ -1424,9 +1434,11 @@ SYMDEF_FILES = \
                module-udev-detect-symdef.h \
                module-systemd-login-symdef.h \
                module-bluetooth-policy-symdef.h \
+               module-bluetooth-discover-symdef.h \
                module-bluez4-discover-symdef.h \
                module-bluez4-device-symdef.h \
                module-bluez5-discover-symdef.h \
+               module-bluez5-device-symdef.h \
                module-raop-sink-symdef.h \
                module-raop-discover-symdef.h \
                module-gconf-symdef.h \
@@ -2028,6 +2040,12 @@ module_bluetooth_policy_la_LDFLAGS = $(MODULE_LDFLAGS)
 module_bluetooth_policy_la_LIBADD = $(MODULE_LIBADD)
 module_bluetooth_policy_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
+# Bluetooth discover
+module_bluetooth_discover_la_SOURCES = modules/bluetooth/module-bluetooth-discover.c
+module_bluetooth_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_bluetooth_discover_la_LIBADD = $(MODULE_LIBADD)
+module_bluetooth_discover_la_CFLAGS = $(AM_CFLAGS)
+
 # Bluetooth BlueZ 4 sink / source
 module_bluez4_discover_la_SOURCES = modules/bluetooth/module-bluez4-discover.c
 module_bluez4_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
@@ -2048,11 +2066,24 @@ module_bluez4_device_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) $(SBC_LIBS) libbl
 module_bluez4_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SBC_CFLAGS)
 
 # Bluetooth BlueZ 5 sink / source
+libbluez5_util_la_SOURCES = \
+               modules/bluetooth/bluez5-util.c \
+               modules/bluetooth/bluez5-util.h \
+               modules/bluetooth/a2dp-codecs.h
+libbluez5_util_la_LDFLAGS = -avoid-version
+libbluez5_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
+libbluez5_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+
 module_bluez5_discover_la_SOURCES = modules/bluetooth/module-bluez5-discover.c
 module_bluez5_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_bluez5_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
+module_bluez5_discover_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libbluez5-util.la
 module_bluez5_discover_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
+module_bluez5_device_la_SOURCES = modules/bluetooth/module-bluez5-device.c
+module_bluez5_device_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_bluez5_device_la_LIBADD = $(MODULE_LIBADD) $(SBC_LIBS) libbluez5-util.la
+module_bluez5_device_la_CFLAGS = $(AM_CFLAGS) $(SBC_CFLAGS)
+
 # Apple Airtunes/RAOP
 module_raop_sink_la_SOURCES = modules/raop/module-raop-sink.c
 module_raop_sink_la_LDFLAGS = $(MODULE_LDFLAGS)