diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-11 15:41:24 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-11 15:41:24 +0400 |
| commit | fee7337249342c3d5a332358883af9afe961f38d (patch) | |
| tree | d7374f582cec6ca6d204c923d325c4db53d699cd /intern/audaspace/FX | |
| parent | 2c2fa877be6a1e7f6f1abbb131d3706948368248 (diff) | |
3D Audio GSoC:
Adding a mono flag to mixdown non-mono sounds for 3D audio.
* Added mono sound loading.
* Bugfix: AUD_COMPARE_SPECS usage was wrong.
* Bugfix: JOS resampler = instead of ==.
* Bugfix: Change of a sound should apply settings in AUD_SequencerHandle.
* Bugfix: Memory leak when canceling open sound operator.
Diffstat (limited to 'intern/audaspace/FX')
| -rw-r--r-- | intern/audaspace/FX/AUD_DoubleReader.cpp | 4 | ||||
| -rw-r--r-- | intern/audaspace/FX/AUD_SuperposeReader.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/audaspace/FX/AUD_DoubleReader.cpp b/intern/audaspace/FX/AUD_DoubleReader.cpp index 178240fa23b..3b1d105954c 100644 --- a/intern/audaspace/FX/AUD_DoubleReader.cpp +++ b/intern/audaspace/FX/AUD_DoubleReader.cpp @@ -98,13 +98,13 @@ void AUD_DoubleReader::read(int& length, bool& eos, sample_t* buffer) specs1 = m_reader1->getSpecs(); specs2 = m_reader2->getSpecs(); if(AUD_COMPARE_SPECS(specs1, specs2)) - length = len; - else { int len2 = length - len; m_reader2->read(len2, eos, buffer + specs1.channels * len); length = len + len2; } + else + length = len; } } else diff --git a/intern/audaspace/FX/AUD_SuperposeReader.cpp b/intern/audaspace/FX/AUD_SuperposeReader.cpp index b332a854a5d..c07b7a9febf 100644 --- a/intern/audaspace/FX/AUD_SuperposeReader.cpp +++ b/intern/audaspace/FX/AUD_SuperposeReader.cpp @@ -81,7 +81,7 @@ void AUD_SuperposeReader::read(int& length, bool& eos, sample_t* buffer) { AUD_Specs specs = m_reader1->getSpecs(); AUD_Specs s2 = m_reader2->getSpecs(); - if(AUD_COMPARE_SPECS(specs, s2)) + if(!AUD_COMPARE_SPECS(specs, s2)) AUD_THROW(AUD_ERROR_SPECS, specs_error); int samplesize = AUD_SAMPLE_SIZE(specs); |