diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-19 11:24:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-19 11:24:57 +0100 |
commit | c8c3bcd32f831c6eae388950444f88a79ba1fdfe (patch) | |
tree | b4b44edb2b9f65333df348b070477454de28b14e | |
parent | aeea4280a011340ec91a2ed109e3aa6780fe0081 (diff) | |
parent | eb5566f5c5f6ed6171a9d271ffff766e7a9f8a04 (diff) | |
download | redot-engine-c8c3bcd32f831c6eae388950444f88a79ba1fdfe.tar.gz |
Merge pull request #46202 from ellenhp/fix_mix_before_start
Always call start() on audio stream before mixing
-rw-r--r-- | scene/audio/audio_stream_player.cpp | 2 | ||||
-rw-r--r-- | scene/audio/audio_stream_player.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp index 7957571ab7..2853a8b9d9 100644 --- a/scene/audio/audio_stream_player.cpp +++ b/scene/audio/audio_stream_player.cpp @@ -105,7 +105,7 @@ void AudioStreamPlayer::_mix_audio() { } if (stream_paused) { - if (stream_paused_fade) { + if (stream_paused_fade && stream_playback->is_playing()) { _mix_internal(true); stream_paused_fade = false; } diff --git a/scene/audio/audio_stream_player.h b/scene/audio/audio_stream_player.h index d8f83ee38d..aa8d088be5 100644 --- a/scene/audio/audio_stream_player.h +++ b/scene/audio/audio_stream_player.h @@ -50,7 +50,7 @@ private: Ref<AudioStream> stream; Vector<AudioFrame> mix_buffer; Vector<AudioFrame> fadeout_buffer; - bool use_fadeout; + bool use_fadeout = false; SafeNumeric<float> setseek{ -1.0 }; SafeFlag active; |