diff options
author | Jörg Müller <nexyon@gmail.com> | 2019-05-30 15:21:58 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2019-05-30 15:22:48 +0300 |
commit | 05138d2c4ea21f75b9de57fa41f5c303c24cd655 (patch) | |
tree | 69e8d62de2e94f1314630c353a18fc2626431a9a /source/blender/blenkernel | |
parent | 296527eab79495b8fe253368e1a08359fec73a95 (diff) |
Fix T65231: Null audio device and AV Sync halts playback
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/sound.c | 4 |
1 files changed, 4 insertions, 0 deletions
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(); } |