Merge pull request #776 in FS/freeswitch from…

Merge pull request #776 in FS/freeswitch from ~PIOTRGREGOR/freeswitch:feature/FS-8988-avmd-rename-files to master

* commit '906e8440':
  FS-8988 Rename files

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

src/mod/applications/mod_avmd/amplitude.c → src/mod/applications/mod_avmd/avmd_amplitude.c

 #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

src/mod/applications/mod_avmd/amplitude.h → src/mod/applications/mod_avmd/avmd_amplitude.h

 #ifndef __AMPLITUDE_H__
 #define __AMPLITUDE_H__
-#include "buffer.h"
+#include "avmd_buffer.h"
 
 extern double amplitude(circ_buffer_t *, size_t i, double f);
 

src/mod/applications/mod_avmd/buffer.c → src/mod/applications/mod_avmd/avmd_buffer.c

 #ifndef __BUFFER_H__
-#include "buffer.h"
+#include "avmd_buffer.h"
 #endif
 
 extern size_t next_power_of_2(size_t v)

src/mod/applications/mod_avmd/desa2.c → 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)

src/mod/applications/mod_avmd/desa2.h → src/mod/applications/mod_avmd/avmd_desa2.h

 #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

src/mod/applications/mod_avmd/fast_acosf.c → 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
 

src/mod/applications/mod_avmd/goertzel.c → src/mod/applications/mod_avmd/avmd_goertzel.c

 #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

src/mod/applications/mod_avmd/goertzel.h → 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 */

src/mod/applications/mod_avmd/psi.h → src/mod/applications/mod_avmd/avmd_psi.h

 #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)))
 

src/mod/applications/mod_avmd/sma_buf.h → 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;

src/mod/applications/mod_avmd/mod_avmd.2010.vcxproj.filters

@@ -6,37 +6,37 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="amplitude.h">
+    <ClInclude Include="avmd_amplitude.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="buffer.h">
+    <ClInclude Include="avmd_buffer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="desa2.h">
+    <ClInclude Include="avmd_desa2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="fast_acosf.h">
+    <ClInclude Include="avmd_fast_acosf.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="goertzel.h">
+    <ClInclude Include="avmd_goertzel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="options.h">
+    <ClInclude Include="avmd_options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="psi.h">
+    <ClInclude Include="avmd_psi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="sma_buf.h">
+    <ClInclude Include="avmd_sma_buf.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="amplitude.c" />
-    <ClCompile Include="buffer.c" />
-    <ClCompile Include="desa2.c" />
-    <ClCompile Include="fast_acosf.c" />
-    <ClCompile Include="goertzel.c" />
+    <ClCompile Include="avmd_amplitude.c" />
+    <ClCompile Include="avmd_buffer.c" />
+    <ClCompile Include="avmd_desa2.c" />
+    <ClCompile Include="avmd_fast_acosf.c" />
+    <ClCompile Include="avmd_goertzel.c" />
     <ClCompile Include="mod_avmd.c" />
   </ItemGroup>
 </Project>
\ No newline at end of file

src/mod/applications/mod_avmd/mod_avmd.2015.vcxproj

@@ -124,21 +124,21 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="amplitude.h" />
-    <ClInclude Include="buffer.h" />
-    <ClInclude Include="desa2.h" />
-    <ClInclude Include="fast_acosf.h" />
-    <ClInclude Include="goertzel.h" />
-    <ClInclude Include="options.h" />
-    <ClInclude Include="psi.h" />
-    <ClInclude Include="sma_buf.h" />
+    <ClInclude Include="avmd_amplitude.h" />
+    <ClInclude Include="avmd_buffer.h" />
+    <ClInclude Include="avmd_desa2.h" />
+    <ClInclude Include="avmd_fast_acosf.h" />
+    <ClInclude Include="avmd_goertzel.h" />
+    <ClInclude Include="avmd_options.h" />
+    <ClInclude Include="avmd_psi.h" />
+    <ClInclude Include="avmd_sma_buf.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="amplitude.c" />
-    <ClCompile Include="buffer.c" />
-    <ClCompile Include="desa2.c" />
-    <ClCompile Include="fast_acosf.c" />
-    <ClCompile Include="goertzel.c" />
+    <ClCompile Include="avmd_amplitude.c" />
+    <ClCompile Include="avmd_buffer.c" />
+    <ClCompile Include="avmd_desa2.c" />
+    <ClCompile Include="avmd_fast_acosf.c" />
+    <ClCompile Include="avmd_goertzel.c" />
     <ClCompile Include="mod_avmd.c" />
   </ItemGroup>
   <ItemGroup>

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