aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/mixvoice.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-11-24 10:07:48 -0800
committerChris Robinson <[email protected]>2018-11-24 10:07:48 -0800
commitb508a760c88e8af6e852561dd7cf50edd7c601b9 (patch)
treec384b90488c0eb03baf0f0918f88a5205aa84bf5 /Alc/mixvoice.cpp
parent505e535655cb12af9a0d4dc8b2cae9a0db03e34e (diff)
Use a normal vector to store buffer data
Diffstat (limited to 'Alc/mixvoice.cpp')
-rw-r--r--Alc/mixvoice.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Alc/mixvoice.cpp b/Alc/mixvoice.cpp
index 50c9c735..9620b214 100644
--- a/Alc/mixvoice.cpp
+++ b/Alc/mixvoice.cpp
@@ -402,7 +402,7 @@ ALboolean MixSource(ALvoice *voice, ALuint SourceID, ALCcontext *Context, ALsize
for(i = 0;i < BufferListItem->num_buffers;i++)
{
const ALbuffer *buffer = BufferListItem->buffers[i];
- const ALubyte *Data = static_cast<const ALubyte*>(buffer->data);
+ const ALbyte *Data = buffer->mData.data();
ALsizei DataSize;
if(DataPosInt >= buffer->SampleLen)
@@ -428,7 +428,7 @@ ALboolean MixSource(ALvoice *voice, ALuint SourceID, ALCcontext *Context, ALsize
for(i = 0;i < BufferListItem->num_buffers;i++)
{
const ALbuffer *buffer = BufferListItem->buffers[i];
- const ALubyte *Data = static_cast<const ALubyte*>(buffer->data);
+ const ALbyte *Data = buffer->mData.data();
ALsizei DataSize;
if(DataPosInt >= buffer->SampleLen)
@@ -453,7 +453,7 @@ ALboolean MixSource(ALvoice *voice, ALuint SourceID, ALCcontext *Context, ALsize
for(i = 0;i < BufferListItem->num_buffers;i++)
{
const ALbuffer *buffer = BufferListItem->buffers[i];
- const ALubyte *Data = static_cast<const ALubyte*>(buffer->data);
+ const ALbyte *Data = buffer->mData.data();
ALsizei DataSize;
if(LoopStart >= buffer->SampleLen)
@@ -490,7 +490,7 @@ ALboolean MixSource(ALvoice *voice, ALuint SourceID, ALCcontext *Context, ALsize
if(DataSize > pos)
{
- const ALubyte *Data = static_cast<const ALubyte*>(ALBuffer->data);
+ const ALbyte *Data = ALBuffer->mData.data();
Data += (pos*NumChannels + chan)*SampleSize;
DataSize = mini(SizeToDo, DataSize - pos);