From 906e844010a4f8e9d3733160ed7410900ee1e292 Mon Sep 17 00:00:00 2001 From: Piotr Gregor Date: Tue, 29 Mar 2016 20:53:31 +0100 Subject: [PATCH] FS-8988 Rename files --- src/mod/applications/mod_avmd/Makefile.am | 2 +- .../{amplitude.c => avmd_amplitude.c} | 4 +-- .../{amplitude.h => avmd_amplitude.h} | 2 +- .../mod_avmd/{buffer.c => avmd_buffer.c} | 2 +- .../mod_avmd/{buffer.h => avmd_buffer.h} | 0 .../mod_avmd/{desa2.c => avmd_desa2.c} | 8 +++--- .../mod_avmd/{desa2.h => avmd_desa2.h} | 2 +- .../{fast_acosf.c => avmd_fast_acosf.c} | 4 +-- .../{fast_acosf.h => avmd_fast_acosf.h} | 0 .../mod_avmd/{goertzel.c => avmd_goertzel.c} | 4 +-- .../mod_avmd/{goertzel.h => avmd_goertzel.h} | 2 +- .../mod_avmd/{options.h => avmd_options.h} | 0 .../mod_avmd/{psi.h => avmd_psi.h} | 2 +- .../mod_avmd/{sma_buf.h => avmd_sma_buf.h} | 2 +- .../mod_avmd/mod_avmd.2010.vcxproj.filters | 26 +++++++++---------- .../mod_avmd/mod_avmd.2015.vcxproj | 26 +++++++++---------- src/mod/applications/mod_avmd/mod_avmd.c | 16 ++++++------ 17 files changed, 51 insertions(+), 51 deletions(-) rename src/mod/applications/mod_avmd/{amplitude.c => avmd_amplitude.c} (88%) rename src/mod/applications/mod_avmd/{amplitude.h => avmd_amplitude.h} (82%) rename src/mod/applications/mod_avmd/{buffer.c => avmd_buffer.c} (90%) rename src/mod/applications/mod_avmd/{buffer.h => avmd_buffer.h} (100%) rename src/mod/applications/mod_avmd/{desa2.c => avmd_desa2.c} (89%) rename src/mod/applications/mod_avmd/{desa2.h => avmd_desa2.h} (82%) rename src/mod/applications/mod_avmd/{fast_acosf.c => avmd_fast_acosf.c} (99%) rename src/mod/applications/mod_avmd/{fast_acosf.h => avmd_fast_acosf.h} (100%) rename src/mod/applications/mod_avmd/{goertzel.c => avmd_goertzel.c} (93%) rename src/mod/applications/mod_avmd/{goertzel.h => avmd_goertzel.h} (92%) rename src/mod/applications/mod_avmd/{options.h => avmd_options.h} (100%) rename src/mod/applications/mod_avmd/{psi.h => avmd_psi.h} (87%) rename src/mod/applications/mod_avmd/{sma_buf.h => avmd_sma_buf.h} (98%) diff --git a/src/mod/applications/mod_avmd/Makefile.am b/src/mod/applications/mod_avmd/Makefile.am index ce877babf7..ed791ce208 100644 --- 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 1f9d75208e..e9222de266 100644 --- 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 -#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 4d67bd9dc9..04db43f048 100644 --- 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 f240f5b989..a1fe28fd67 100644 --- 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 bb19ad1f44..e96f4b013b 100644 --- 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 8cd70c4063..a22af5e72c 100644 --- 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 -#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 b959d0b640..985e95b6f7 100644 --- 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 #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 c4edb42b54..ab52e8d256 100644 --- 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 -#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 a735cf8ce3..a2bc032189 100644 --- 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 #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 fc98498ef9..341540eb14 100644 --- 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 55a50719d4..08790e6e69 100644 --- 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 #include -#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 5851eab5b6..e173af184d 100644 --- 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 @@ - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - - - - - + + + + + \ 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 bc16951ed3..046667c95b 100644 --- a/src/mod/applications/mod_avmd/mod_avmd.2015.vcxproj +++ b/src/mod/applications/mod_avmd/mod_avmd.2015.vcxproj @@ -124,21 +124,21 @@ - - - - - - - - + + + + + + + + - - - - - + + + + + diff --git a/src/mod/applications/mod_avmd/mod_avmd.c b/src/mod/applications/mod_avmd/mod_avmd.c index e7f56d06d0..357cb30a5c 100644 --- 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