remove DISABLE_GLOBAL_POINTERS stuff from speexdec,

and switch to speex_lib_get_mode()

git-svn-id: http://svn.xiph.org/trunk/speex@7558 0101bb08-14d6-0310-b084-bc0e0c8e3800

diff --git a/src/speexdec.c b/src/speexdec.c
index f0a8982..512f506 100644 (file)
--- a/src/speexdec.c
+++ b/src/speexdec.c
@@ -86,10 +86,6 @@
 #include <speex/speex_callbacks.h>
 #include "misc.h"
 
-#ifdef DISABLE_GLOBAL_POINTERS
-#include <speex/speex_noglobals.h>
-#endif
-
 #define MAX_FRAME_SIZE 2000
 
 #define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \
@@ -328,11 +324,7 @@ static void *process_header(ogg_packet *op, int enh_enabled, int *frame_size, in
    if (forceMode!=-1)
       modeID = forceMode;
 
-#ifdef DISABLE_GLOBAL_POINTERS
-   mode = speex_mode_new (modeID);
-#else
-   mode = speex_mode_list[modeID];
-#endif
+   mode = speex_lib_get_mode (modeID);
    
    if (header->speex_version_id > 1)
    {