summaryrefslogtreecommitdiff
path: root/scene/3d
diff options
context:
space:
mode:
Diffstat (limited to 'scene/3d')
-rw-r--r--scene/3d/audio_stream_player_3d.cpp11
-rw-r--r--scene/3d/audio_stream_player_3d.h4
2 files changed, 1 insertions, 14 deletions
diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp
index fa2b798769..c2a50ec7bb 100644
--- a/scene/3d/audio_stream_player_3d.cpp
+++ b/scene/3d/audio_stream_player_3d.cpp
@@ -543,6 +543,7 @@ void AudioStreamPlayer3D::_notification(int p_what) {
//stop playing if no longer active
if (!active) {
set_physics_process_internal(false);
+ //do not update, this makes it easier to animate (will shut off otherwise)
//_change_notify("playing"); //update property in editor
emit_signal("finished");
}
@@ -640,11 +641,6 @@ void AudioStreamPlayer3D::stop() {
bool AudioStreamPlayer3D::is_playing() const {
-#ifdef TOOLS_ENABLED
- if (Engine::get_singleton()->is_editor_hint())
- return fake_active;
-#endif
-
if (stream_playback.is_valid()) {
return active; // && stream_playback->is_playing();
}
@@ -689,16 +685,11 @@ bool AudioStreamPlayer3D::is_autoplay_enabled() {
void AudioStreamPlayer3D::_set_playing(bool p_enable) {
-#ifdef TOOLS_ENABLED
- fake_active = p_enable;
-#endif
-
if (p_enable)
play();
else
stop();
}
-
bool AudioStreamPlayer3D::_is_active() const {
return active;
diff --git a/scene/3d/audio_stream_player_3d.h b/scene/3d/audio_stream_player_3d.h
index 0e44ffd273..1fcb83cf21 100644
--- a/scene/3d/audio_stream_player_3d.h
+++ b/scene/3d/audio_stream_player_3d.h
@@ -102,10 +102,6 @@ private:
volatile bool active;
volatile float setplay;
-#ifdef TOOLS_ENABLED
- volatile bool fake_active;
-#endif
-
AttenuationModel attenuation_model;
float unit_db;
float unit_size;