diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-16 12:19:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 12:19:09 +0100 |
| commit | c7444b033ef9bb567afe5cf5e82d67cbdfec396d (patch) | |
| tree | 2d5c812a27dc9abace7a4587b26e6899bac6a9b4 | |
| parent | 997a9f37f7fe74957732d3244a4a4eb85297eea3 (diff) | |
| parent | 15b8480b2c76eecb5c9c31b88828345eed6224d6 (diff) | |
Merge pull request #46040 from ellenhp/fix_seek_playback_pos
Return setseek position if one exists in get_playback_position.
| -rw-r--r-- | scene/2d/audio_stream_player_2d.cpp | 3 | ||||
| -rw-r--r-- | scene/3d/audio_stream_player_3d.cpp | 3 | ||||
| -rw-r--r-- | scene/audio/audio_stream_player.cpp | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index 4e7eec906c..d6f35cc99d 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -342,6 +342,9 @@ bool AudioStreamPlayer2D::is_playing() const { float AudioStreamPlayer2D::get_playback_position() { if (stream_playback.is_valid()) { + if (setseek >= 0.0) { + return setseek; + } return stream_playback->get_playback_position(); } diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index d420bd6075..65d0703139 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -714,6 +714,9 @@ bool AudioStreamPlayer3D::is_playing() const { float AudioStreamPlayer3D::get_playback_position() { if (stream_playback.is_valid()) { + if (setseek >= 0.0) { + return setseek; + } return stream_playback->get_playback_position(); } diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp index 4f77734b79..ec0a4b8696 100644 --- a/scene/audio/audio_stream_player.cpp +++ b/scene/audio/audio_stream_player.cpp @@ -267,6 +267,9 @@ bool AudioStreamPlayer::is_playing() const { float AudioStreamPlayer::get_playback_position() { if (stream_playback.is_valid()) { + if (setseek >= 0.0) { + return setseek; + } return stream_playback->get_playback_position(); } |