diff options
author | Jörg Müller <nexyon@gmail.com> | 2014-05-21 01:01:56 +0400 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2014-05-21 01:01:56 +0400 |
commit | 38fcc3e14b3b30cda4ec113822f83809592413b1 (patch) | |
tree | 8354c75d20320c6b6dedbc76f39a323c09fe1aac /intern/audaspace | |
parent | 3bba558944a280daa4b1dbb027b65583dfe0f7fe (diff) |
Fix T40280: sequencer sound strips with an end at a negative time kept playing
The bug was caused by using negative numbers as the end for playing forever (or until the end of the sound is reached) in the library. This was used with speaker objects which have an end of FLT_MAX now instead and the negative number interpretation was removed. I hope this doesn't break anything else.
Diffstat (limited to 'intern/audaspace')
-rw-r--r-- | intern/audaspace/intern/AUD_SequencerHandle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/audaspace/intern/AUD_SequencerHandle.cpp b/intern/audaspace/intern/AUD_SequencerHandle.cpp index c9473cf274e..135c960471c 100644 --- a/intern/audaspace/intern/AUD_SequencerHandle.cpp +++ b/intern/audaspace/intern/AUD_SequencerHandle.cpp @@ -70,7 +70,7 @@ void AUD_SequencerHandle::update(float position, float frame, float fps) if(m_handle.get()) { AUD_MutexLock lock(*m_entry); - if(position >= m_entry->m_end && m_entry->m_end >= 0) + if(position >= m_entry->m_end) m_handle->pause(); else if(position >= m_entry->m_begin) m_handle->resume(); @@ -143,7 +143,7 @@ void AUD_SequencerHandle::seek(float position) if(m_handle.get()) { AUD_MutexLock lock(*m_entry); - if(position >= m_entry->m_end && m_entry->m_end >= 0) + if(position >= m_entry->m_end) { m_handle->pause(); return; |