aboutsummaryrefslogtreecommitdiff
path: root/servers/audio/audio_stream.cpp
diff options
context:
space:
mode:
authorMrCdK2018-01-01 22:23:16 +0100
committerHein-Pieter van Braam2018-03-28 22:43:44 +0200
commit99331ca39503dde8b9a426cc3cf80b83cbbe41db (patch)
tree176dd57a8a8b0e1e9b2d95f4252b1f4a31df15cd /servers/audio/audio_stream.cpp
parentec362d54a958665d180f45fcdbd083b1dff4b1cf (diff)
downloadgodot-99331ca39503dde8b9a426cc3cf80b83cbbe41db.tar.gz
godot-99331ca39503dde8b9a426cc3cf80b83cbbe41db.tar.zst
godot-99331ca39503dde8b9a426cc3cf80b83cbbe41db.zip
Added pitch scale property to AudioStreamPlayer, AudioStreamPlayer2D and AudioStreamPlayer3D
(cherry picked from commit 5bc010e8eeef71ad9a9034bd16df454a9933592a)
Diffstat (limited to '')
-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 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++) {