Merge pull request #894 in FS/freeswitch from…

Merge pull request #894 in FS/freeswitch from ~PIOTRGREGOR/freeswitch:bugfix/FS-9143-avmd-fix-custom-headers-in-events to master

* commit '9e0ade83':
  FS-9143 [avmd] #fix event headers

src/mod/applications/mod_avmd/avmd_amplitude.c

-#ifndef __AVMD_AMPLITUDE_H__
+/*
+ * Contributor(s):
+ *
+ * Eric des Courtis <eric.des.courtis@benbria.com>
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
+ */
 
 
 #include <math.h>
@@ -11,7 +16,3 @@ double avmd_amplitude(circ_buffer_t *b, size_t i, double f) {
     result = sqrt(PSI(b, i) / sin(f * f));
     return result;
 }
-
-
-#endif /* __AVMD_AMPLITUDE_H__ */
-

src/mod/applications/mod_avmd/avmd_amplitude.h

@@ -4,7 +4,7 @@
  * Contributor(s):
  *
  * Eric des Courtis <eric.des.courtis@benbria.com>
- * Piotr Gregor <piotrek.gregor gmail.com>:
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
  */
 
 

src/mod/applications/mod_avmd/avmd_buffer.c

+/*
+ * Contributor(s):
+ *
+ * Eric des Courtis <eric.des.courtis@benbria.com>
+ */
+
+
 #ifndef __BUFFER_H__
 #include "avmd_buffer.h"
 #endif

src/mod/applications/mod_avmd/avmd_buffer.h

 /*
  * @brief   Circular buffer.
  *
- * @author Eric des Courtis
- * @par    Modifications: Piotr Gregor < piotrek.gregor gmail.com >
+ * Contributor(s):
+ *
+ * Eric des Courtis <eric.des.courtis@benbria.com>
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
  */
 
 

src/mod/applications/mod_avmd/avmd_desa2.c

-#ifndef __AVMD_DESA2_H__
-
+/*
+ * Contributor(s):
+ *
+ * Eric des Courtis <eric.des.courtis@benbria.com>
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
+ */
 
 #include <stdio.h>
 #ifdef WIN32
@@ -63,5 +67,3 @@ double avmd_desa2(circ_buffer_t *b, size_t i, double *amplitude) {
     return result;
 
 }
-
-#endif /* __AVMD_DESA2_H__ */

src/mod/applications/mod_avmd/avmd_desa2.h

@@ -4,7 +4,7 @@
  * Contributor(s):
  *
  * Eric des Courtis <eric.des.courtis@benbria.com>
- * Piotr Gregor <piotrek.gregor gmail.com>:
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
  */
 
 

src/mod/applications/mod_avmd/avmd_desa2_tweaked.c

+/* 
+ * Contributor(s):
+ *
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
+ */
+
 #ifndef __AVMD_DESA2_TWEAKED_H__
+    #include "avmd_desa2_tweaked.h"
+#endif
 
 #include <switch.h>
 #include <stdio.h>
+
 #ifdef WIN32
-#include <float.h>
-#define ISNAN(x) (!!(_isnan(x)))
-#define ISINF(x) (isinf(x))
+    #include <float.h>
+    #define ISNAN(x) (!!(_isnan(x)))
+    #define ISINF(x) (isinf(x))
 #else
-int __isnan(double);
-#define ISNAN(x) (__isnan(x))
-#define ISINF(x) (__isinf(x))
+    int __isnan(double);
+    #define ISNAN(x) (__isnan(x))
+    #define ISINF(x) (__isinf(x))
 #endif
+
 #include "avmd_buffer.h"
 #include "avmd_desa2_tweaked.h"
 #include "avmd_options.h"
 
-#ifdef AVMD_FAST_MATH
-#include "avmd_fast_acosf.h"
+#ifndef AVMD_FAST_MATH
+    #include "avmd_fast_acosf.h"
 #endif
 
 
@@ -64,5 +74,3 @@ avmd_desa2_tweaked(circ_buffer_t *b, size_t i, double *amplitude) {
     *amplitude = 2.0 * PSI_Xn / sqrt(PSI_Yn);
     return result;
 }
-
-#endif  /* __AVMD_DESA2_TWEAKED_H__ */

src/mod/applications/mod_avmd/avmd_desa2_tweaked.h

@@ -7,7 +7,11 @@
  *          be checked for convergence in the same time.
  *          If the partial results converge then frequency
  *          converges too.
- * @author  Piotr Gregor < piotrek.gregor gmail.com >
+ *
+ * Contributor(s):
+ *
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
+ *
  * @date    20 Mar 2016
  */
 

src/mod/applications/mod_avmd/avmd_fast_acosf.c

+/* 
+ * Contributor(s):
+ *
+ * Eric des Courtis <eric.des.courtis@benbria.com>
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
+ */
+
+
 #ifndef WIN32   /* currently we support fast acosf computation only on UNIX/Linux */
 
 
 #include <switch.h>
 #include <stdio.h>
 #include <stdlib.h>
+
 #ifndef _MSC_VER
-#include <stdint.h>
+    #include <stdint.h>
 #endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+
 #ifndef _MSC_VER
-#include <sys/mman.h>
+    #include <sys/mman.h>
 #endif
+
 #include <assert.h>
 #include <errno.h>
 #include <math.h>
 #include <string.h>
+
 #ifndef _MSC_VER
-#include <unistd.h>
+    #include <unistd.h>
 #endif
+
 #include "avmd_fast_acosf.h"
 #include "avmd_options.h"
 

src/mod/applications/mod_avmd/avmd_fast_acosf.h

 #ifndef WIN32   /* currently we support fast acosf computation only on UNIX/Linux */
 /*
  * @brief   Fast arithmetic using precomputed arc cosine table.
+ *
  * Contributor(s):
  *
  * Eric des Courtis <eric.des.courtis@benbria.com>
- * Piotr Gregor <piotrek.gregor gmail.com>
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
  */
 
 

src/mod/applications/mod_avmd/avmd_fir.h

 /*
  * @brief   Filters.
- * @author  Piotr Gregor < piotrek.gregor gmail.com >
+ *
+ * Contributor(s):
+ *
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
+ *
  * @date    23 Mar 2016
  */
 

src/mod/applications/mod_avmd/avmd_goertzel.c

-#ifndef __AVMD_GOERTZEL_H__
+/* 
+ * Contributor(s):
+ *
+ * Eric des Courtis <eric.des.courtis@benbria.com>
+ */
 
 
 #include <math.h>
-#include "avmd_goertzel.h"
-#include "avmd_buffer.h"
+
+#ifndef __AVMD_GOERTZEL_H__
+    #include "avmd_goertzel.h"
+#endif
+
+#ifndef __AVMD_BUFFER_H__
+    #include "avmd_buffer.h"
+#endif
 
 
 extern double avmd_goertzel(circ_buffer_t *b, size_t pos, double f, size_t num)
@@ -25,6 +35,3 @@ extern double avmd_goertzel(circ_buffer_t *b, size_t pos, double f, size_t num)
 
     return (p2 * p2) + (p * p) - (coeff * p2 * p);
 }
-
-
-#endif /* __AVMD_GOERTZEL_H__ */

src/mod/applications/mod_avmd/avmd_goertzel.h

 /*
  * @brief   Goertzel algorithm.
- * @author  Eric des Courtis
+ *
+ * Contributor(s):
+ *
+ * Eric des Courtis <eric.des.courtis@benbria.com>
  */
 
 
@@ -9,13 +12,14 @@
 
 
 #ifndef _MSC_VER
-#include <stdint.h>
+    #include <stdint.h>
 #endif
+
 #include "avmd_buffer.h"
 
 #if !defined(M_PI)
-/* C99 systems may not define M_PI */
-#define M_PI 3.14159265358979323846264338327
+    /* C99 systems may not define M_PI */
+    #define M_PI 3.14159265358979323846264338327
 #endif
 
 

src/mod/applications/mod_avmd/avmd_options.h

@@ -5,8 +5,7 @@
  *
  * Contributor(s):
  *
- * Piotr Gregor <piotrek.gregor gmail.com>:
- * Eric des Courtis <eric.des.courtis@benbria.com>
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
  */
 
 

src/mod/applications/mod_avmd/avmd_psi.h

+/*
+ * Contributor(s):
+ *
+ * Eric des Courtis <eric.des.courtis@benbria.com>
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
+ */
+
+
 #ifndef __AVMD_PSI_H__
 #define __AVMD_PSI_H__
 

src/mod/applications/mod_avmd/avmd_sma_buf.h

@@ -4,7 +4,7 @@
  * Contributor(s):
  *
  * Eric des Courtis <eric.des.courtis@benbria.com>
- * Piotr Gregor <piotrek.gregor gmail.com>
+ * Piotr Gregor     <piotrgregor@rsyncme.org>
  */