From 5701a25f16bb71d6e14fe131ad00c73cd62d4d50 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 13 Sep 2003 05:09:35 +0000
Subject: [PATCH] Add RageSoundReader_Vorbisfile. Remove
 RageSoundReader_SDL_Sound. Fix error reporting.

---
 stepmania/src/RageSoundReader.cpp | 19 +++++++++----------
 stepmania/src/RageSoundReader.h   |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/RageSoundReader.cpp b/stepmania/src/RageSoundReader.cpp
index 7babd1d60c..29fc0d0d11 100644
--- a/stepmania/src/RageSoundReader.cpp
+++ b/stepmania/src/RageSoundReader.cpp
@@ -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();
diff --git a/stepmania/src/RageSoundReader.h b/stepmania/src/RageSoundReader.h
index 8a4156aaf2..fc5fc21e8f 100644
--- a/stepmania/src/RageSoundReader.h
+++ b/stepmania/src/RageSoundReader.h
@@ -21,7 +21,7 @@ public:
 
 	bool Error() const { return !error.empty(); }
 	string GetError() const { return error; }
-	static SoundReader *OpenFile( CString filename, CString error );
+	static SoundReader *OpenFile( CString filename, CString &error );
 };
 
 #endif