diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-22 01:11:58 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-22 01:11:58 +0400 |
| commit | 4532bd731d5edbe348d4df810856f6bdfdea705c (patch) | |
| tree | 778fdcd594b5f384eacf5cd82f50afc10bbed513 /source/blender/blenkernel/intern/sound.c | |
| parent | cf34f7509f4ea8c3f0c92045933f089c72de5313 (diff) | |
| parent | bbfe3c9c49523d3987a3144da119d8f6afd09cf9 (diff) | |
Merge with trunk up to r38584.
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 2e517b0a9af..493dfa09a65 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; @@ -98,6 +95,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) { @@ -581,7 +580,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; } |