diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2018-05-13 21:37:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-13 21:37:08 +0200 |
| commit | 3cfb9df3258e286acebc41f2ff10ef6cd3558dff (patch) | |
| tree | 10d681d1b6ce6f5adc230beaa8b75da796613fe2 /scene/2d | |
| parent | 24dbe5e3102a0d4830904901de8f6a9ee25d68d5 (diff) | |
Revert "Use fake audio playing property in editor"
Diffstat (limited to 'scene/2d')
| -rw-r--r-- | scene/2d/audio_stream_player_2d.cpp | 11 | ||||
| -rw-r--r-- | scene/2d/audio_stream_player_2d.h | 4 |
2 files changed, 1 insertions, 14 deletions
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index 94db832e9f..f998f23d3b 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -233,6 +233,7 @@ void AudioStreamPlayer2D::_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"); } @@ -312,11 +313,6 @@ void AudioStreamPlayer2D::stop() { bool AudioStreamPlayer2D::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(); } @@ -361,16 +357,11 @@ bool AudioStreamPlayer2D::is_autoplay_enabled() { void AudioStreamPlayer2D::_set_playing(bool p_enable) { -#ifdef TOOLS_ENABLED - fake_active = p_enable; -#endif - if (p_enable) play(); else stop(); } - bool AudioStreamPlayer2D::_is_active() const { return active; diff --git a/scene/2d/audio_stream_player_2d.h b/scene/2d/audio_stream_player_2d.h index eae18c8404..9ae8e3a518 100644 --- a/scene/2d/audio_stream_player_2d.h +++ b/scene/2d/audio_stream_player_2d.h @@ -69,10 +69,6 @@ private: volatile bool active; volatile float setplay; -#ifdef TOOLS_ENABLED - volatile bool fake_active; -#endif - float volume_db; float pitch_scale; bool autoplay; |