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

3D Audio GSoC:

Browse Source 
Changed Readers to top-down architecture instead of bottom-up.
This commit is contained in:
Joerg Mueller
2011-06-14 12:13:19 +00:00
parent 8ff0c2e107
commit d8974a60f6
48 changed files with 190 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
intern/audaspace/FX/AUD_DelayReader.cpp
View File

@@ -36,8 +36,7 @@
AUD_DelayReader::AUD_DelayReader(AUD_Reference<AUD_IReader> reader, float delay) :
AUD_EffectReader(reader),
m_delay(int(delay * reader->getSpecs().rate)),
m_remdelay(int(delay * reader->getSpecs().rate)),
m_empty(true)
m_remdelay(int(delay * reader->getSpecs().rate))
{
}
@@ -70,46 +69,28 @@ int AUD_DelayReader::getPosition() const
return m_reader->getPosition() + m_delay;
}
void AUD_DelayReader::read(int & length, sample_t* & buffer)
void AUD_DelayReader::read(int & length, sample_t* buffer)
{
if(m_remdelay > 0)
{
AUD_Specs specs = m_reader->getSpecs();
int samplesize = AUD_SAMPLE_SIZE(specs);
if(m_buffer.getSize() < length * samplesize)
{
m_buffer.resize(length * samplesize);
m_empty = false;
}
buffer = m_buffer.getBuffer();
if(length > m_remdelay)
{
if(!m_empty)
memset(buffer, 0, m_remdelay * samplesize);
memset(buffer, 0, m_remdelay * samplesize);
int len = length - m_remdelay;
sample_t* buf;
m_reader->read(len, buf);
memcpy(buffer + m_remdelay * specs.channels,
buf, len * samplesize);
m_reader->read(len, buffer + m_remdelay * specs.channels);
if(len < length-m_remdelay)
length = m_remdelay + len;
m_remdelay = 0;
m_empty = false;
}
else
{
if(!m_empty)
{
memset(buffer, 0, length * samplesize);
m_empty = true;
}
memset(buffer, 0, length * samplesize);
m_remdelay -= length;
}
}