[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32256] trunk/blender/source/blender/ blenkernel: Fix for [#24051] Scrubbing Timeline in VSE with Jack Audio doesn' t scrub just plays the audio track

[Joerg Mueller]

Revision: 32256
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32256
Author:   nexyon
Date:     2010-10-02 17:27:55 +0200 (Sat, 02 Oct 2010)

Log Message:
-----------
Fix for [#24051] Scrubbing Timeline in VSE with Jack Audio doesn't scrub just plays the audio track

There were actually two bugs, the one reported and that the Sync Callback never has been called after someone had to add #ifdefs around the call without checking that the build systems are even configured to add the needed definition, am I right Cam? :P

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/CMakeLists.txt
    trunk/blender/source/blender/blenkernel/SConscript
    trunk/blender/source/blender/blenkernel/intern/sound.c

Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt	2010-10-02 14:45:56 UTC (rev 32255)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt	2010-10-02 15:27:55 UTC (rev 32256)
@@ -115,6 +115,10 @@
 	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 ENDIF(NOT WITH_FLUID)
 
+IF(WITH_JACK)
+	ADD_DEFINITIONS(-DWITH_JACK)
+ENDIF(NOT WITH_FLUID)
+
 IF(WITH_LZO)
 	LIST(APPEND INC ../../../extern/lzo/minilzo)
 	ADD_DEFINITIONS(-DWITH_LZO)

Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript	2010-10-02 14:45:56 UTC (rev 32255)
+++ trunk/blender/source/blender/blenkernel/SConscript	2010-10-02 15:27:55 UTC (rev 32256)
@@ -53,6 +53,9 @@
 if env['WITH_BF_HDR']:
     defs.append('WITH_HDR')
 
+if env['WITH_BF_JACK']:
+    defs.append('WITH_JACK')
+
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC']

Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c	2010-10-02 14:45:56 UTC (rev 32255)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c	2010-10-02 15:27:55 UTC (rev 32256)
@@ -433,9 +433,11 @@
 
 	if(scene->audio.flag & AUDIO_SCRUB && !CTX_wm_screen(C)->animtimer)
 	{
-		// AUD_XXX TODO: fix scrubbing, it currently doesn't stop playing
 		if(scene->audio.flag & AUDIO_SYNC)
+		{
+			AUD_seek(scene->sound_scene_handle, CFRA / FPS);
 			AUD_seekSequencer(scene->sound_scene_handle, CFRA / FPS);
+		}
 		else
 			AUD_seek(scene->sound_scene_handle, CFRA / FPS);
 		AUD_resume(scene->sound_scene_handle);