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/audio | |
| parent | 24dbe5e3102a0d4830904901de8f6a9ee25d68d5 (diff) | |
Revert "Use fake audio playing property in editor"
Diffstat (limited to 'scene/audio')
| -rw-r--r-- | scene/audio/audio_player.cpp | 13 | ||||
| -rw-r--r-- | scene/audio/audio_player.h | 4 |
2 files changed, 1 insertions, 16 deletions
diff --git a/scene/audio/audio_player.cpp b/scene/audio/audio_player.cpp index e7ace82fc0..408c00334a 100644 --- a/scene/audio/audio_player.cpp +++ b/scene/audio/audio_player.cpp @@ -127,7 +127,6 @@ void AudioStreamPlayer::_notification(int p_what) { if (!active || (setseek < 0 && !stream_playback->is_playing())) { active = false; set_process_internal(false); - //_change_notify("playing"); //update property in editor emit_signal("finished"); } } @@ -212,13 +211,8 @@ void AudioStreamPlayer::stop() { bool AudioStreamPlayer::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(); + return active; //&& stream_playback->is_playing(); } return false; @@ -271,16 +265,11 @@ AudioStreamPlayer::MixTarget AudioStreamPlayer::get_mix_target() const { void AudioStreamPlayer::_set_playing(bool p_enable) { -#ifdef TOOLS_ENABLED - fake_active = p_enable; -#endif - if (p_enable) play(); else stop(); } - bool AudioStreamPlayer::_is_active() const { return active; diff --git a/scene/audio/audio_player.h b/scene/audio/audio_player.h index f2e2684642..21189aea6d 100644 --- a/scene/audio/audio_player.h +++ b/scene/audio/audio_player.h @@ -53,10 +53,6 @@ private: volatile float setseek; volatile bool active; -#ifdef TOOLS_ENABLED - volatile bool fake_active; -#endif - float mix_volume_db; float pitch_scale; float volume_db; |