From 9498440dc67376832f6d4cc0af79498643c7c3de Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arun.raghavan@collabora.co.uk>
Date: Mon, 25 Oct 2010 09:00:06 +0100
Subject: 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.
---
 src/Makefile.am                            | 6 +++---
 src/modules/echo-cancel/adrian-aec-orc.orc | 8 --------
 src/modules/echo-cancel/adrian-aec.c       | 2 +-
 src/modules/echo-cancel/adrian-aec.orc     | 8 ++++++++
 4 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 src/modules/echo-cancel/adrian-aec-orc.orc
 create mode 100644 src/modules/echo-cancel/adrian-aec.orc

(limited to 'src')

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-orc.orc b/src/modules/echo-cancel/adrian-aec-orc.orc
deleted file mode 100644
index 80547723..00000000
--- a/src/modules/echo-cancel/adrian-aec-orc.orc
+++ /dev/null
@@ -1,8 +0,0 @@
-.function update_tap_weights
-.dest 4 w float
-.source 4 xf float
-.floatparam 4 mikro_ef
-.temp 4 tmp float
-
-mulf tmp, mikro_ef, xf
-addf w, w, tmp
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 b/src/modules/echo-cancel/adrian-aec.orc
new file mode 100644
index 00000000..80547723
--- /dev/null
+++ b/src/modules/echo-cancel/adrian-aec.orc
@@ -0,0 +1,8 @@
+.function update_tap_weights
+.dest 4 w float
+.source 4 xf float
+.floatparam 4 mikro_ef
+.temp 4 tmp float
+
+mulf tmp, mikro_ef, xf
+addf w, w, tmp
-- 
cgit