Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Müller <nexyon@gmail.com>2014-07-21 16:24:37 +0400
committerJörg Müller <nexyon@gmail.com>2014-07-21 16:25:10 +0400
commit31e1a31feed3adbfba85ed319447fc13e9b454ee (patch)
tree87001b8704a3b102bc81cb6f2389c90285fb392e /intern/audaspace
parent25fab54e092fb453e418ed1c895c739f4c5d03c8 (diff)
Bugfix T41133: Audio: Speakers with animated pitch cause clicks in rendered animations, crashes or huge filesizes in rendered audio
Crash happened when the pitch value got <= 0, preventing this now.
Diffstat (limited to 'intern/audaspace')
-rw-r--r--intern/audaspace/FX/AUD_PitchReader.cpp2
-rw-r--r--intern/audaspace/intern/AUD_SoftwareDevice.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/intern/audaspace/FX/AUD_PitchReader.cpp b/intern/audaspace/FX/AUD_PitchReader.cpp
index 218af4fc090..b3775c71a28 100644
--- a/intern/audaspace/FX/AUD_PitchReader.cpp
+++ b/intern/audaspace/FX/AUD_PitchReader.cpp
@@ -48,5 +48,7 @@ float AUD_PitchReader::getPitch() const
void AUD_PitchReader::setPitch(float pitch)
{
+ if(pitch <= 0)
+ pitch = 1;
m_pitch = pitch;
}
diff --git a/intern/audaspace/intern/AUD_SoftwareDevice.cpp b/intern/audaspace/intern/AUD_SoftwareDevice.cpp
index 7bf59cd6f31..6ffa5e1fcae 100644
--- a/intern/audaspace/intern/AUD_SoftwareDevice.cpp
+++ b/intern/audaspace/intern/AUD_SoftwareDevice.cpp
@@ -422,6 +422,8 @@ bool AUD_SoftwareDevice::AUD_SoftwareHandle::setPitch(float pitch)
{
if(!m_status)
return false;
+ if(pitch <= 0)
+ pitch = 1;
m_user_pitch = pitch;
return true;
}