From 83f976f9ddb426866571957192772a8dd7963fdb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 13 Sep 2003 01:34:34 +0000 Subject: [PATCH] RageSoundReader_MP3 --- stepmania/src/RageSoundReader.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/stepmania/src/RageSoundReader.cpp b/stepmania/src/RageSoundReader.cpp index 5b41d9b549..7babd1d60c 100644 --- a/stepmania/src/RageSoundReader.cpp +++ b/stepmania/src/RageSoundReader.cpp @@ -6,6 +6,10 @@ #include "RageSoundReader_WAV.h" #endif +#ifndef NO_MP3_SUPPORT +#include "RageSoundReader_MP3.h" +#endif + #if defined(OGG_ONLY) #include "RageSoundReader_Vorbisfile.h" #define RageSoundReader_LowLevel RageSoundReader_Vorbisfile @@ -19,15 +23,21 @@ SoundReader *SoundReader::OpenFile( CString filename, CString error ) { SoundReader_FileReader *NewSample = NULL; - /* First try based on extension. If that fails, try all other decoders. + /* XXX: First try based on extension. If that fails, try all other decoders. * Optimally, we should have separate error returns indicating "this isn't * an XXX file" vs. "this is an XXX file, but we don't support something in - * it", for better error string returns. - */ + * it", for better error string returns. */ #ifndef NO_WAV_SUPPORT if( !GetExtension(filename).CompareNoCase("wav") ) NewSample = new RageSoundReader_WAV; #endif +#ifndef NO_MP3_SUPPORT + if( !GetExtension(filename).CompareNoCase("mp3") ) + NewSample = new RageSoundReader_MP3; +#endif + + if( !GetExtension(filename).CompareNoCase("mp3") ) + NewSample = new SoundReader_SDL_Sound; if( NewSample == NULL ) NewSample = new RageSoundReader_LowLevel;