From 4b80eb4fcd761e9249f6ee7dca6d76f9526b9566 Mon Sep 17 00:00:00 2001
From: "bjornv@webrtc.org"
 <bjornv@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Tue, 29 Nov 2011 08:44:01 +0000
Subject: [PATCH] Name change resampler.c/h to aec_resampler.c/h.

To avoid possible conflict with resampler in common_audio.
Review URL: http://webrtc-codereview.appspot.com/296006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1046 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 src/modules/audio_processing/aec/Android.mk                   | 2 +-
 src/modules/audio_processing/aec/aec.gypi                     | 4 ++--
 .../audio_processing/aec/{resampler.c => aec_resampler.c}     | 3 ++-
 .../audio_processing/aec/{resampler.h => aec_resampler.h}     | 0
 src/modules/audio_processing/aec/echo_cancellation.c          | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename src/modules/audio_processing/aec/{resampler.c => aec_resampler.c} (99%)
 rename src/modules/audio_processing/aec/{resampler.h => aec_resampler.h} (100%)

diff --git a/src/modules/audio_processing/aec/Android.mk b/src/modules/audio_processing/aec/Android.mk
index 158fdc6d5a..698755acdb 100644
--- a/src/modules/audio_processing/aec/Android.mk
+++ b/src/modules/audio_processing/aec/Android.mk
@@ -17,7 +17,7 @@ LOCAL_MODULE := libwebrtc_aec
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     echo_cancellation.c \
-    resampler.c \
+    aec_resampler.c \
     aec_core.c \
     aec_rdft.c \
     aec_core_sse2.c \
diff --git a/src/modules/audio_processing/aec/aec.gypi b/src/modules/audio_processing/aec/aec.gypi
index 7ef89181ad..7e86a900f3 100644
--- a/src/modules/audio_processing/aec/aec.gypi
+++ b/src/modules/audio_processing/aec/aec.gypi
@@ -36,8 +36,8 @@
         'aec_rdft.h',
         'aec_rdft.c',
         'aec_rdft_sse2.c',
-        'resampler.h',
-        'resampler.c',
+        'aec_resampler.h',
+        'aec_resampler.c',
       ],
       'conditions': [
         ['aec_debug_dump==1', {
diff --git a/src/modules/audio_processing/aec/resampler.c b/src/modules/audio_processing/aec/aec_resampler.c
similarity index 99%
rename from src/modules/audio_processing/aec/resampler.c
rename to src/modules/audio_processing/aec/aec_resampler.c
index 468fa8c614..218599d119 100644
--- a/src/modules/audio_processing/aec/resampler.c
+++ b/src/modules/audio_processing/aec/aec_resampler.c
@@ -12,12 +12,13 @@
  * skew by resampling the farend signal.
  */
 
+#include "aec_resampler.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
-#include "resampler.h"
 #include "aec_core.h"
 
 enum { kFrameBufferSize = FRAME_LEN * 4 };
diff --git a/src/modules/audio_processing/aec/resampler.h b/src/modules/audio_processing/aec/aec_resampler.h
similarity index 100%
rename from src/modules/audio_processing/aec/resampler.h
rename to src/modules/audio_processing/aec/aec_resampler.h
diff --git a/src/modules/audio_processing/aec/echo_cancellation.c b/src/modules/audio_processing/aec/echo_cancellation.c
index 44a084893e..67e4a645c6 100644
--- a/src/modules/audio_processing/aec/echo_cancellation.c
+++ b/src/modules/audio_processing/aec/echo_cancellation.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "aec_core.h"
-#include "resampler.h"
+#include "aec_resampler.h"
 #include "ring_buffer.h"
 
 #define BUF_SIZE_FRAMES 50 // buffer size (frames)