From bc18ec68ec68ece7a30b4b1cd9c48536186f68d2 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Mon, 31 May 2004 21:55:55 +0000 Subject: [PATCH] oops, I forgot the commit message on the last one. Use GetData's inNow parameter rather than calling GetPos. --- stepmania/src/arch/Sound/RageSoundDriver_CA.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp b/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp index fc09a6a470..c741c1dc80 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_CA.cpp @@ -242,7 +242,7 @@ int64_t RageSound_CA::GetPosition(const RageSoundBase *sound) const void RageSound_CA::FillConverter(void *data, UInt32 dataByteSize) { int frames = dataByteSize / gConverter->GetInputFormat().mBytesPerPacket; - this->Mix((int16_t *)data, frames, mDecodePos, GetPosition(NULL)); + this->Mix((int16_t *)data, frames, mDecodePos, int64_t(mNow->mSampleTime)); } OSStatus RageSound_CA::GetData(AudioDeviceID inDevice, @@ -261,6 +261,7 @@ OSStatus RageSound_CA::GetData(AudioDeviceID inDevice, dataPackets /= gConverter->GetOutputFormat().mBytesPerPacket; This->mDecodePos = int64_t(inOutputTime->mSampleTime); + This->mNow = inNow; gConverter->FillComplexBuffer(dataPackets, *outOutputData, NULL); g_fLastIOProcTime = tm.GetDeltaTime();