diff --git a/main/main.cpp b/main/main.cpp index 4ef54972775..88e80fa8338 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2866,8 +2866,8 @@ Error Main::setup2(bool p_show_boot_logo) { audio_server = memnew(AudioServer); audio_server->init(); - resonance_audio_server = memnew(ResonanceAudioServer); - + resonance_audio_server = memnew(ResonanceAudioServer); + OS::get_singleton()->benchmark_end_measure("Servers", "Audio"); } diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index 54e5a5cdf61..dbc3b06d30b 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -38,9 +38,9 @@ #include "scene/3d/velocity_tracker_3d.h" #include "scene/audio/audio_stream_player_internal.h" #include "scene/main/viewport.h" +#include "scene/scene_string_names.h" #include "servers/audio/audio_stream.h" #include "servers/resonanceaudio/resonance_audio_wrapper.h" -#include "scene/scene_string_names.h" // Based on "A Novel Multichannel Panning Method for Standard and Arbitrary Loudspeaker Configurations" by Ramy Sadek and Chris Kyriakakis (2004) // Speaker-Placement Correction Amplitude Panning (SPCAP) diff --git a/scene/3d/audio_stream_player_3d.h b/scene/3d/audio_stream_player_3d.h index ead73f1e09d..71498167646 100644 --- a/scene/3d/audio_stream_player_3d.h +++ b/scene/3d/audio_stream_player_3d.h @@ -117,6 +117,7 @@ class AudioStreamPlayer3D : public Node3D { float cached_global_panning_strength = 0.5f; AudioSourceId audio_source_id; + protected: void _validate_property(PropertyInfo &p_property) const; void _notification(int p_what);