diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-13 21:24:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-13 21:24:33 +0400 |
| commit | 5e841e4b4a30bbb242290407740b5ca3afbab972 (patch) | |
| tree | 67f6688a1460b3542b667e19454f43a0684c37d0 /source/blender/blenkernel/intern/sound.c | |
| parent | 91a6e434855621eb53a29c9c2d5d95350732b566 (diff) | |
fix for animation playback and build error when compiling without WITH_AUDASPACE
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index f2e3537762f..1c61646a3d8 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -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 @@ void sound_free(struct bSound* sound) #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_play_scene(struct Scene *UNUSED(scene)) {} 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; } |