actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

RageSoundReader_MP3

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-13 01:34:34 +00:00
parent 2ee22cf86c
commit 83f976f9dd
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader.cpp
+13 -3
View File
@@ -6,6 +6,10 @@
#include "RageSoundReader_WAV.h" #include "RageSoundReader_WAV.h"
#endif #endif
#ifndef NO_MP3_SUPPORT
#include "RageSoundReader_MP3.h"
#endif
#if defined(OGG_ONLY) #if defined(OGG_ONLY)
#include "RageSoundReader_Vorbisfile.h" #include "RageSoundReader_Vorbisfile.h"
#define RageSoundReader_LowLevel RageSoundReader_Vorbisfile #define RageSoundReader_LowLevel RageSoundReader_Vorbisfile
@@ -19,15 +23,21 @@ SoundReader *SoundReader::OpenFile( CString filename, CString error )
{ {
SoundReader_FileReader *NewSample = NULL; 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 * 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 * 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 #ifndef NO_WAV_SUPPORT
if( !GetExtension(filename).CompareNoCase("wav") ) if( !GetExtension(filename).CompareNoCase("wav") )
NewSample = new RageSoundReader_WAV; NewSample = new RageSoundReader_WAV;
#endif #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 ) if( NewSample == NULL )
NewSample = new RageSoundReader_LowLevel; NewSample = new RageSoundReader_LowLevel;