summaryrefslogtreecommitdiff
path: root/scene/audio/stream_player.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/audio/stream_player.cpp')
-rw-r--r--scene/audio/stream_player.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/audio/stream_player.cpp b/scene/audio/stream_player.cpp
index 699d068287..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);
@@ -325,7 +325,7 @@ void StreamPlayer::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_stream","stream:Stream"),&StreamPlayer::set_stream);
ObjectTypeDB::bind_method(_MD("get_stream:Stream"),&StreamPlayer::get_stream);
- ObjectTypeDB::bind_method(_MD("play"),&StreamPlayer::play);
+ ObjectTypeDB::bind_method(_MD("play"),&StreamPlayer::play,DEFVAL(0));
ObjectTypeDB::bind_method(_MD("stop"),&StreamPlayer::stop);
ObjectTypeDB::bind_method(_MD("is_playing"),&StreamPlayer::is_playing);