From e45978da437c75e4040c68e9a4746691ff228608 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 22 Jan 2007 02:31:58 +0000 Subject: [PATCH] use vector --- stepmania/src/RageSoundReader_ChannelSplit.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/RageSoundReader_ChannelSplit.cpp b/stepmania/src/RageSoundReader_ChannelSplit.cpp index c6fac1f7fc..fba0e63980 100644 --- a/stepmania/src/RageSoundReader_ChannelSplit.cpp +++ b/stepmania/src/RageSoundReader_ChannelSplit.cpp @@ -77,7 +77,7 @@ public: /* m_sBuffer[0] corresponds to frame number m_iBufferPositionFrames. */ int m_iBufferPositionFrames; - basic_string m_sBuffer; + vector m_sBuffer; }; int RageSoundReader_Split::GetLength() const { return m_pImpl->m_pSource->GetLength(); } @@ -138,7 +138,7 @@ int RageSoundReader_Split::Read( int16_t *pBuf, int iFrames ) int iRet = m_pImpl->ReadBuffer(); int iSamplesAvailable = m_pImpl->m_sBuffer.size(); - const int16_t *pSrc = m_pImpl->m_sBuffer.data(); + const int16_t *pSrc = &m_pImpl->m_sBuffer[0]; if( m_pImpl->m_iBufferPositionFrames < m_iPositionFrame ) { int iSkipFrames = m_iPositionFrame - m_pImpl->m_iBufferPositionFrames; @@ -193,7 +193,7 @@ int RageSoundSplitterImpl::ReadBuffer() { int iEraseFrames = iMinFrameRequested - m_iBufferPositionFrames; iEraseFrames = min( iEraseFrames, (int) m_sBuffer.size() ); - m_sBuffer.erase( 0, iEraseFrames * m_pSource->GetNumChannels() ); + m_sBuffer.erase( m_sBuffer.begin(), m_sBuffer.begin() + iEraseFrames * m_pSource->GetNumChannels() ); m_iBufferPositionFrames += iEraseFrames; }