noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Revert "Use fake audio playing property in editor"

Browse Source
This commit is contained in:
Hein-Pieter van Braam
2018-05-13 21:37:08 +02:00
committed by GitHub
parent 24dbe5e310
commit 3cfb9df325
6 changed files with 3 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scene/2d/audio_stream_player_2d.cpp
View File

@@ -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;