diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2018-05-13 21:35:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-13 21:35:44 +0200 |
| commit | 24dbe5e3102a0d4830904901de8f6a9ee25d68d5 (patch) | |
| tree | 8e4e32627c4e5af8c73ebffb0330d0670cc26a8a /scene/audio/audio_player.cpp | |
| parent | dc7060973c6a58fa8b6b1df726edc58b8f1d31c1 (diff) | |
| parent | bc1522e26865c9b84159ff4b4bcde7896fd73496 (diff) | |
| download | redot-engine-24dbe5e3102a0d4830904901de8f6a9ee25d68d5.tar.gz | |
Merge pull request #17367 from ShyRed/audio_playing_
Use fake audio playing property in editor
Diffstat (limited to 'scene/audio/audio_player.cpp')
| -rw-r--r-- | scene/audio/audio_player.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/scene/audio/audio_player.cpp b/scene/audio/audio_player.cpp index 408c00334a..e7ace82fc0 100644 --- a/scene/audio/audio_player.cpp +++ b/scene/audio/audio_player.cpp @@ -127,6 +127,7 @@ 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"); } } @@ -211,8 +212,13 @@ 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; @@ -265,11 +271,16 @@ 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; |