From 2b19c53ecec0deff0536865f71f44bef3ff14094 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 17 Jun 2019 20:26:00 -0700 Subject: [PATCH] Use al::byte instead of ALbyte for raw bytes --- Alc/converter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Alc/converter.cpp b/Alc/converter.cpp index aa74d510..0f8e8941 100644 --- a/Alc/converter.cpp +++ b/Alc/converter.cpp @@ -213,7 +213,7 @@ ALsizei SampleConverter::convert(const ALvoid **src, ALsizei *srcframes, ALvoid const ALsizei SrcFrameSize{static_cast(mChan.size()) * mSrcTypeSize}; const ALsizei DstFrameSize{static_cast(mChan.size()) * mDstTypeSize}; const ALsizei increment{mIncrement}; - auto SamplesIn = static_cast(*src); + auto SamplesIn = static_cast(*src); ALsizei NumSrcSamples{*srcframes}; FPUCtl mixer_mode{}; @@ -268,8 +268,8 @@ ALsizei SampleConverter::convert(const ALvoid **src, ALsizei *srcframes, ALvoid for(size_t chan{0u};chan < mChan.size();chan++) { - const ALbyte *SrcSamples = SamplesIn + mSrcTypeSize*chan; - ALbyte *DstSamples = static_cast(dst) + mDstTypeSize*chan; + const al::byte *SrcSamples{SamplesIn + mSrcTypeSize*chan}; + al::byte *DstSamples = static_cast(dst) + mDstTypeSize*chan; /* Load the previous samples into the source data first, then the * new samples from the input buffer. @@ -311,7 +311,7 @@ ALsizei SampleConverter::convert(const ALvoid **src, ALsizei *srcframes, ALvoid SamplesIn += SrcFrameSize*(DataPosFrac>>FRACTIONBITS); NumSrcSamples -= mini(NumSrcSamples, (DataPosFrac>>FRACTIONBITS)); - dst = static_cast(dst) + DstFrameSize*DstSize; + dst = static_cast(dst) + DstFrameSize*DstSize; pos += DstSize; }