Procházet zdrojové kódy

Merge pull request #46040 from ellenhp/fix_seek_playback_pos

Return setseek position if one exists in get_playback_position.
Rémi Verschelde před 4 roky
rodič
revize
c7444b033e

+ 3 - 0
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();
 	}
 

+ 3 - 0
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();
 	}
 

+ 3 - 0
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();
 	}