Changeset 345:249bb170cc83 in mediastreamer2

Timestamp:

Mar 16, 2009 9:31:01 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

fix for linux compilation

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@348 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

File:

• linphone/mediastreamer2/src/msconf.c (modified) (3 diffs)

linphone/mediastreamer2/src/msconf.c

@@ -17 +17 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
+
+#ifdef HAVE_CONFIG_H
+#include "mediastreamer-config.h"
+#endif
 
 #include "mediastreamer2/msfilter.h"
@@ -259 +263 @@
         double mystat = 0;
         float fftmul = 1.0 / (32768.0);
-
+        int i;
+        
         speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_GET_PSD_SIZE, &ps_size);
         ps = (spx_int32_t*)ortp_malloc(sizeof(spx_int32_t)*ps_size);
@@ -266 +271 @@
 
         mystat = 0;
-        for (int i=ps_size/2;i < ps_size; i++) {
+        for (i=ps_size/2;i < ps_size; i++) {
                 double yp;
+#if defined(__cplusplus)
                 yp = sqrtf(sqrtf(static_cast<float>(ps[i]))) - 1.0f;
+#else
+                yp = sqrtf(sqrtf((float)(ps[i]))) - 1.0f;
+#endif
                 yp = yp * fftmul;
                 yp = MIN(yp * 3000.0, 1.0);