diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-06-23 11:16:06 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-06-23 11:16:06 +0400 |
| commit | cc246eaca7bc385738658672e66a5bca8872d5a1 (patch) | |
| tree | 1d244d10cedd5c15a2b07bb92475184c2aaff7cc /intern/audaspace/FX | |
| parent | 2afa7e4944cd9efcf728f58360adc68343320755 (diff) | |
3D Audio GSoC:
- Fixes for MSVC compiling.
- Fix for ffmpeg audio export with timebase, which fixes vorbis encoding (the only codec using this).
Diffstat (limited to 'intern/audaspace/FX')
| -rw-r--r-- | intern/audaspace/FX/AUD_EnvelopeFactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/audaspace/FX/AUD_EnvelopeFactory.cpp b/intern/audaspace/FX/AUD_EnvelopeFactory.cpp index 3057c7b7d62..80df7e9f874 100644 --- a/intern/audaspace/FX/AUD_EnvelopeFactory.cpp +++ b/intern/audaspace/FX/AUD_EnvelopeFactory.cpp @@ -73,8 +73,8 @@ AUD_Reference<AUD_IReader> AUD_EnvelopeFactory::createReader() EnvelopeParameters* param = new EnvelopeParameters(); param->arthreshold = m_arthreshold; - param->attack = pow(m_arthreshold, 1.0f/(reader->getSpecs().rate * m_attack)); - param->release = pow(m_arthreshold, 1.0f/(reader->getSpecs().rate * m_release)); + param->attack = pow(m_arthreshold, 1.0f/(static_cast<float>(reader->getSpecs().rate) * m_attack)); + param->release = pow(m_arthreshold, 1.0f/(static_cast<float>(reader->getSpecs().rate) * m_release)); param->threshold = m_threshold; return new AUD_CallbackIIRFilterReader(reader, 1, 2, |