From 3d932ba4968d8caa3c936d9186439781e7cedca0 Mon Sep 17 00:00:00 2001 From: Joerg Mueller Date: Tue, 21 Jun 2011 20:13:27 +0000 Subject: 3D Audio GSoC: Buffer.assureSize - a function that should long have been there. --- intern/audaspace/OpenAL/AUD_OpenALDevice.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'intern/audaspace/OpenAL') diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp index 2780f108cda..18c50d29225 100644 --- a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp +++ b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp @@ -160,8 +160,7 @@ void AUD_OpenALDevice::updateStreams() if(info) { specs.specs = sound->reader->getSpecs(); - if(m_buffer.getSize() < m_buffersize * AUD_DEVICE_SAMPLE_SIZE(specs)) - m_buffer.resize(m_buffersize * AUD_DEVICE_SAMPLE_SIZE(specs)); + m_buffer.assureSize(m_buffersize * AUD_DEVICE_SAMPLE_SIZE(specs)); // for all empty buffers while(info--) @@ -582,8 +581,7 @@ AUD_Handle* AUD_OpenALDevice::play(AUD_Reference reader, bool keep) try { - if(m_buffer.getSize() < m_buffersize * AUD_DEVICE_SAMPLE_SIZE(specs)) - m_buffer.resize(m_buffersize * AUD_DEVICE_SAMPLE_SIZE(specs)); + m_buffer.assureSize(m_buffersize * AUD_DEVICE_SAMPLE_SIZE(specs)); int length; for(int i = 0; i < AUD_OPENAL_CYCLE_BUFFERS; i++) @@ -884,8 +882,7 @@ bool AUD_OpenALDevice::seek(AUD_Handle* handle, float position) int length; AUD_DeviceSpecs specs = m_specs; specs.specs = alhandle->reader->getSpecs(); - if(m_buffer.getSize() < m_buffersize * AUD_DEVICE_SAMPLE_SIZE(specs)) - m_buffer.resize(m_buffersize * AUD_DEVICE_SAMPLE_SIZE(specs)); + m_buffer.assureSize(m_buffersize * AUD_DEVICE_SAMPLE_SIZE(specs)); for(int i = 0; i < AUD_OPENAL_CYCLE_BUFFERS; i++) { -- cgit v1.2.3