From 9c8bd971905cd2f6bd058c37ed1f9a3a9e5cf051 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 23 Dec 2006 04:07:46 +0000 Subject: [PATCH] remove unused --- stepmania/src/RageSound.cpp | 6 +----- stepmania/src/RageSound.h | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index 6f3e5f3d94..092a2f657f 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -66,7 +66,6 @@ RageSound::RageSound(): m_pSource = NULL; m_iStreamFrame = 0; - m_iSourceFrame = 0; m_iStoppedSourceFrame = 0; m_iMaxDriverFrame = 0; m_bPlaying = false; @@ -108,7 +107,6 @@ RageSound &RageSound::operator=( const RageSound &cpy ) m_Param = cpy.m_Param; m_iStreamFrame = cpy.m_iStreamFrame; - m_iSourceFrame = cpy.m_iSourceFrame; m_iStoppedSourceFrame = cpy.m_iStoppedSourceFrame; m_iMaxDriverFrame = 0; m_bPlaying = false; @@ -244,7 +242,7 @@ void RageSound::LoadSoundReader( RageSoundReader *pSound ) { Unload(); - m_iStreamFrame = m_iSourceFrame = m_iStoppedSourceFrame = 0; + m_iStreamFrame = m_iStoppedSourceFrame = 0; const int iNeededRate = SOUNDMAN->GetDriverSampleRate(); bool bSupportRateChange = false; @@ -285,7 +283,6 @@ int RageSound::GetData( char *pBuffer, int iFrames ) m_Mutex.Unlock(); m_iStreamFrame += iGotFrames; - m_iSourceFrame = iSourceFrame + lrintf(iGotFrames * fRate); return iGotFrames; } @@ -579,7 +576,6 @@ bool RageSound::SetPositionFrames( int iFrames ) return false; /* failed */ } - m_iSourceFrame = iFrames; m_iStoppedSourceFrame = iFrames; if( iRet == 0 ) diff --git a/stepmania/src/RageSound.h b/stepmania/src/RageSound.h index 5e154b0b63..b284979e0e 100644 --- a/stepmania/src/RageSound.h +++ b/stepmania/src/RageSound.h @@ -163,10 +163,6 @@ private: * until it becomes positive. */ int64_t m_iStreamFrame; - /* When the position is outside of the source (eg. < 0), we need to track the - * effective source frame ourself. */ - int m_iSourceFrame; - /* Hack: When we stop a playing sound, we can't ask the driver the position * (we're not playing); and we can't seek back to the current playing position * when we stop (too slow), but we want to be able to report the position we