From 2377925f4183ef4a3abecd9e4de0cff97d3f75e4 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 13 Dec 2006 09:15:29 +0000 Subject: [PATCH] remove iRate param --- stepmania/src/AutoKeysounds.cpp | 2 +- stepmania/src/RageSound.cpp | 2 +- stepmania/src/RageSoundManager.cpp | 2 +- stepmania/src/RageSoundManager.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/AutoKeysounds.cpp b/stepmania/src/AutoKeysounds.cpp index 0bae1ea858..9d38efbd5a 100644 --- a/stepmania/src/AutoKeysounds.cpp +++ b/stepmania/src/AutoKeysounds.cpp @@ -122,7 +122,7 @@ void AutoKeysounds::FinishLoading() /* Load the BGM. */ RageSoundReader_Chain *pChain = new RageSoundReader_Chain; - pChain->SetPreferredSampleRate( SOUNDMAN->GetDriverSampleRate(44100) ); + pChain->SetPreferredSampleRate( SOUNDMAN->GetDriverSampleRate() ); Song* pSong = GAMESTATE->m_pCurSong; pChain->AddSound( pChain->LoadSound(pSong->GetMusicPath()), 0, 0 ); diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index ec55cf5f1e..b58a88d5db 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -241,7 +241,7 @@ void RageSound::LoadSoundReader( RageSoundReader *pSound ) m_iStreamFrame = m_iSourceFrame = m_iStoppedSourceFrame = 0; - const int iNeededRate = SOUNDMAN->GetDriverSampleRate( pSound->GetSampleRate() ); + const int iNeededRate = SOUNDMAN->GetDriverSampleRate(); bool bSupportRateChange = false; if( iNeededRate != pSound->GetSampleRate() || bSupportRateChange ) { diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp index f36face850..8ee4e79f20 100644 --- a/stepmania/src/RageSoundManager.cpp +++ b/stepmania/src/RageSoundManager.cpp @@ -236,7 +236,7 @@ float RageSoundManager::GetPlayLatency() const return m_pDriver->GetPlayLatency(); } -int RageSoundManager::GetDriverSampleRate( int iRate ) const +int RageSoundManager::GetDriverSampleRate() const { if( m_pDriver == NULL ) return 44100; diff --git a/stepmania/src/RageSoundManager.h b/stepmania/src/RageSoundManager.h index d85b937dad..59a638a933 100644 --- a/stepmania/src/RageSoundManager.h +++ b/stepmania/src/RageSoundManager.h @@ -43,7 +43,7 @@ public: int GetUniqueID(); /* used by RageSound */ void CommitPlayingPosition( int ID, int64_t frameno, int64_t pos, int got_bytes ); /* used by drivers */ float GetPlayLatency() const; - int GetDriverSampleRate( int iRate ) const; + int GetDriverSampleRate() const; /* When deleting a sound from any thread except the one calling Update(), this * must be used to prevent race conditions. */