Commit: 05138d2c4ea21f75b9de57fa41f5c303c24cd655
Author: Jörg Müller
Date: Thu May 30 14:21:58 2019 +0200
Branches: master
https://developer.blender.org/rB05138d2c4ea21f75b9de57fa41f5c303c24cd655
Fix T65231: Null audio device and AV Sync halts playback
===================================================================
M source/blender/blenkernel/intern/sound.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sound.c
b/source/blender/blenkernel/intern/sound.c
index c97baf8f7dd..913d9be9a62 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -806,6 +806,10 @@ int BKE_sound_scene_playing(Scene *scene)
return -1;
}
+ // in case of a "Null" audio device, we have no playback information
+ if (AUD_Device_getRate(sound_device) == AUD_RATE_INVALID)
+ return -1;
+
if (scene->audio.flag & AUDIO_SYNC) {
return AUD_isSynchronizerPlaying();
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
