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

Add RageSoundReader_Vorbisfile.

Browse Source 
Remove RageSoundReader_SDL_Sound.
Fix error reporting.
This commit is contained in:
Glenn Maynard
2003-09-13 05:09:35 +00:00
parent fdbd1d9f7f
commit 5701a25f16
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader.cpp
+9 -10
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "RageSoundReader.h"
#include "RageUtil.h"
#include "RageLog.h"
#ifndef NO_WAV_SUPPORT
#include "RageSoundReader_WAV.h"
@@ -10,16 +11,12 @@
#include "RageSoundReader_MP3.h"
#endif
#if defined(OGG_ONLY)
#ifndef NO_VORBIS_SUPPORT
#include "RageSoundReader_Vorbisfile.h"
#define RageSoundReader_LowLevel RageSoundReader_Vorbisfile
#else
#include "RageSoundReader_SDL_Sound.h"
#define RageSoundReader_LowLevel SoundReader_SDL_Sound
#endif
SoundReader *SoundReader::OpenFile( CString filename, CString error )
SoundReader *SoundReader::OpenFile( CString filename, CString &error )
{
SoundReader_FileReader *NewSample = NULL;
@@ -36,11 +33,13 @@ SoundReader *SoundReader::OpenFile( CString filename, CString error )
NewSample = new RageSoundReader_MP3;
#endif
if( !GetExtension(filename).CompareNoCase("mp3") )
NewSample = new SoundReader_SDL_Sound;
#ifndef NO_VORBIS_SUPPORT
if( !GetExtension(filename).CompareNoCase("ogg") )
NewSample = new RageSoundReader_Vorbisfile;
#endif
ASSERT( NewSample );
if( NewSample == NULL )
NewSample = new RageSoundReader_LowLevel;
if( !NewSample->Open(filename) )
{
error = NewSample->GetError();