From 99331ca39503dde8b9a426cc3cf80b83cbbe41db Mon Sep 17 00:00:00 2001 From: MrCdK Date: Mon, 1 Jan 2018 22:23:16 +0100 Subject: Added pitch scale property to AudioStreamPlayer, AudioStreamPlayer2D and AudioStreamPlayer3D (cherry picked from commit 5bc010e8eeef71ad9a9034bd16df454a9933592a) --- servers/audio/audio_stream.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'servers') diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp index b207c5f4d..0ad30987e 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++) { -- cgit v1.2.3-70-g09d2