FS-8988 Rename files

diff --git a/src/mod/applications/mod_avmd/Makefile.am b/src/mod/applications/mod_avmd/Makefile.am
index ce877babf758bf1c8ecca38671b9f0c2c0c952d9..ed791ce208dc603f6ea2d7623c351924c4e0755a 100644 (file)
--- a/src/mod/applications/mod_avmd/Makefile.am
+++ b/src/mod/applications/mod_avmd/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_avmd
 
 mod_LTLIBRARIES = mod_avmd.la
-mod_avmd_la_SOURCES  = mod_avmd.c amplitude.c buffer.c desa2.c goertzel.c fast_acosf.c
+mod_avmd_la_SOURCES  = mod_avmd.c avmd_amplitude.c avmd_buffer.c avmd_desa2.c avmd_goertzel.c avmd_fast_acosf.c
 mod_avmd_la_CFLAGS   = $(AM_CFLAGS) $(AM_MOD_AVMD_CXXFLAGS)
 mod_avmd_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_avmd_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

diff --git a/src/mod/applications/mod_avmd/amplitude.c b/src/mod/applications/mod_avmd/avmd_amplitude.c
similarity index 88%
rename from src/mod/applications/mod_avmd/amplitude.c
rename to src/mod/applications/mod_avmd/avmd_amplitude.c
index 1f9d75208ed87e8a40f126f5c57a531e10e92c0d..e9222de2668c3f28741086bdd4f7f9d1f73745cc 100644 (file)
--- a/src/mod/applications/mod_avmd/amplitude.c
+++ b/src/mod/applications/mod_avmd/avmd_amplitude.c
@@ -1,7 +1,7 @@
 #ifndef __AMPLITUDE_H__
 #include <math.h>
-#include "amplitude.h"
-#include "psi.h"
+#include "avmd_amplitude.h"
+#include "avmd_psi.h"
 
 /*! \brief
  * @author Eric des Courtis

diff --git a/src/mod/applications/mod_avmd/amplitude.h b/src/mod/applications/mod_avmd/avmd_amplitude.h
similarity index 82%
rename from src/mod/applications/mod_avmd/amplitude.h
rename to src/mod/applications/mod_avmd/avmd_amplitude.h
index 4d67bd9dc91a41118ed14df991305c9c7a2bc695..04db43f048f52fb98354fe1a242bca3c89acb064 100644 (file)
--- a/src/mod/applications/mod_avmd/amplitude.h
+++ b/src/mod/applications/mod_avmd/avmd_amplitude.h
@@ -1,6 +1,6 @@
 #ifndef __AMPLITUDE_H__
 #define __AMPLITUDE_H__
-#include "buffer.h"
+#include "avmd_buffer.h"
 
 extern double amplitude(circ_buffer_t *, size_t i, double f);
 

diff --git a/src/mod/applications/mod_avmd/buffer.c b/src/mod/applications/mod_avmd/avmd_buffer.c
similarity index 90%
rename from src/mod/applications/mod_avmd/buffer.c
rename to src/mod/applications/mod_avmd/avmd_buffer.c
index f240f5b9892646310d9438429e7a0c686d3c49cf..a1fe28fd672e207a75f44051fe4ec6dfb7b11e7d 100644 (file)
--- a/src/mod/applications/mod_avmd/buffer.c
+++ b/src/mod/applications/mod_avmd/avmd_buffer.c
@@ -1,5 +1,5 @@
 #ifndef __BUFFER_H__
-#include "buffer.h"
+#include "avmd_buffer.h"
 #endif
 
 extern size_t next_power_of_2(size_t v)

diff --git a/src/mod/applications/mod_avmd/buffer.h b/src/mod/applications/mod_avmd/avmd_buffer.h
similarity index 100%
rename from src/mod/applications/mod_avmd/buffer.h
rename to src/mod/applications/mod_avmd/avmd_buffer.h

diff --git a/src/mod/applications/mod_avmd/desa2.c b/src/mod/applications/mod_avmd/avmd_desa2.c
similarity index 89%
rename from src/mod/applications/mod_avmd/desa2.c
rename to src/mod/applications/mod_avmd/avmd_desa2.c
index bb19ad1f449b1a9b83a0b891d8fe1aa9f68127cc..e96f4b013bdea31b3562384054c7c6223f33931a 100644 (file)
--- a/src/mod/applications/mod_avmd/desa2.c
+++ b/src/mod/applications/mod_avmd/avmd_desa2.c
@@ -6,12 +6,12 @@
 #else
 #define ISNAN(x) (isnan(x))
 #endif
-#include "buffer.h"
-#include "desa2.h"
-#include "options.h"
+#include "avmd_buffer.h"
+#include "avmd_desa2.h"
+#include "avmd_options.h"
 
 #ifdef AVMD_FAST_MATH
-#include "fast_acosf.h"
+#include "avmd_fast_acosf.h"
 #endif
 
 extern double desa2(circ_buffer_t *b, size_t i)

diff --git a/src/mod/applications/mod_avmd/desa2.h b/src/mod/applications/mod_avmd/avmd_desa2.h
similarity index 82%
rename from src/mod/applications/mod_avmd/desa2.h
rename to src/mod/applications/mod_avmd/avmd_desa2.h
index 8cd70c4063e59776adebdf5dadd32ba3e9dd4571..a22af5e72cdf6ee170fc1bbad1a0ec68f6938b1b 100644 (file)
--- a/src/mod/applications/mod_avmd/desa2.h
+++ b/src/mod/applications/mod_avmd/avmd_desa2.h
@@ -1,7 +1,7 @@
 #ifndef __DESA2_H__
 #define __DESA2_H__
 #include <math.h>
-#include "buffer.h"
+#include "avmd_buffer.h"
 
 extern double desa2(circ_buffer_t *b, size_t i);
 #endif

diff --git a/src/mod/applications/mod_avmd/fast_acosf.c b/src/mod/applications/mod_avmd/avmd_fast_acosf.c
similarity index 99%
rename from src/mod/applications/mod_avmd/fast_acosf.c
rename to src/mod/applications/mod_avmd/avmd_fast_acosf.c
index b959d0b64001737d5353fb253e3d0b784dd035a9..985e95b6f709e2b0fd12e0e0186cec114b99d18a 100644 (file)
--- a/src/mod/applications/mod_avmd/fast_acosf.c
+++ b/src/mod/applications/mod_avmd/avmd_fast_acosf.c
@@ -17,8 +17,8 @@
 #ifndef _MSC_VER
 #include <unistd.h>
 #endif
-#include "fast_acosf.h"
-#include "options.h"
+#include "avmd_fast_acosf.h"
+#include "avmd_options.h"
 
 #ifdef AVMD_FAST_MATH
 

diff --git a/src/mod/applications/mod_avmd/fast_acosf.h b/src/mod/applications/mod_avmd/avmd_fast_acosf.h
similarity index 100%
rename from src/mod/applications/mod_avmd/fast_acosf.h
rename to src/mod/applications/mod_avmd/avmd_fast_acosf.h

diff --git a/src/mod/applications/mod_avmd/goertzel.c b/src/mod/applications/mod_avmd/avmd_goertzel.c
similarity index 93%
rename from src/mod/applications/mod_avmd/goertzel.c
rename to src/mod/applications/mod_avmd/avmd_goertzel.c
index c4edb42b54816103cedf904733fc89467fda1059..ab52e8d256b78825dab4d62c229104991896aa65 100644 (file)
--- a/src/mod/applications/mod_avmd/goertzel.c
+++ b/src/mod/applications/mod_avmd/avmd_goertzel.c
@@ -1,7 +1,7 @@
 #ifndef __GOERTZEL_H__
 #include <math.h>
-#include "goertzel.h"
-#include "buffer.h"
+#include "avmd_goertzel.h"
+#include "avmd_buffer.h"
 
 /*! \brief Identify frequency components of a signal
  * @author Eric des Courtis

diff --git a/src/mod/applications/mod_avmd/goertzel.h b/src/mod/applications/mod_avmd/avmd_goertzel.h
similarity index 92%
rename from src/mod/applications/mod_avmd/goertzel.h
rename to src/mod/applications/mod_avmd/avmd_goertzel.h
index a735cf8ce317e3f058e7a976a0a59c83d2146f1d..a2bc032189131f69fd409c8eebef35d8663882f0 100644 (file)
--- a/src/mod/applications/mod_avmd/goertzel.h
+++ b/src/mod/applications/mod_avmd/avmd_goertzel.h
@@ -4,7 +4,7 @@
 #ifndef _MSC_VER
 #include <stdint.h>
 #endif
-#include "buffer.h"
+#include "avmd_buffer.h"
 
 #if !defined(M_PI)
 /* C99 systems may not define M_PI */

diff --git a/src/mod/applications/mod_avmd/options.h b/src/mod/applications/mod_avmd/avmd_options.h
similarity index 100%
rename from src/mod/applications/mod_avmd/options.h
rename to src/mod/applications/mod_avmd/avmd_options.h

diff --git a/src/mod/applications/mod_avmd/psi.h b/src/mod/applications/mod_avmd/avmd_psi.h
similarity index 87%
rename from src/mod/applications/mod_avmd/psi.h
rename to src/mod/applications/mod_avmd/avmd_psi.h
index fc98498ef95253166e1ac2d9e960d30bd5436fc7..341540eb141f222857a35e1d581d67b0ddd620c3 100644 (file)
--- a/src/mod/applications/mod_avmd/psi.h
+++ b/src/mod/applications/mod_avmd/avmd_psi.h
@@ -1,6 +1,6 @@
 #ifndef __PSI_H__
 #define __PSI_H__
-#include "buffer.h"
+#include "avmd_buffer.h"
 
 #define PSI(b, i) (GET_SAMPLE((b), ((i) + 1))*GET_SAMPLE((b), ((i) + 1))-GET_SAMPLE((b), ((i) + 2))*GET_SAMPLE((b), ((i) + 0)))
 

diff --git a/src/mod/applications/mod_avmd/sma_buf.h b/src/mod/applications/mod_avmd/avmd_sma_buf.h
similarity index 98%
rename from src/mod/applications/mod_avmd/sma_buf.h
rename to src/mod/applications/mod_avmd/avmd_sma_buf.h
index 55a50719d4b843ebccb43a91ca33ce500a471c12..08790e6e69c588f9f25d4e559da9714b3eb9606c 100644 (file)
--- a/src/mod/applications/mod_avmd/sma_buf.h
+++ b/src/mod/applications/mod_avmd/avmd_sma_buf.h
@@ -7,7 +7,7 @@
 #endif
 #include <string.h>
 #include <assert.h>
-#include "buffer.h"
+#include "avmd_buffer.h"
 
 typedef struct {
     size_t len;

diff --git a/src/mod/applications/mod_avmd/mod_avmd.2010.vcxproj.filters b/src/mod/applications/mod_avmd/mod_avmd.2010.vcxproj.filters
index 5851eab5b66f4024a75679490ca0c156d95b0108..e173af184d976f046ccdaf057438a5233ba36e07 100644 (file)
--- a/src/mod/applications/mod_avmd/mod_avmd.2010.vcxproj.filters
+++ b/src/mod/applications/mod_avmd/mod_avmd.2010.vcxproj.filters
@@ -6,37 +6,37 @@
     </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="amplitude.h">\r
+    <ClInclude Include="avmd_amplitude.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="buffer.h">\r
+    <ClInclude Include="avmd_buffer.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="desa2.h">\r
+    <ClInclude Include="avmd_desa2.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="fast_acosf.h">\r
+    <ClInclude Include="avmd_fast_acosf.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="goertzel.h">\r
+    <ClInclude Include="avmd_goertzel.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="options.h">\r
+    <ClInclude Include="avmd_options.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="psi.h">\r
+    <ClInclude Include="avmd_psi.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="sma_buf.h">\r
+    <ClInclude Include="avmd_sma_buf.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="amplitude.c" />\r
-    <ClCompile Include="buffer.c" />\r
-    <ClCompile Include="desa2.c" />\r
-    <ClCompile Include="fast_acosf.c" />\r
-    <ClCompile Include="goertzel.c" />\r
+    <ClCompile Include="avmd_amplitude.c" />\r
+    <ClCompile Include="avmd_buffer.c" />\r
+    <ClCompile Include="avmd_desa2.c" />\r
+    <ClCompile Include="avmd_fast_acosf.c" />\r
+    <ClCompile Include="avmd_goertzel.c" />\r
     <ClCompile Include="mod_avmd.c" />\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/src/mod/applications/mod_avmd/mod_avmd.2015.vcxproj b/src/mod/applications/mod_avmd/mod_avmd.2015.vcxproj
index bc16951ed3b9212f2d43b5a0f0fada46583d03ab..046667c95b25e78771065c775c488c35dc753a67 100644 (file)
--- a/src/mod/applications/mod_avmd/mod_avmd.2015.vcxproj
+++ b/src/mod/applications/mod_avmd/mod_avmd.2015.vcxproj
@@ -124,21 +124,21 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="amplitude.h" />\r
-    <ClInclude Include="buffer.h" />\r
-    <ClInclude Include="desa2.h" />\r
-    <ClInclude Include="fast_acosf.h" />\r
-    <ClInclude Include="goertzel.h" />\r
-    <ClInclude Include="options.h" />\r
-    <ClInclude Include="psi.h" />\r
-    <ClInclude Include="sma_buf.h" />\r
+    <ClInclude Include="avmd_amplitude.h" />\r
+    <ClInclude Include="avmd_buffer.h" />\r
+    <ClInclude Include="avmd_desa2.h" />\r
+    <ClInclude Include="avmd_fast_acosf.h" />\r
+    <ClInclude Include="avmd_goertzel.h" />\r
+    <ClInclude Include="avmd_options.h" />\r
+    <ClInclude Include="avmd_psi.h" />\r
+    <ClInclude Include="avmd_sma_buf.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="amplitude.c" />\r
-    <ClCompile Include="buffer.c" />\r
-    <ClCompile Include="desa2.c" />\r
-    <ClCompile Include="fast_acosf.c" />\r
-    <ClCompile Include="goertzel.c" />\r
+    <ClCompile Include="avmd_amplitude.c" />\r
+    <ClCompile Include="avmd_buffer.c" />\r
+    <ClCompile Include="avmd_desa2.c" />\r
+    <ClCompile Include="avmd_fast_acosf.c" />\r
+    <ClCompile Include="avmd_goertzel.c" />\r
     <ClCompile Include="mod_avmd.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r

diff --git a/src/mod/applications/mod_avmd/mod_avmd.c b/src/mod/applications/mod_avmd/mod_avmd.c
index e7f56d06d0ff9b4c5f8b833d04a71dbe0eeb1b1f..357cb30a5c98085005d619382d1e4f0ebc949278 100644 (file)
--- a/src/mod/applications/mod_avmd/mod_avmd.c
+++ b/src/mod/applications/mod_avmd/mod_avmd.c
@@ -43,16 +43,16 @@
 #endif
 
 
-#include "amplitude.h"
-#include "buffer.h"
-#include "desa2.h"
-//#include "goertzel.h"
-#include "psi.h"
-#include "sma_buf.h"
-#include "options.h"
+#include "avmd_amplitude.h"
+#include "avmd_buffer.h"
+#include "avmd_desa2.h"
+//#include "avmd_goertzel.h"
+#include "avmd_psi.h"
+#include "avmd_sma_buf.h"
+#include "avmd_options.h"
 
 #ifdef AVMD_FAST_MATH
-#include "fast_acosf.h"
+#include "avmd_fast_acosf.h"
 #endif