From cbc1469dcf8d1bad2c7942c42381becba81331af Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 19 Oct 2005 11:49:06 +0000 Subject: [PATCH] simplify, eliminate GetParams --- stepmania/src/GameSoundManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/GameSoundManager.cpp b/stepmania/src/GameSoundManager.cpp index ecaf65cd1c..8d2c33309e 100644 --- a/stepmania/src/GameSoundManager.cpp +++ b/stepmania/src/GameSoundManager.cpp @@ -456,7 +456,7 @@ void GameSoundManager::Update( float fDeltaTime ) /* Duration of the fade-in and fade-out: */ static float fFadeInSpeed = 1.5f; static float fFadeOutSpeed = 0.3f; - float fVolume = g_Playing->m_Music->GetVolume(); + float fVolume = g_Playing->m_Music->GetParams().m_Volume; switch( g_FadeState ) { case FADE_NONE: break; @@ -664,8 +664,8 @@ void GameSoundManager::DimMusic( float fVolume, float fDurationSeconds ) LockMut( *g_Mutex ); if( g_FadeState == FADE_NONE ) - g_fOriginalVolume = g_Playing->m_Music->GetVolume(); - // otherwise, g_fOriginalVolume is already set and GetVolume will return the + g_fOriginalVolume = g_Playing->m_Music->GetParams().m_Volume; + // otherwise, g_fOriginalVolume is already set and m_Volume will be the // current state, not the original state g_fDimDurationRemaining = fDurationSeconds;