diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2015-03-26 15:19:33 +0300 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2015-03-26 15:19:33 +0300 |
commit | f80064f2d24408aa85c84f3c328ef470baf39e7c (patch) | |
tree | a542f8f71d311e0ac84d53156d59efd4637a7dba /source/blender | |
parent | 59132e6481ef1ba43404b7b367e1cbfb94f7df3f (diff) |
Fix compiling after sound changes
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/sound.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 4d14b2f22de..6a831d23aea 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -141,9 +141,9 @@ static void sound_sync_callback(void *data, int mode, float time) while (scene) { if (scene->audio.flag & AUDIO_SYNC) { if (mode) - sound_play_scene(scene); + BKE_sound_play_scene(scene); else - sound_stop_scene(scene); + BKE_sound_stop_scene(scene); if (scene->sound_scene_handle) AUD_seek(scene->sound_scene_handle, time); } diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index beb5ae739b3..15a4ef5eaf6 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -548,7 +548,7 @@ static EnumPropertyItem *rna_userdef_audio_device_itemf(bContext *UNUSED(C), Poi #endif #ifdef WITH_JACK - if (sound_is_jack_supported()) { + if (BKE_sound_is_jack_supported()) { RNA_enum_item_add(&item, &totitem, &audio_device_items[index]); } index++; |