From ac28273166eb1ba8608a90ccaa10b62d2251f5a3 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 12 Feb 2023 04:35:09 -0800 Subject: Use to_address to pass a pointer-like iterator as a real pointer --- core/voice.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'core/voice.cpp') diff --git a/core/voice.cpp b/core/voice.cpp index fc5c864e..a927f36b 100644 --- a/core/voice.cpp +++ b/core/voice.cpp @@ -650,7 +650,7 @@ void Voice::mix(const State vstate, ContextBase *Context, const nanoseconds devi if(mFlags.test(VoiceIsStatic)) LoadBufferStatic(BufferListItem, BufferLoopItem, uintPos, mFmtType, chan, - mFrameStep, srcSampleDelay, srcBufferSize, resampleBuffer); + mFrameStep, srcSampleDelay, srcBufferSize, al::to_address(resampleBuffer)); else if(mFlags.test(VoiceIsCallback)) { const size_t bufferOffset{uintPos - callbackBase}; @@ -673,14 +673,15 @@ void Voice::mix(const State vstate, ContextBase *Context, const nanoseconds devi mNumCallbackSamples = static_cast(getTotal); } LoadBufferCallback(BufferListItem, bufferOffset, mNumCallbackSamples, - mFmtType, chan, mFrameStep, srcSampleDelay, srcBufferSize, resampleBuffer); + mFmtType, chan, mFrameStep, srcSampleDelay, srcBufferSize, + al::to_address(resampleBuffer)); } else LoadBufferQueue(BufferListItem, BufferLoopItem, uintPos, mFmtType, chan, - mFrameStep, srcSampleDelay, srcBufferSize, resampleBuffer); + mFrameStep, srcSampleDelay, srcBufferSize, al::to_address(resampleBuffer)); } - Resample(&mResampleState, resampleBuffer, fracPos, increment, + Resample(&mResampleState, al::to_address(resampleBuffer), fracPos, increment, {MixingSamples[chan]+samplesLoaded, dstBufferSize}); /* Store the last source samples used for next time. */ -- cgit v1.2.3