From 49e8dd1327c0d2a5296503e880591cf3389ef1f5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 23 Oct 2005 21:53:32 +0000 Subject: [PATCH] cleanup --- stepmania/src/arch/Sound/RageSoundDriver_Null.cpp | 8 ++++---- stepmania/src/arch/Sound/RageSoundDriver_Null.h | 10 ++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp index 6b50c5db8d..cfe0ac0704 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp @@ -9,11 +9,11 @@ const int samplerate = 44100; void RageSound_Null::Update( float fDeltaTime ) { /* "Play" frames. */ - while( last_cursor_pos < GetPosition(NULL)+1024*4 ) + while( m_iLastCursorPos < GetPosition(NULL)+1024*4 ) { int16_t buf[256*channels]; - this->Mix( buf, 256, last_cursor_pos, GetPosition(NULL) ); - last_cursor_pos += 256; + this->Mix( buf, 256, m_iLastCursorPos, GetPosition(NULL) ); + m_iLastCursorPos += 256; } RageSound_Generic_Software::Update( fDeltaTime ); @@ -26,7 +26,7 @@ int64_t RageSound_Null::GetPosition( const RageSoundBase *snd ) const RageSound_Null::RageSound_Null() { - last_cursor_pos = GetPosition( NULL ); + m_iLastCursorPos = GetPosition( NULL ); StartDecodeThread(); } diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Null.h b/stepmania/src/arch/Sound/RageSoundDriver_Null.h index 8b1c2cabe7..c249bf1867 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Null.h +++ b/stepmania/src/arch/Sound/RageSoundDriver_Null.h @@ -5,16 +5,14 @@ class RageSound_Null: public RageSound_Generic_Software { -private: - int64_t last_cursor_pos; - -protected: +public: + RageSound_Null(); int64_t GetPosition( const RageSoundBase *snd ) const; float GetPlayLatency() const; void Update( float fDeltaTime ); -public: - RageSound_Null(); +private: + int64_t m_iLastCursorPos; }; #define USE_RAGE_SOUND_NULL