diff options
author | Saracen <SaracenOne@gmail.com> | 2016-01-03 01:19:37 +0000 |
---|---|---|
committer | Saracen <SaracenOne@gmail.com> | 2016-01-03 01:24:30 +0000 |
commit | 53b2b0ccbe058cbf1e90699020535ae785f27964 (patch) | |
tree | f6af12143da24f7f95d532ee205dda337610fe93 /scene | |
parent | eca92bb7acd9ff70957ca2f42bb41f2240d13bf3 (diff) |
Fix delay on audio stream pause
Diffstat (limited to 'scene')
-rw-r--r-- | scene/3d/spatial_stream_player.cpp | 2 | ||||
-rw-r--r-- | scene/audio/stream_player.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/spatial_stream_player.cpp b/scene/3d/spatial_stream_player.cpp index 048c9e78ac..dfef0faf4b 100644 --- a/scene/3d/spatial_stream_player.cpp +++ b/scene/3d/spatial_stream_player.cpp @@ -60,7 +60,7 @@ void SpatialStreamPlayer::sp_set_mix_rate(int p_rate){ bool SpatialStreamPlayer::sp_mix(int32_t *p_buffer,int p_frames) { - if (resampler.is_ready()) { + if (resampler.is_ready() && !paused) { return resampler.mix(p_buffer,p_frames); } diff --git a/scene/audio/stream_player.cpp b/scene/audio/stream_player.cpp index 0180ed4a1d..f7cfc31b03 100644 --- a/scene/audio/stream_player.cpp +++ b/scene/audio/stream_player.cpp @@ -58,7 +58,7 @@ void StreamPlayer::sp_set_mix_rate(int p_rate){ bool StreamPlayer::sp_mix(int32_t *p_buffer,int p_frames) { - if (resampler.is_ready()) { + if (resampler.is_ready() && !paused) { return resampler.mix(p_buffer,p_frames); } |