comparison SDL_sound.c @ 562:7e08477b0fc1

MP3 decoder upgrade work. Ripped out SMPEG and mpglib support, replaced it with "mpg123.c" and libmpg123. libmpg123 is a much better version of mpglib, so it should solve all the problems about MP3's not seeking, or most modern MP3's not playing at all, etc. Since you no longer have to make a tradeoff with SMPEG for features, and SMPEG is basically rotting, I removed it from the project. There is still work to be done with libmpg123...there are MMX, 3DNow, SSE, Altivec, etc decoders which we don't have enabled at the moment, and the build system could use some work to make this compile more cleanly, etc. Still: huge win.
author Ryan C. Gordon <icculus@icculus.org>
date Fri, 30 Jan 2009 02:44:47 -0500
parents e9a6286d9243
children 8d62447b75f2
comparison
equal deleted inserted replaced
561:f2985e08589c 562:7e08477b0fc1
46 46
47 47
48 /* The various decoder drivers... */ 48 /* The various decoder drivers... */
49 49
50 /* All these externs may be missing; we check SOUND_SUPPORTS_xxx before use. */ 50 /* All these externs may be missing; we check SOUND_SUPPORTS_xxx before use. */
51 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_SMPEG; 51 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MPG123;
52 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MPGLIB;
53 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MIKMOD; 52 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MIKMOD;
54 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MODPLUG; 53 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MODPLUG;
55 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_WAV; 54 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_WAV;
56 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_AIFF; 55 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_AIFF;
57 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_AU; 56 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_AU;
70 const Sound_DecoderFunctions *funcs; 69 const Sound_DecoderFunctions *funcs;
71 } decoder_element; 70 } decoder_element;
72 71
73 static decoder_element decoders[] = 72 static decoder_element decoders[] =
74 { 73 {
75 #if (defined SOUND_SUPPORTS_SMPEG) 74 #if (defined SOUND_SUPPORTS_MPG123)
76 { 0, &__Sound_DecoderFunctions_SMPEG }, 75 { 0, &__Sound_DecoderFunctions_MPG123 },
77 #endif
78
79 #if (defined SOUND_SUPPORTS_MPGLIB)
80 { 0, &__Sound_DecoderFunctions_MPGLIB },
81 #endif 76 #endif
82 77
83 #if (defined SOUND_SUPPORTS_MODPLUG) 78 #if (defined SOUND_SUPPORTS_MODPLUG)
84 { 0, &__Sound_DecoderFunctions_MODPLUG }, 79 { 0, &__Sound_DecoderFunctions_MODPLUG },
85 #endif 80 #endif