remove catch() that's preventing us from getting complete backtraces to

unexpected sound driver exceptions
This commit is contained in:
Glenn Maynard
2004-05-23 21:13:19 +00:00
parent f04e70ac0c
commit 838bb0aba4
3 changed files with 14 additions and 19 deletions
+9 -16
View File
@@ -33,24 +33,17 @@ static RageMutex g_SoundManMutex("SoundMan");
RageSoundManager *SOUNDMAN = NULL;
RageSoundManager::RageSoundManager(CString drivers)
RageSoundManager::RageSoundManager()
{
/* needs to be done first */
SOUNDMAN = this;
try
{
MixVolume = 1.0f;
driver = MakeRageSoundDriver(drivers);
if(!driver)
RageException::Throw("Couldn't find a sound driver that works");
} catch(...) {
SOUNDMAN = NULL;
throw;
}
pos_map_queue.reserve( 1024 );
MixVolume = 1.0f;
}
void RageSoundManager::Init( CString drivers )
{
driver = MakeRageSoundDriver(drivers);
if( driver == NULL )
RageException::Throw( "Couldn't find a sound driver that works" );
}
RageSoundManager::~RageSoundManager()
+2 -1
View File
@@ -33,8 +33,9 @@ class RageSoundManager
CircBuf<queued_pos_map_t> pos_map_queue;
public:
RageSoundManager(CString drivers);
RageSoundManager();
~RageSoundManager();
void Init( CString drivers );
float GetMixVolume() const { return MixVolume; }
void SetPrefs(float MixVol);
+3 -2
View File
@@ -1041,8 +1041,9 @@ int main(int argc, char* argv[])
NOTESKIN = new NoteSkinManager;
if( PREFSMAN->m_iSoundWriteAhead )
LOG->Info( "Sound writeahead has been overridden to %i", PREFSMAN->m_iSoundWriteAhead );
SOUNDMAN = new RageSoundManager(PREFSMAN->m_sSoundDrivers);
SOUNDMAN->SetPrefs(PREFSMAN->m_fSoundVolume);
SOUNDMAN = new RageSoundManager;
SOUNDMAN->Init( PREFSMAN->m_sSoundDrivers );
SOUNDMAN->SetPrefs( PREFSMAN->m_fSoundVolume );
SOUND = new RageSounds;
BOOKKEEPER = new Bookkeeper;
LIGHTSMAN = new LightsManager(PREFSMAN->m_sLightsDriver);