diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-11-01 01:55:22 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-01 01:55:22 -0300 |
| commit | 281d6fac1edd4a5b06692b850c00db6a5a9bbb46 (patch) | |
| tree | 37a1ae9c85545c45032410006df65e697f3ccd6a /scene/audio/stream_player.cpp | |
| parent | bd736e5af2ec5113c23fef58523f57a0b2e11fb2 (diff) | |
-some fixes to audio
Diffstat (limited to 'scene/audio/stream_player.cpp')
| -rw-r--r-- | scene/audio/stream_player.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scene/audio/stream_player.cpp b/scene/audio/stream_player.cpp index bffb2de4d4..4cfca0492a 100644 --- a/scene/audio/stream_player.cpp +++ b/scene/audio/stream_player.cpp @@ -141,8 +141,8 @@ void StreamPlayer::play(float p_from_offset) { ERR_FAIL_COND(!is_inside_tree()); if (playback.is_null()) return; - if (playback->is_playing()) - stop(); + //if (is_playing()) + stop(); //_THREAD_SAFE_METHOD_ playback->play(p_from_offset); @@ -175,7 +175,7 @@ bool StreamPlayer::is_playing() const { if (playback.is_null()) return false; - return playback->is_playing(); + return playback->is_playing() || resampler.has_data(); } void StreamPlayer::set_loop(bool p_enable) { @@ -267,7 +267,9 @@ void StreamPlayer::seek_pos(float p_time) { if (playback.is_null()) return; - return playback->seek_pos(p_time); + //works better... + stop(); + playback->play(p_time); } |