From e2923274f4ade79de3ea89c0115f39e7004cf974 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 26 Nov 2006 18:44:06 +0000 Subject: [PATCH] Insert -> CommitPosition --- stepmania/src/RageSound.cpp | 2 +- stepmania/src/RageSoundPosMap.cpp | 2 +- stepmania/src/RageSoundPosMap.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index c1550b2a05..5897e231fb 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -529,7 +529,7 @@ bool RageSound::GetDataToPlay( int16_t *pBuffer, int iFrames, int &iSoundFrame, void RageSound::CommitPlayingPosition( int64_t frameno, int pos, int iGotFrames ) { m_Mutex.Lock(); - m_PositionMapping.Insert( frameno, pos, iGotFrames ); + m_PositionMapping.CommitPosition( frameno, pos, iGotFrames ); m_Mutex.Unlock(); } diff --git a/stepmania/src/RageSoundPosMap.cpp b/stepmania/src/RageSoundPosMap.cpp index fb7b0da262..ca274f461c 100644 --- a/stepmania/src/RageSoundPosMap.cpp +++ b/stepmania/src/RageSoundPosMap.cpp @@ -18,7 +18,7 @@ pos_map_queue::pos_map_queue( const pos_map_queue &cpy ) *this = cpy; } -void pos_map_queue::Insert( int64_t iFrame, int iPosition, int iGotFrames ) +void pos_map_queue::CommitPosition( int64_t iFrame, int iPosition, int iGotFrames ) { if( m_Queue.size() ) { diff --git a/stepmania/src/RageSoundPosMap.h b/stepmania/src/RageSoundPosMap.h index 96293072d0..c792e8370c 100644 --- a/stepmania/src/RageSoundPosMap.h +++ b/stepmania/src/RageSoundPosMap.h @@ -27,8 +27,8 @@ public: pos_map_queue(); pos_map_queue( const pos_map_queue &cpy ); - /* Insert a mapping from iFrame to iPosition, containing pos iGotFrames. */ - void Insert( int64_t iFrame, int iPosition, int iGotFrames ); + /* Insert a mapping from iHardwareFrame to iStreamFrame, containing pos iGotFrames. */ + void CommitPosition( int64_t iHardwareFrame, int iStreamFrame, int iGotFrames ); /* Return the position for the given iFrame. */ int64_t Search( int64_t iFrame, bool *bApproximate ) const;