diff options
author | Thom Johansen <thomj@rockbox.org> | 2007-11-22 01:29:14 +0000 |
---|---|---|
committer | Thom Johansen <thomj@rockbox.org> | 2007-11-22 01:29:14 +0000 |
commit | 57a27c69a9f3b9b69aff9360c09f7298ffd7b670 (patch) | |
tree | 252dcf43c2ed5058047d1aac98c00ff24e97f067 /apps/codecs/libspeex/speex/speex.h | |
parent | 14ac7cafc81940f5f389515cb5134e6c52f37813 (diff) | |
download | rockbox-57a27c69a9f3b9b69aff9360c09f7298ffd7b670.tar.gz rockbox-57a27c69a9f3b9b69aff9360c09f7298ffd7b670.zip |
Sync Speex to SVN.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15750 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libspeex/speex/speex.h')
-rw-r--r-- | apps/codecs/libspeex/speex/speex.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/apps/codecs/libspeex/speex/speex.h b/apps/codecs/libspeex/speex/speex.h index 05123d21b2..ffb0714f1c 100644 --- a/apps/codecs/libspeex/speex/speex.h +++ b/apps/codecs/libspeex/speex/speex.h @@ -212,11 +212,6 @@ extern "C" { /** modeID for the defined ultra-wideband mode */ #define SPEEX_MODEID_UWB 2 -#ifdef EPIC_48K -/** modeID for the Epic 48K mode */ -#define SPEEX_MODEID_NB_48K 1000 -#endif - struct SpeexMode; @@ -410,19 +405,16 @@ extern const SpeexMode speex_wb_mode; /** Default "ultra-wideband" mode */ extern const SpeexMode speex_uwb_mode; -#ifdef EPIC_48K -/** 4.8 kbps narrowband mode */ -extern const SpeexMode speex_nb_48k_mode; -#endif - /** List of all modes available */ extern const SpeexMode * const speex_mode_list[SPEEX_NB_MODES]; /** Obtain one of the modes available */ const SpeexMode * speex_lib_get_mode (int mode); -/* We actually override the fucntion in the narrowband case so that we can avoid linking in the wideband stuff */ +#ifndef WIN32 +/* We actually override the function in the narrowband case so that we can avoid linking in the wideband stuff */ #define speex_lib_get_mode(mode) ((mode)==SPEEX_MODEID_NB ? &speex_nb_mode : speex_lib_get_mode (mode)) +#endif #ifdef __cplusplus } |