echo-cancel: orc-ify some bits for optimisation

[pulseaudio] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 4e1a105f8288e892294a3fba48799b0eeb6e693b..4061b3c591dce455a7a06aed52ce62d93d6d1336 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,6 +71,8 @@ AM_CFLAGS = \
        -I$(top_builddir)/src/modules/jack \
        -I$(top_srcdir)/src/modules/dbus \
        -I$(top_builddir)/src/modules/dbus \
+       -I$(top_srcdir)/src/modules/echo-cancel \
+       -I$(top_builddir)/src/modules/echo-cancel \
        $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
        $(LIBSAMPLERATE_CFLAGS) \
        $(LIBSNDFILE_CFLAGS) \
@@ -120,11 +122,13 @@ EXTRA_DIST = \
                daemon/start-pulseaudio-x11.in \
                daemon/start-pulseaudio-kde.in \
                utils/padsp \
+               utils/qpaeq \
                modules/module-defs.h.m4 \
                daemon/pulseaudio.desktop.in \
                daemon/pulseaudio-kde.desktop.in \
                map-file \
-               daemon/pulseaudio-system.conf
+               daemon/pulseaudio-system.conf \
+               modules/echo-cancel/adrian-license.txt
 
 pulseconf_DATA = \
                default.pa \
@@ -848,6 +852,7 @@ libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES = \
                pulsecore/resampler.c pulsecore/resampler.h \
                pulsecore/rtpoll.c pulsecore/rtpoll.h \
                pulsecore/sample-util.c pulsecore/sample-util.h \
+               pulsecore/cpu.h \
                pulsecore/cpu-arm.c pulsecore/cpu-arm.h \
                pulsecore/cpu-x86.c pulsecore/cpu-x86.h \
                pulsecore/svolume_c.c pulsecore/svolume_arm.c \
@@ -1098,7 +1103,8 @@ dist_alsaprofilesets_DATA = \
                modules/alsa/mixer/profile-sets/default.conf \
                modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
                modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
-               modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
+               modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \
+               modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf
 
 if HAVE_UDEV
 dist_udevrules_DATA = \
@@ -1702,10 +1708,17 @@ module_suspend_on_idle_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO
 module_suspend_on_idle_la_CFLAGS = $(AM_CFLAGS)
 
 # echo-cancel module
-module_echo_cancel_la_SOURCES = modules/echo-cancel/module-echo-cancel.c modules/echo-cancel/speex.c
+ORC_SOURCE=modules/echo-cancel/adrian-aec-orc
+include $(top_srcdir)/build/orc.mak
+module_echo_cancel_la_SOURCES = modules/echo-cancel/module-echo-cancel.c modules/echo-cancel/echo-cancel.h \
+                               modules/echo-cancel/speex.c \
+                               modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \
+                               modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h \
+                               $(ORC_SOURCE).orc
+nodist_module_echo_cancel_la_SOURCES = $(ORC_NODIST_SOURCES)
 module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_echo_cancel_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBSPEEX_LIBS)
-module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(LIBSPEEX_CFLAGS)
+module_echo_cancel_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBSPEEX_LIBS) $(ORC_LIBS)
+module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(LIBSPEEX_CFLAGS) $(ORC_CFLAGS)
 
 # RTP modules
 module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c