[Bf-blender-cvs] [f80064f] master: Fix compiling after sound changes

[Jens Verwiebe]

Commit: f80064f2d24408aa85c84f3c328ef470baf39e7c
Author: Jens Verwiebe
Date:   Thu Mar 26 13:19:33 2015 +0100
Branches: master
https://developer.blender.org/rBf80064f2d24408aa85c84f3c328ef470baf39e7c

Fix compiling after sound changes

===================================================================

M       source/blender/blenkernel/intern/sound.c
M       source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sound.c 
b/source/blender/blenkernel/intern/sound.c
index 4d14b2f..6a831d2 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 beb5ae7..15a4ef5 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++;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs