godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70515 from stmSi/fix-hanging-audio-pitch-scale 

Fix hanging if audiostream's pitch_scale is NaN
This commit is contained in:
Rémi Verschelde 2023-02-17 14:06:55 +01:00
parent 1e3f42fccb 2041616934
commit 9583c20171
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/2d/audio_stream_player_2d.cpp
View File

@ -234,7 +234,7 @@ float AudioStreamPlayer2D::get_volume_db() const {
} }
void AudioStreamPlayer2D::set_pitch_scale(float p_pitch_scale) { void AudioStreamPlayer2D::set_pitch_scale(float p_pitch_scale) {
ERR_FAIL_COND(p_pitch_scale <= 0.0); ERR_FAIL_COND(!(p_pitch_scale > 0.0));
pitch_scale = p_pitch_scale; pitch_scale = p_pitch_scale;
for (Ref<AudioStreamPlayback> &playback : stream_playbacks) { for (Ref<AudioStreamPlayback> &playback : stream_playbacks) {
AudioServer::get_singleton()->set_playback_pitch_scale(playback, p_pitch_scale); AudioServer::get_singleton()->set_playback_pitch_scale(playback, p_pitch_scale);

2
scene/3d/audio_stream_player_3d.cpp
View File

@ -559,7 +559,7 @@ float AudioStreamPlayer3D::get_max_db() const {
} }
void AudioStreamPlayer3D::set_pitch_scale(float p_pitch_scale) { void AudioStreamPlayer3D::set_pitch_scale(float p_pitch_scale) {
ERR_FAIL_COND(p_pitch_scale <= 0.0); ERR_FAIL_COND(!(p_pitch_scale > 0.0));
pitch_scale = p_pitch_scale; pitch_scale = p_pitch_scale;
} }

2
scene/audio/audio_stream_player.cpp
View File

@ -111,7 +111,7 @@ float AudioStreamPlayer::get_volume_db() const {
} }
void AudioStreamPlayer::set_pitch_scale(float p_pitch_scale) { void AudioStreamPlayer::set_pitch_scale(float p_pitch_scale) {
ERR_FAIL_COND(p_pitch_scale <= 0.0); ERR_FAIL_COND(!(p_pitch_scale > 0.0));
pitch_scale = p_pitch_scale; pitch_scale = p_pitch_scale;
for (Ref<AudioStreamPlayback> &playback : stream_playbacks) { for (Ref<AudioStreamPlayback> &playback : stream_playbacks) {

2
servers/audio/effects/audio_effect_pitch_shift.cpp
View File

@ -309,7 +309,7 @@ Ref<AudioEffectInstance> AudioEffectPitchShift::instantiate() {
} }
void AudioEffectPitchShift::set_pitch_scale(float p_pitch_scale) { void AudioEffectPitchShift::set_pitch_scale(float p_pitch_scale) {
ERR_FAIL_COND(p_pitch_scale <= 0.0); ERR_FAIL_COND(!(p_pitch_scale > 0.0));
pitch_scale = p_pitch_scale; pitch_scale = p_pitch_scale;
} }