diff options
| author | Ariel Manzur <ariel@godotengine.org> | 2015-12-21 09:17:15 -0300 |
|---|---|---|
| committer | Ariel Manzur <ariel@godotengine.org> | 2015-12-21 09:17:15 -0300 |
| commit | 0576e1e28f41f103cd06452d810a04265e3574cc (patch) | |
| tree | 817c1a5e3ca8b8f786e013c0322e4052e7f85d59 /scene/audio/stream_player.cpp | |
| parent | 72a6b137ba256f5198843f8980107c350d52e5ca (diff) | |
| parent | 15429d6ac95acb044c9eebd64356f33e7e5d14ef (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/audio/stream_player.cpp')
| -rw-r--r-- | scene/audio/stream_player.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scene/audio/stream_player.cpp b/scene/audio/stream_player.cpp index 4cfca0492a..004c20bc35 100644 --- a/scene/audio/stream_player.cpp +++ b/scene/audio/stream_player.cpp @@ -67,7 +67,7 @@ bool StreamPlayer::sp_mix(int32_t *p_buffer,int p_frames) { void StreamPlayer::sp_update() { - //_THREAD_SAFE_METHOD_ + _THREAD_SAFE_METHOD_ if (!paused && resampler.is_ready() && playback.is_valid()) { if (!playback->is_playing()) { @@ -143,8 +143,6 @@ void StreamPlayer::play(float p_from_offset) { return; //if (is_playing()) stop(); - - //_THREAD_SAFE_METHOD_ playback->play(p_from_offset); //feed the ringbuffer as long as no update callback is going on sp_update(); @@ -162,8 +160,8 @@ void StreamPlayer::stop() { if (playback.is_null()) return; - //_THREAD_SAFE_METHOD_ AudioServer::get_singleton()->stream_set_active(stream_rid,false); + _THREAD_SAFE_METHOD_ playback->stop(); resampler.flush(); |