diff options
| author | reduz <juan@okamstudio.com> | 2015-10-10 09:09:59 -0300 |
|---|---|---|
| committer | reduz <juan@okamstudio.com> | 2015-10-10 09:09:59 -0300 |
| commit | 6b20ee4324224d926a3eb43a59068c2cf12dc75e (patch) | |
| tree | 6c021363ddff3f0323190459a22536e5d6757d94 /scene | |
| parent | 422929e87fbe91be1efedf1fe3a9a71d61e58b40 (diff) | |
| parent | aad2bbdb6fb7c8217d7e75480b38e45f00cb3abd (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/sprite.cpp | 1 | ||||
| -rw-r--r-- | scene/audio/stream_player.cpp | 6 | ||||
| -rw-r--r-- | scene/audio/stream_player.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp index 6705cebf37..87697fc073 100644 --- a/scene/2d/sprite.cpp +++ b/scene/2d/sprite.cpp @@ -189,6 +189,7 @@ void Sprite::set_region_rect(const Rect2& p_region_rect) { if (region && changed) { update(); item_rect_changed(); + _change_notify("region_rect"); } } 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; |