Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for [#37293] Audio does not Scrub, plays fully instead

Browse Source
This commit is contained in:
Joerg Mueller
2013-11-07 23:40:06 +00:00
parent 106cff1b93
commit 1457924a21
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
View File

@@ -119,6 +119,14 @@ AUD_OpenALDevice::AUD_OpenALHandle::AUD_OpenALHandle(AUD_OpenALDevice* device, A
{ {
length = m_device->m_buffersize; length = m_device->m_buffersize;
reader->read(length, eos, m_device->m_buffer.getBuffer()); reader->read(length, eos, m_device->m_buffer.getBuffer());
if(length == 0)
{
// AUD_XXX: TODO: don't fill all buffers and enqueue them later
length = 1;
memset(m_device->m_buffer.getBuffer(), 0, length * AUD_DEVICE_SAMPLE_SIZE(specs));
}
alBufferData(m_buffers[i], m_format, m_device->m_buffer.getBuffer(), alBufferData(m_buffers[i], m_format, m_device->m_buffer.getBuffer(),
length * AUD_DEVICE_SAMPLE_SIZE(specs), length * AUD_DEVICE_SAMPLE_SIZE(specs),
specs.rate); specs.rate);
@@ -132,8 +140,7 @@ AUD_OpenALDevice::AUD_OpenALHandle::AUD_OpenALHandle(AUD_OpenALDevice* device, A
try try
{ {
alSourceQueueBuffers(m_source, CYCLE_BUFFERS, alSourceQueueBuffers(m_source, CYCLE_BUFFERS, m_buffers);
m_buffers);
if(alGetError() != AL_NO_ERROR) if(alGetError() != AL_NO_ERROR)
AUD_THROW(AUD_ERROR_OPENAL, queue_error); AUD_THROW(AUD_ERROR_OPENAL, queue_error);
} }
@@ -289,6 +296,14 @@ bool AUD_OpenALDevice::AUD_OpenALHandle::seek(float position)
{ {
length = m_device->m_buffersize; length = m_device->m_buffersize;
m_reader->read(length, m_eos, m_device->m_buffer.getBuffer()); m_reader->read(length, m_eos, m_device->m_buffer.getBuffer());
if(length == 0)
{
// AUD_XXX: TODO: don't fill all buffers and enqueue them later
length = 1;
memset(m_device->m_buffer.getBuffer(), 0, length * AUD_DEVICE_SAMPLE_SIZE(specs));
}
alBufferData(m_buffers[i], m_format, m_device->m_buffer.getBuffer(), alBufferData(m_buffers[i], m_format, m_device->m_buffer.getBuffer(),
length * AUD_DEVICE_SAMPLE_SIZE(specs), specs.rate); length * AUD_DEVICE_SAMPLE_SIZE(specs), specs.rate);
@@ -933,9 +948,8 @@ void AUD_OpenALDevice::updateStreams()
break; break;
} }
// unqueue buffer // unqueue buffer (warning: this might fail for slow early returning sources (none exist so far) if the buffer was not queued due to recent changes - has to be tested)
alSourceUnqueueBuffers(sound->m_source, 1, alSourceUnqueueBuffers(sound->m_source, 1, &sound->m_buffers[sound->m_current]);
&sound->m_buffers[sound->m_current]);
ALenum err; ALenum err;
if((err = alGetError()) != AL_NO_ERROR) if((err = alGetError()) != AL_NO_ERROR)
{ {