summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-04-19 16:28:11 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-04-19 16:28:11 +0200
commite34399cdcbb3dfacf95ad3f269ac6f1f2c72449e (patch)
tree00be455dfa7a0f3ed5a4d4afcf95b3df0956cd24
parent21140aad73441801521e18b7b273fb1ef2fc7074 (diff)
parent58931c073dd26b52dc2d5182166a145cb221ad20 (diff)
downloadredot-engine-e34399cdcbb3dfacf95ad3f269ac6f1f2c72449e.tar.gz
Merge pull request #90861 from aaronp64/audio_stream_player_nan
Check for NaN in `set_volume_db` functions
-rw-r--r--scene/2d/audio_stream_player_2d.cpp1
-rw-r--r--scene/3d/audio_stream_player_3d.cpp1
-rw-r--r--scene/audio/audio_stream_player.cpp1
3 files changed, 3 insertions, 0 deletions
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp
index cbd3c244d9..4fc0fe0268 100644
--- a/scene/2d/audio_stream_player_2d.cpp
+++ b/scene/2d/audio_stream_player_2d.cpp
@@ -196,6 +196,7 @@ Ref<AudioStream> AudioStreamPlayer2D::get_stream() const {
}
void AudioStreamPlayer2D::set_volume_db(float p_volume) {
+ ERR_FAIL_COND_MSG(Math::is_nan(p_volume), "Volume can't be set to NaN.");
internal->volume_db = p_volume;
}
diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp
index f1f9a04ea0..0cef56dbf2 100644
--- a/scene/3d/audio_stream_player_3d.cpp
+++ b/scene/3d/audio_stream_player_3d.cpp
@@ -496,6 +496,7 @@ Ref<AudioStream> AudioStreamPlayer3D::get_stream() const {
}
void AudioStreamPlayer3D::set_volume_db(float p_volume) {
+ ERR_FAIL_COND_MSG(Math::is_nan(p_volume), "Volume can't be set to NaN.");
internal->volume_db = p_volume;
}
diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp
index dadcfab69f..0c2bd64e84 100644
--- a/scene/audio/audio_stream_player.cpp
+++ b/scene/audio/audio_stream_player.cpp
@@ -59,6 +59,7 @@ Ref<AudioStream> AudioStreamPlayer::get_stream() const {
}
void AudioStreamPlayer::set_volume_db(float p_volume) {
+ ERR_FAIL_COND_MSG(Math::is_nan(p_volume), "Volume can't be set to NaN.");
internal->volume_db = p_volume;
Vector<AudioFrame> volume_vector = _get_volume_vector();