diff options
| author | Ariel Manzur <ariel@godotengine.org> | 2015-10-08 12:59:12 -0300 |
|---|---|---|
| committer | Ariel Manzur <ariel@godotengine.org> | 2015-10-08 12:59:12 -0300 |
| commit | c2532bffb3f00b8ab84785c1f311d12f65b60f71 (patch) | |
| tree | 57e7bf1c824a34fee04b32760a40f2c23796a063 /scene/audio | |
| parent | a9e68df493292b943240454d0a9b983b1cd82429 (diff) | |
Please enter the commit message for your changes. Lines starting
removed locks
Diffstat (limited to 'scene/audio')
| -rw-r--r-- | scene/audio/stream_player.cpp | 6 | ||||
| -rw-r--r-- | scene/audio/stream_player.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scene/audio/stream_player.cpp b/scene/audio/stream_player.cpp index c4e1ccc9b6..0ee9d76611 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()) { @@ -144,7 +144,7 @@ void StreamPlayer::play(float p_from_offset) { if (playback->is_playing()) stop(); - _THREAD_SAFE_METHOD_ + //_THREAD_SAFE_METHOD_ playback->play(p_from_offset); //feed the ringbuffer as long as no update callback is going on sp_update(); @@ -162,7 +162,7 @@ void StreamPlayer::stop() { if (playback.is_null()) return; - _THREAD_SAFE_METHOD_ + //_THREAD_SAFE_METHOD_ AudioServer::get_singleton()->stream_set_active(stream_rid,false); playback->stop(); //set_idle_process(false); diff --git a/scene/audio/stream_player.h b/scene/audio/stream_player.h index b5aa943067..be090f50e1 100644 --- a/scene/audio/stream_player.h +++ b/scene/audio/stream_player.h @@ -37,7 +37,7 @@ class StreamPlayer : public Node { OBJ_TYPE(StreamPlayer,Node); - _THREAD_SAFE_CLASS_ + //_THREAD_SAFE_CLASS_ struct InternalStream : public AudioServer::AudioStream { StreamPlayer *player; |