Selaa lähdekoodia

Please enter the commit message for your changes. Lines starting
removed locks

Ariel Manzur 10 vuotta sitten
vanhempi
commit
c2532bffb3
2 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 3 3
      scene/audio/stream_player.cpp
  2. 1 1
      scene/audio/stream_player.h

+ 3 - 3
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);

+ 1 - 1
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;