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 /source/blender/blenkernel/intern/sound.c | |
| 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 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); } } |