Changeset 2215:956f710f3279 in roaraudio

Timestamp:

07/27/09 21:55:22 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

test for speex api version

File:

• roarclients/roarphone.c (modified) (3 diffs)

roarclients/roarphone.c

@@ -27 +27 @@
 #include "driver.h"
 
-#ifdef ROAR_HAVE_LIBSPEEX
+#if defined(ROAR_HAVE_LIBSPEEX) && !defined(ROAR_HAVE_LIBSPEEXDSP)
+#define _SPEEX_API_OLD
+#elif defined(ROAR_HAVE_LIBSPEEX) && defined(ROAR_HAVE_LIBSPEEXDSP)
+#define _SPEEX_API_NEW
+#endif
+
+#ifdef _SPEEX_API_OLD
 #include <speex/speex_echo.h>
 #endif
@@ -76 +82 @@
 }
 
-#ifdef ROAR_HAVE_LIBSPEEX
+#ifdef _SPEEX_API_OLD
 int anti_echo_speex16(int16_t * buf, int16_t * aebuf, size_t len, struct roar_audio_info * info) {
  static SpeexEchoState * state = NULL;
@@ -131 +137 @@
      buf[i] -= aebuf[i];
    break;
-#ifdef ROAR_HAVE_LIBSPEEX
+#ifdef _SPEEX_API_OLD
   case AE_SPEEX:
     return anti_echo_speex16(buf, aebuf, len, info);