From: Glenn M. <gma...@us...> - 2006-12-13 09:17:51
|
Update of /cvsroot/stepmania/stepmania/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7625 Modified Files: RageSound.cpp RageSoundManager.cpp RageSoundManager.h Log Message: remove pSound param Index: RageSound.cpp =================================================================== RCS file: /cvsroot/stepmania/stepmania/src/RageSound.cpp,v retrieving revision 1.250 retrieving revision 1.251 diff -u -d -p -r1.250 -r1.251 --- RageSound.cpp 13 Dec 2006 09:15:29 -0000 1.250 +++ RageSound.cpp 13 Dec 2006 09:17:48 -0000 1.251 @@ -639,7 +639,7 @@ int64_t RageSound::GetPositionSecondsInt } /* Get our current hardware position. */ - int64_t iCurrentHardwareFrame = SOUNDMAN->GetPosition(this); + int64_t iCurrentHardwareFrame = SOUNDMAN->GetPosition(); /* It's sometimes possible for the hardware position to move backwards, usually * on underrun. We can try to prevent this in each driver, but it's an obscure Index: RageSoundManager.h =================================================================== RCS file: /cvsroot/stepmania/stepmania/src/RageSoundManager.h,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -p -r1.80 -r1.81 --- RageSoundManager.h 13 Dec 2006 09:15:29 -0000 1.80 +++ RageSoundManager.h 13 Dec 2006 09:17:48 -0000 1.81 @@ -37,7 +37,7 @@ public: void StartMixing( RageSoundBase *snd ); /* used by RageSound */ void StopMixing( RageSoundBase *snd ); /* used by RageSound */ bool Pause( RageSoundBase *snd, bool bPause ); /* used by RageSound */ - int64_t GetPosition( const RageSoundBase *snd ) const; /* used by RageSound */ + int64_t GetPosition() const; /* used by RageSound */ void RegisterSound( RageSound *p ); /* used by RageSound */ void UnregisterSound( RageSound *p ); /* used by RageSound */ int GetUniqueID(); /* used by RageSound */ Index: RageSoundManager.cpp =================================================================== RCS file: /cvsroot/stepmania/stepmania/src/RageSoundManager.cpp,v retrieving revision 1.132 retrieving revision 1.133 diff -u -d -p -r1.132 -r1.133 --- RageSoundManager.cpp 13 Dec 2006 09:15:29 -0000 1.132 +++ RageSoundManager.cpp 13 Dec 2006 09:17:48 -0000 1.133 @@ -104,7 +104,7 @@ bool RageSoundManager::Pause( RageSoundB return m_pDriver->PauseMixing( pSound, bPause ); } -int64_t RageSoundManager::GetPosition( const RageSoundBase *pSound ) const +int64_t RageSoundManager::GetPosition() const { if( m_pDriver == NULL ) return 0; |