Removed Speex decoder.

I'll readd this if there's a zlib or public domain Speex decoder available at some point, but I suspect that Opus is more desired at this point in any case.
icculus · Jul 20, 2018 · c2aeae5 · c2aeae5
1 parent 4968abd
commit c2aeae5
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 421 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,7 +50,6 @@ sdlsound_decoder_option(FLAC "Free Lossless Audio Codec" ".FLAC")
 sdlsound_decoder_option(VORBIS "Ogg Vorbis" ".OGG")
 sdlsound_decoder_option(RAW "raw PCM audio" ".RAW")
 sdlsound_decoder_option(SHN "Shorten" ".SHN")
-sdlsound_decoder_option(SPEEX "Speex" ".SPEEX")
 sdlsound_decoder_option(MODPLUG "ModPlug" "various tracker formats")
 sdlsound_decoder_option(MP3 "MPEG-1 Layers I-III" ".MP3, .MP2, .MP1")
 
@@ -112,7 +111,6 @@ set(SDLSOUND_SRCS
     src/SDL_sound_mp3.c
     src/SDL_sound_raw.c
     src/SDL_sound_shn.c
-    src/SDL_sound_speex.c
     src/SDL_sound_voc.c
     src/SDL_sound_vorbis.c
     src/SDL_sound_wav.c
@@ -231,7 +229,6 @@ message_bool_option("FLAC support" SDLSOUND_DECODER_FLAC)
 message_bool_option("VORBIS support" SDLSOUND_DECODER_VORBIS)
 message_bool_option("RAW support" SDLSOUND_DECODER_RAW)
 message_bool_option("SHN support" SDLSOUND_DECODER_SHN)
-message_bool_option("SPEEX support" SDLSOUND_DECODER_SPEEX)
 message_bool_option("MODPLUG support" SDLSOUND_DECODER_MODPLUG)
 message_bool_option("MP3 support" SDLSOUND_DECODER_MP3)
 message_bool_option("COREAUDIO support" SDLSOUND_DECODER_COREAUDIO)

diff --git a/src/SDL_sound.c b/src/SDL_sound.c
@@ -30,7 +30,6 @@ extern const Sound_DecoderFunctions __Sound_DecoderFunctions_RAW;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_SHN;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_FLAC;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_QuickTime;
-extern const Sound_DecoderFunctions __Sound_DecoderFunctions_SPEEX;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_CoreAudio;
 
 typedef struct
@@ -71,9 +70,6 @@ static decoder_element decoders[] =
 #if SOUND_SUPPORTS_FLAC
     { 0, &__Sound_DecoderFunctions_FLAC },
 #endif
-#if SOUND_SUPPORTS_SPEEX
-    { 0, &__Sound_DecoderFunctions_SPEEX },
-#endif
 #if SOUND_SUPPORTS_COREAUDIO
     { 0, &__Sound_DecoderFunctions_CoreAudio },
 #endif

diff --git a/src/SDL_sound.h b/src/SDL_sound.h
@@ -33,7 +33,6 @@
  *   - .MID  (MIDI music converted to Waveform data, internal.)
  *   - .MOD  (MOD files, via internal copy of libModPlug.)
  *   - .OGG  (Ogg files, via internal copy of stb_vorbis.)
- *   - .SPX  (Speex files, via libspeex.)
  *   - .SHN  (Shorten files, internal.)
  *   - .RAW  (Raw sound data in any format, internal.)
  *   - .AU   (Sun's Audio format, internal.)

diff --git a/src/SDL_sound_internal.h b/src/SDL_sound_internal.h
@@ -69,9 +69,6 @@
 #ifndef SOUND_SUPPORTS_FLAC
 #define SOUND_SUPPORTS_FLAC 1
 #endif
-#ifndef SOUND_SUPPORTS_SPEEX
-#define SOUND_SUPPORTS_SPEEX 1
-#endif
 #ifndef SOUND_SUPPORTS_COREAUDIO
 #define SOUND_SUPPORTS_COREAUDIO 1
 #endif