From e80dcafbdd8f14b9c400f998a33b108fa15616c7 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 7 Oct 2005 05:29:33 +0000 Subject: [PATCH] tracking down volume related assert --- stepmania/src/PrefsManager.cpp | 2 +- stepmania/src/RageSoundManager.cpp | 2 ++ stepmania/src/arch/Sound/DSoundHelpers.cpp | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 774dd2bc79..780272cc6b 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -398,7 +398,7 @@ float PrefsManager::GetSoundVolume() if ( m_fSoundVolume==-1 ) return DEFAULT_SOUND_VOLUME; else - return m_fSoundVolume; + return clamp(m_fSoundVolume,0.0f,1.0f); } CString PrefsManager::GetInputDrivers() { diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp index 8130ac1022..9d7da2fa64 100644 --- a/stepmania/src/RageSoundManager.cpp +++ b/stepmania/src/RageSoundManager.cpp @@ -331,6 +331,8 @@ void RageSoundManager::PlayOnce( CString sPath ) void RageSoundManager::SetMixVolume( float fMixVol ) { + ASSERT_M( fMixVol >= 0 && fVolume <= 1, ssprintf("%f",fMixVol) ); + g_SoundManMutex.Lock(); /* lock for access to m_fMixVolume */ m_fMixVolume = fMixVol; g_SoundManMutex.Unlock(); /* finished with m_fMixVolume */ diff --git a/stepmania/src/arch/Sound/DSoundHelpers.cpp b/stepmania/src/arch/Sound/DSoundHelpers.cpp index d108363f17..6c12288a6c 100644 --- a/stepmania/src/arch/Sound/DSoundHelpers.cpp +++ b/stepmania/src/arch/Sound/DSoundHelpers.cpp @@ -305,8 +305,7 @@ void DSoundBuf::SetSampleRate( int hz ) void DSoundBuf::SetVolume( float fVolume ) { - ASSERT( fVolume >= 0 ); - ASSERT( fVolume <= 1 ); + ASSERT_M( fVolume >= 0 && fVolume <= 1, ssprintf("%f",fVolume) ); if( fVolume == 0 ) fVolume = 0.001f; // fix log10f(0) == -INF