[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38369] trunk/blender/source/blender/ blenkernel/intern/sound.c: fix for animation playback and build error when compiling without WITH_AUDASPACE

Campbell Barton ideasman42 at gmail.com
Wed Jul 13 19:24:34 CEST 2011


Revision: 38369
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38369
Author:   campbellbarton
Date:     2011-07-13 17:24:33 +0000 (Wed, 13 Jul 2011)
Log Message:
-----------
fix for animation playback and build error when compiling without WITH_AUDASPACE

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

Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c	2011-07-13 17:20:20 UTC (rev 38368)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c	2011-07-13 17:24:33 UTC (rev 38369)
@@ -36,9 +36,6 @@
 #include "BKE_animsys.h"
 
 
-static int force_device = -1;
-
-
 struct bSound* sound_new_file(struct Main *bmain, const char *filename)
 {
 	bSound* sound = NULL;
@@ -94,6 +91,8 @@
 
 #ifdef WITH_AUDASPACE
 
+static int force_device = -1;
+
 #ifdef WITH_JACK
 static void sound_sync_callback(void* data, int mode, float time)
 {
@@ -537,7 +536,7 @@
 void sound_stop_scene(struct Scene *UNUSED(scene)) {}
 void sound_seek_scene(struct bContext *UNUSED(C)) {}
 float sound_sync_scene(struct Scene *UNUSED(scene)) { return 0.0f; }
-int sound_scene_playing(struct Scene *UNUSED(scene)) { return 0; }
+int sound_scene_playing(struct Scene *UNUSED(scene)) { return -1; }
 int sound_read_sound_buffer(struct bSound* UNUSED(sound), float* UNUSED(buffer), int UNUSED(length), float UNUSED(start), float UNUSED(end)) { return 0; }
 int sound_get_channels(struct bSound* UNUSED(sound)) { return 1; }
 




More information about the Bf-blender-cvs mailing list