summaryrefslogtreecommitdiff
path: root/servers/audio
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-02-01 14:26:27 +0100
committerGitHub <noreply@github.com>2018-02-01 14:26:27 +0100
commitff287d8341774750b7141f364de1087f48b14699 (patch)
tree975d75ee3c6e54959af314b408840ca9650dc347 /servers/audio
parent6449af9f746b6328c7791e87b70b56eb74d8a9b9 (diff)
parent5bc010e8eeef71ad9a9034bd16df454a9933592a (diff)
Merge pull request #15254 from mrcdk/pitch_scale
Added pitch scale property to AudioStreamPlayer, AudioStreamPlayer2D and AudioStreamPlayer3D
Diffstat (limited to 'servers/audio')
-rw-r--r--servers/audio/audio_stream.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp
index b207c5f4db..0ad30987e7 100644
--- a/servers/audio/audio_stream.cpp
+++ b/servers/audio/audio_stream.cpp
@@ -46,9 +46,9 @@ void AudioStreamPlaybackResampled::_begin_resample() {
void AudioStreamPlaybackResampled::mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) {
- float target_rate = AudioServer::get_singleton()->get_mix_rate() * p_rate_scale;
+ float target_rate = AudioServer::get_singleton()->get_mix_rate();
- uint64_t mix_increment = uint64_t((get_stream_sampling_rate() / double(target_rate)) * double(FP_LEN));
+ uint64_t mix_increment = uint64_t(((get_stream_sampling_rate() * p_rate_scale) / double(target_rate)) * double(FP_LEN));
for (int i = 0; i < p_frames; i++) {