From 62c114b49e6351a7485ca34f30f373051f2cbe16 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 21 Aug 2006 00:20:13 +0000 Subject: [PATCH] remove param --- stepmania/src/GameLoop.cpp | 2 +- stepmania/src/RageSoundManager.cpp | 2 +- stepmania/src/arch/Sound/RageSoundDriver.h | 2 +- stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp | 2 +- stepmania/src/arch/Sound/RageSoundDriver_ALSA9.h | 2 +- stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp | 2 +- stepmania/src/arch/Sound/RageSoundDriver_DSound.h | 2 +- stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp | 2 +- stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.h | 2 +- stepmania/src/arch/Sound/RageSoundDriver_Null.cpp | 4 ++-- stepmania/src/arch/Sound/RageSoundDriver_Null.h | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/stepmania/src/GameLoop.cpp b/stepmania/src/GameLoop.cpp index b9b3b599b2..d86d02b7de 100644 --- a/stepmania/src/GameLoop.cpp +++ b/stepmania/src/GameLoop.cpp @@ -149,7 +149,7 @@ void GameLoop::RunGameLoop() CheckFocus(); /* Update SOUNDMAN early (before any RageSound::GetPosition calls), to flush position data. */ - SOUNDMAN->Update( fDeltaTime ); + SOUNDMAN->Update(); /* Update song beat information -before- calling update on all the classes that * depend on it. If you don't do this first, the classes are all acting on old diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp index 82c9bfc066..deb6112e41 100644 --- a/stepmania/src/RageSoundManager.cpp +++ b/stepmania/src/RageSoundManager.cpp @@ -158,7 +158,7 @@ void RageSoundManager::Update( float fDeltaTime ) delete *it; if( m_pDriver != NULL ) - m_pDriver->Update( fDeltaTime ); + m_pDriver->Update(); } /* Register the given sound, and return a unique ID. */ diff --git a/stepmania/src/arch/Sound/RageSoundDriver.h b/stepmania/src/arch/Sound/RageSoundDriver.h index d31efc8684..ceecb72062 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver.h +++ b/stepmania/src/arch/Sound/RageSoundDriver.h @@ -37,7 +37,7 @@ public: * call RageSoundBase::SoundIsFinishedPlaying(). */ /* Optional, if needed: */ - virtual void Update(float delta) { } + virtual void Update() { } /* Sound startup latency--delay between Play() being called and actually * hearing it. (This isn't necessarily the same as the buffer latency.) */ diff --git a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp index babc73a5da..baa9790409 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp @@ -203,7 +203,7 @@ void RageSound_ALSA9::StartMixing(RageSoundBase *snd) stream_pool[i]->state = stream_pool[i]->PLAYING; } -void RageSound_ALSA9::Update(float delta) +void RageSound_ALSA9::Update() { for(unsigned i = 0; i < stream_pool.size(); ++i) { diff --git a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.h b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.h index d08e87ee25..7c24cdb78f 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.h +++ b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.h @@ -17,7 +17,7 @@ public: int64_t GetPosition( const RageSoundBase *snd ) const; int GetSampleRate( int rate ) const; - void Update(float delta); + void Update(); RageSound_ALSA9(); RString Init(); diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp index d95cf94853..e1028b83c3 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp @@ -100,7 +100,7 @@ void RageSound_DSound::MixerThread() stream_pool[i]->pcm->Stop(); } -void RageSound_DSound::Update(float delta) +void RageSound_DSound::Update() { /* SoundStopped might erase sounds out from under us, so make a copy * of the sound list. */ diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound.h b/stepmania/src/arch/Sound/RageSoundDriver_DSound.h index 95afb3c251..d69e792e13 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_DSound.h +++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound.h @@ -65,7 +65,7 @@ private: void StopMixing( RageSoundBase *snd ); /* used by RageSound */ bool PauseMixing( RageSoundBase *snd, bool bStop ); int64_t GetPosition( const RageSoundBase *snd ) const; - void Update(float delta); + void Update(); int GetSampleRate( int rate ) const { return rate; } }; diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp index ea94cef5ec..b90193dd54 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp @@ -258,7 +258,7 @@ int RageSound_Generic_Software::GetDataForSound( sound &s ) } -void RageSound_Generic_Software::Update(float delta) +void RageSound_Generic_Software::Update() { /* We must not lock here, since the decoder thread might hold the lock for a * while at a time. This is threadsafe, because once a sound is in STOPPING, diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.h b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.h index 83f51cf45d..cc7af0d0c7 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.h +++ b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.h @@ -10,7 +10,7 @@ static const int samples_per_block = 512; class RageSound_Generic_Software: public RageSoundDriver { public: - virtual void Update(float delta); + virtual void Update(); void StartMixing( RageSoundBase *snd ); /* used by RageSound */ void StopMixing( RageSoundBase *snd ); /* used by RageSound */ diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp index 6b031a50de..22ebaf4aac 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp @@ -6,7 +6,7 @@ const int channels = 2; -void RageSound_Null::Update( float fDeltaTime ) +void RageSound_Null::Update() { /* "Play" frames. */ while( m_iLastCursorPos < GetPosition(NULL)+1024*4 ) @@ -16,7 +16,7 @@ void RageSound_Null::Update( float fDeltaTime ) m_iLastCursorPos += 256; } - RageSound_Generic_Software::Update( fDeltaTime ); + RageSound_Generic_Software::Update(); } int64_t RageSound_Null::GetPosition( const RageSoundBase *snd ) const diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Null.h b/stepmania/src/arch/Sound/RageSoundDriver_Null.h index 9cca450fb2..ad9f12e05b 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Null.h +++ b/stepmania/src/arch/Sound/RageSoundDriver_Null.h @@ -9,7 +9,7 @@ public: RageSound_Null(); int64_t GetPosition( const RageSoundBase *snd ) const; int GetSampleRate( int iRate ) const; - void Update( float fDeltaTime ); + void Update(); private: int64_t m_iLastCursorPos;