godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #108384 from adamscott/fix-sample-deletion

Browse Source 
[Web] Fix sample playback deletion and `AudioStreamPolyphonic` issue
This commit is contained in:
Thaddeus Crews
2025-08-03 10:50:49 -05:00
parent c2202d36c1 1328921e04
commit 321f2391d9
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
servers/audio_server.cpp
View File

@@ -1918,12 +1918,13 @@ void AudioServer::start_sample_playback(const Ref<AudioSamplePlayback> &p_playba
void AudioServer::stop_sample_playback(const Ref<AudioSamplePlayback> &p_playback) {
ERR_FAIL_COND_MSG(p_playback.is_null(), "Parameter p_playback is null.");
if (sample_playback_list.has(p_playback)) {
sample_playback_list.erase(p_playback);
AudioDriver::get_singleton()->stop_sample_playback(p_playback);
p_playback->stream_playback->set_sample_playback(nullptr);
stop_playback_stream(p_playback->stream_playback);
if (!sample_playback_list.has(p_playback)) {
return;
}
sample_playback_list.erase(p_playback);
AudioDriver::get_singleton()->stop_sample_playback(p_playback);
p_playback->stream_playback->set_sample_playback(nullptr);
stop_playback_stream(p_playback->stream_playback);
}
void AudioServer::set_sample_playback_pause(const Ref<AudioSamplePlayback> &p_playback, bool p_paused) {
@@ -1933,7 +1934,7 @@ void AudioServer::set_sample_playback_pause(const Ref<AudioSamplePlayback> &p_pl
bool AudioServer::is_sample_playback_active(const Ref<AudioSamplePlayback> &p_playback) {
ERR_FAIL_COND_V_MSG(p_playback.is_null(), false, "Parameter p_playback is null.");
return AudioDriver::get_singleton()->is_sample_playback_active(p_playback);
return sample_playback_list.has(p_playback);
}
double AudioServer::get_sample_playback_position(const Ref<AudioSamplePlayback> &p_playback) {