diff options
author | Jörg Müller <nexyon@gmail.com> | 2020-03-23 11:33:02 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2020-03-23 11:34:26 +0300 |
commit | 0710fb724beb38cf76e0e9bce2c2b310027bef29 (patch) | |
tree | a689fa6316d0dcff67edd685de288d05858fd2e9 /source/blender/blenkernel | |
parent | 46c0da6e69c38973e5616bb0a0f7f2ff7b43d5fa (diff) |
Fix T72632: Blender crashes using Jack with AV Sync enabled (repeatable)
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_sound.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sound.c | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index 1298f25fcc4..af50e61eb2d 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -117,6 +117,9 @@ void BKE_sound_ensure_scene(struct Scene *scene); void BKE_sound_destroy_scene(struct Scene *scene); +void BKE_sound_lock_scene(struct Scene *scene); +void BKE_sound_unlock_scene(struct Scene *scene); + void BKE_sound_reset_scene_specs(struct Scene *scene); void BKE_sound_mute_scene(struct Scene *scene, int muted); diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 5aa445c2146..3bb95eaeff0 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -550,6 +550,16 @@ void BKE_sound_destroy_scene(Scene *scene) } } +void BKE_sound_lock_scene(struct Scene *scene) +{ + AUD_Device_lock(sound_device); +} + +void BKE_sound_unlock_scene(struct Scene *scene) +{ + AUD_Device_unlock(sound_device); +} + void BKE_sound_reset_scene_specs(Scene *scene) { sound_verify_evaluated_id(&scene->id); @@ -1151,6 +1161,12 @@ void BKE_sound_create_scene(Scene *UNUSED(scene)) void BKE_sound_destroy_scene(Scene *UNUSED(scene)) { } +void BKE_sound_lock_scene(Scene *UNUSED(scene)) +{ +} +void BKE_sound_unlock_scene(Scene *UNUSED(scene)) +{ +} void BKE_sound_reset_scene_specs(Scene *UNUSED(scene)) { } |