From 0adb8db91f1e52d3dbfee6675dd4d0ed5d0d080e Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 2 Jan 2003 08:16:48 +0000
Subject: [PATCH] get rid of RageSoundBass and RageSoundSample

---
 stepmania/src/Crash.cpp        |  9 ---------
 stepmania/src/StepMania.cpp    |  3 ---
 stepmania/src/StepMania.dsp    | 16 ----------------
 stepmania/src/StepMania.vcproj | 12 ------------
 4 files changed, 40 deletions(-)

diff --git a/stepmania/src/Crash.cpp b/stepmania/src/Crash.cpp
index 2151086f79..a0fdde65ca 100644
--- a/stepmania/src/Crash.cpp
+++ b/stepmania/src/Crash.cpp
@@ -267,7 +267,6 @@ static void DoEraseEmergencyDump()
 	DeleteFile(szEmergencyDumpName);
 }
 
-#include "RageSoundBass.h"
 extern HWND g_hWndMain;
 long __stdcall CrashHandler(EXCEPTION_POINTERS *pExc) {
 	/* If we're fullscreen, the fullscreen d3d window will obscure
@@ -386,14 +385,6 @@ long __stdcall CrashHandler(EXCEPTION_POINTERS *pExc) {
 
 	VDDebugInfoDeinit(&g_debugInfo);
 
-	/* Major hack:
-	 * Bass crashes if we close without freeing it, even if it's by
-	 * crashing ourselves.  Now, it's far from safe to call these functions
-	 * after a crash, but if we don't it'll crash anyway, so we have
-	 * nothing to lose. */
-	delete SOUND;
-	SOUND = NULL;
-
 	/* We've made it.  Delete the emergency dump. */
 	DoEraseEmergencyDump();
 	InHere = false;
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 50d4b759a3..5c905e4e8d 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -16,7 +16,6 @@
 #include "RageLog.h"
 #include "RageDisplay.h"
 #include "RageTextureManager.h"
-#include "RageSoundBass.h"
 #include "RageSoundManager.h"
 #include "RageInput.h"
 #include "RageTimer.h"
@@ -197,7 +196,6 @@ int main(int argc, char* argv[])
 	PREFSMAN	= new PrefsManager;
 	GAMEMAN		= new GameManager;
 	THEME		= new ThemeManager;
-	SOUND		= new RageSoundBass;
 	SOUNDMAN	= new RageSoundManager(PREFSMAN->m_bSoundDrivers);
 	ANNOUNCER	= new AnnouncerManager;
 	INPUTFILTER	= new InputFilter;
@@ -293,7 +291,6 @@ int main(int argc, char* argv[])
 	SAFE_DELETE( THEME );
 	SAFE_DELETE( ANNOUNCER );
 	SAFE_DELETE( INPUTMAN );
-	SAFE_DELETE( SOUND );
 	SAFE_DELETE( SOUNDMAN );
 	SAFE_DELETE( FONT );
 	SAFE_DELETE( TEXTUREMAN );
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 267efc8f79..5f4239491b 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -230,14 +230,6 @@ SOURCE=.\RageSound.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\RageSoundBass.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\RageSoundBass.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\RageSoundManager.cpp
 # End Source File
 # Begin Source File
@@ -258,14 +250,6 @@ SOURCE=.\RageSoundReader_SDL_Sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\RageSoundSample.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\RageSoundSample.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\RageTexture.cpp
 # End Source File
 # Begin Source File
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index 46b9b546ab..0b998ad882 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -1158,12 +1158,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="RageSound.h">
 			</File>
-			<File
-				RelativePath=".\RageSoundBass.cpp">
-			</File>
-			<File
-				RelativePath=".\RageSoundBass.h">
-			</File>
 			<File
 				RelativePath="RageSoundManager.cpp">
 			</File>
@@ -1179,12 +1173,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="RageSoundReader_SDL_Sound.h">
 			</File>
-			<File
-				RelativePath=".\RageSoundSample.cpp">
-			</File>
-			<File
-				RelativePath=".\RageSoundSample.h">
-			</File>
 			<File
 				RelativePath=".\RageTexture.cpp">
 			</File>