Skip to content

Fix code consistency between AudioStreamPlayer2D and AudioStreamPlayer3D #99734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2024
Merged

Fix code consistency between AudioStreamPlayer2D and AudioStreamPlayer3D #99734

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions scene/3d/audio_stream_player_3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ void AudioStreamPlayer3D::play(float p_from_pos) {
setplay.set(p_from_pos);

// Sample handling.
if (stream_playback->get_is_sample()) {
if (stream_playback->get_is_sample() && stream_playback->get_sample_playback().is_valid()) {
Ref<AudioSamplePlayback> sample_playback = stream_playback->get_sample_playback();
sample_playback->offset = p_from_pos;
sample_playback->bus = _get_actual_bus();
Expand All @@ -563,10 +563,7 @@ void AudioStreamPlayer3D::play(float p_from_pos) {
}

void AudioStreamPlayer3D::seek(float p_seconds) {
if (is_playing()) {
stop();
play(p_seconds);
}
internal->seek(p_seconds);
}

void AudioStreamPlayer3D::stop() {
Expand Down