griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

== Sequencer ==

Browse Source 
Fixes 

[#5211] Sound scrubbing does not work after blend file load

also fixes:

if you hit the timeline playbutton, you can reseek by clicking on the timeline.
Now audio doesn't stop anymore and keeps on playing from the new position
instead.
This commit is contained in:
Peter Schlaile
2008-02-24 13:49:31 +00:00
parent 775f845146
commit 9b4bc15c2a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/src/seqaudio.c
View File

@@ -496,7 +496,7 @@ void audiostream_play(Uint32 startframe, Uint32 duration, int mixdown)
sound_init_audio();
}
if (U.mixbufsize && !audio_initialised && !(duration + mixdown)) {
if (U.mixbufsize && !audio_initialised && !mixdown) {
desired.freq=G.scene->audio.mixrate;
desired.format=AUDIO_S16SYS;
desired.channels=2;
@@ -512,7 +512,11 @@ void audiostream_play(Uint32 startframe, Uint32 duration, int mixdown)
*(G.scene->audio.mixrate)*4 )) & (~3) );
audio_starttime = PIL_check_seconds_timer();
audio_scrub = duration;
/* if audio already is playing, just reseek, otherwise
remember scrub-duration */
if (!(audio_playing && !audio_scrub)) {
audio_scrub = duration;
}
if (!mixdown) {
SDL_PauseAudio(0);
audio_playing++;