summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2010-10-25 09:00:06 +0100
committerArun Raghavan <arun.raghavan@collabora.co.uk>2011-02-01 11:51:46 +0530
commit9498440dc67376832f6d4cc0af79498643c7c3de (patch)
tree011572eec17278c35975577843b91cf1ba41f40c /src
parenta9d824925d55191f2599dd85f21ee278b09eb02a (diff)
echo-cancel: Make Orc file names less silly
The naming was what it was because of the way orc.mak was originally written. This has changed now.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am6
-rw-r--r--src/modules/echo-cancel/adrian-aec.c2
-rw-r--r--src/modules/echo-cancel/adrian-aec.orc (renamed from src/modules/echo-cancel/adrian-aec-orc.orc)0
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 82bd653c..0687e409 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1711,10 +1711,10 @@ module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS)
module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(LIBSPEEX_LIBS)
module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(LIBSPEEX_CFLAGS)
if HAVE_ORC
-ORC_SOURCE += modules/echo-cancel/adrian-aec-orc
+ORC_SOURCE += modules/echo-cancel/adrian-aec
nodist_module_echo_cancel_la_SOURCES = \
- modules/echo-cancel/adrian-aec-orc-orc-gen.c \
- modules/echo-cancel/adrian-aec-orc-orc-gen.h
+ modules/echo-cancel/adrian-aec-orc-gen.c \
+ modules/echo-cancel/adrian-aec-orc-gen.h
module_echo_cancel_la_LIBADD += $(ORC_LIBS)
module_echo_cancel_la_CFLAGS += $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel
endif
diff --git a/src/modules/echo-cancel/adrian-aec.c b/src/modules/echo-cancel/adrian-aec.c
index 5a455914..6793e59d 100644
--- a/src/modules/echo-cancel/adrian-aec.c
+++ b/src/modules/echo-cancel/adrian-aec.c
@@ -18,7 +18,7 @@
#include "adrian-aec.h"
#ifndef DISABLE_ORC
-#include "adrian-aec-orc-orc-gen.h"
+#include "adrian-aec-orc-gen.h"
#endif
#ifdef __SSE__
diff --git a/src/modules/echo-cancel/adrian-aec-orc.orc b/src/modules/echo-cancel/adrian-aec.orc
index 80547723..80547723 100644
--- a/src/modules/echo-cancel/adrian-aec-orc.orc
+++ b/src/modules/echo-cancel/adrian-aec.orc