Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-23 01:27:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

instance audio streams before AudioServer::lock call

Browse Source
This commit is contained in:
Ellen Poe 2022-03-22 05:58:17 -07:00 committed by Relintai
parent 18d0362cc0
commit 94c765d065
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/2d/audio_stream_player_2d.cpp
View File

@ -275,6 +275,9 @@ void AudioStreamPlayer2D::_notification(int p_what) {
}
void AudioStreamPlayer2D::set_stream(Ref<AudioStream> p_stream) {
// Instancing audio streams can cause large memory allocations, do it prior to AudioServer::lock.
Ref<AudioStreamPlayback> pre_instanced_playback = p_stream->instance_playback();
AudioServer::get_singleton()->lock();
mix_buffer.resize(AudioServer::get_singleton()->thread_get_mix_buffer_size());
@ -288,7 +291,7 @@ void AudioStreamPlayer2D::set_stream(Ref<AudioStream> p_stream) {
if (p_stream.is_valid()) {
stream = p_stream;
stream_playback = p_stream->instance_playback();
stream_playback = pre_instanced_playback;
}
AudioServer::get_singleton()->unlock();

5
scene/3d/audio_stream_player_3d.cpp
View File

@ -627,6 +627,9 @@ void AudioStreamPlayer3D::_notification(int p_what) {
}
void AudioStreamPlayer3D::set_stream(Ref<AudioStream> p_stream) {
// Instancing audio streams can cause large memory allocations, do it prior to AudioServer::lock.
Ref<AudioStreamPlayback> pre_instanced_playback = p_stream->instance_playback();
AudioServer::get_singleton()->lock();
mix_buffer.resize(AudioServer::get_singleton()->thread_get_mix_buffer_size());
@ -640,7 +643,7 @@ void AudioStreamPlayer3D::set_stream(Ref<AudioStream> p_stream) {
if (p_stream.is_valid()) {
stream = p_stream;
stream_playback = p_stream->instance_playback();
stream_playback = pre_instanced_playback;
}
AudioServer::get_singleton()->unlock();

5
scene/audio/audio_stream_player.cpp
View File

@ -167,6 +167,9 @@ void AudioStreamPlayer::_notification(int p_what) {
}
void AudioStreamPlayer::set_stream(Ref<AudioStream> p_stream) {
// Instancing audio streams can cause large memory allocations, do it prior to AudioServer::lock.
Ref<AudioStreamPlayback> pre_instanced_playback = p_stream->instance_playback();
AudioServer::get_singleton()->lock();
if (active.is_set() && stream_playback.is_valid() && !stream_paused) {
@ -203,7 +206,7 @@ void AudioStreamPlayer::set_stream(Ref<AudioStream> p_stream) {
if (p_stream.is_valid()) {
stream = p_stream;
stream_playback = p_stream->instance_playback();
stream_playback = pre_instanced_playback;
}
AudioServer::get_singleton()->unlock();