diff options
| -rw-r--r-- | intern/audaspace/intern/AUD_SequencerHandle.cpp | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 4 |
2 files changed, 4 insertions, 4 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; diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 6ba843c8a8f..da6ead06d98 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -727,7 +727,7 @@ void sound_update_scene(Main *bmain, struct Scene *scene) if (AUD_removeSet(scene->speaker_handles, strip->speaker_handle)) { if (speaker->sound) { - AUD_moveSequence(strip->speaker_handle, (double)strip->start / FPS, -1, 0); + AUD_moveSequence(strip->speaker_handle, (double)strip->start / FPS, FLT_MAX, 0); } else { AUD_removeSequence(scene->sound_scene, strip->speaker_handle); @@ -738,7 +738,7 @@ void sound_update_scene(Main *bmain, struct Scene *scene) if (speaker->sound) { strip->speaker_handle = AUD_addSequence(scene->sound_scene, speaker->sound->playback_handle, - (double)strip->start / FPS, -1, 0); + (double)strip->start / FPS, FLT_MAX, 0); AUD_setRelativeSequence(strip->speaker_handle, 0); } } |