[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13845] trunk/blender/source/blender/src/ seqaudio.c: == Sequencer ==

[Peter Schlaile]

Revision: 13845
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13845
Author:   schlaile
Date:     2008-02-24 14:49:31 +0100 (Sun, 24 Feb 2008)

Log Message:
-----------
== Sequencer ==

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.

Modified Paths:
--------------
    trunk/blender/source/blender/src/seqaudio.c

Modified: trunk/blender/source/blender/src/seqaudio.c
===================================================================
--- trunk/blender/source/blender/src/seqaudio.c	2008-02-24 13:26:27 UTC (rev 13844)
+++ trunk/blender/source/blender/src/seqaudio.c	2008-02-24 13:49:31 UTC (rev 13845)
@@ -496,7 +496,7 @@
 		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 @@
 			      *(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++;