Unverified Commit 3cfb9df3 by Hein-Pieter van Braam Committed by GitHub

Revert "Use fake audio playing property in editor"

parent 24dbe5e3
...@@ -233,6 +233,7 @@ void AudioStreamPlayer2D::_notification(int p_what) { ...@@ -233,6 +233,7 @@ void AudioStreamPlayer2D::_notification(int p_what) {
//stop playing if no longer active //stop playing if no longer active
if (!active) { if (!active) {
set_physics_process_internal(false); 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 //_change_notify("playing"); //update property in editor
emit_signal("finished"); emit_signal("finished");
} }
...@@ -312,11 +313,6 @@ void AudioStreamPlayer2D::stop() { ...@@ -312,11 +313,6 @@ void AudioStreamPlayer2D::stop() {
bool AudioStreamPlayer2D::is_playing() const { bool AudioStreamPlayer2D::is_playing() const {
#ifdef TOOLS_ENABLED
if (Engine::get_singleton()->is_editor_hint())
return fake_active;
#endif
if (stream_playback.is_valid()) { if (stream_playback.is_valid()) {
return active; // && stream_playback->is_playing(); return active; // && stream_playback->is_playing();
} }
...@@ -361,16 +357,11 @@ bool AudioStreamPlayer2D::is_autoplay_enabled() { ...@@ -361,16 +357,11 @@ bool AudioStreamPlayer2D::is_autoplay_enabled() {
void AudioStreamPlayer2D::_set_playing(bool p_enable) { void AudioStreamPlayer2D::_set_playing(bool p_enable) {
#ifdef TOOLS_ENABLED
fake_active = p_enable;
#endif
if (p_enable) if (p_enable)
play(); play();
else else
stop(); stop();
} }
bool AudioStreamPlayer2D::_is_active() const { bool AudioStreamPlayer2D::_is_active() const {
return active; return active;
......
...@@ -69,10 +69,6 @@ private: ...@@ -69,10 +69,6 @@ private:
volatile bool active; volatile bool active;
volatile float setplay; volatile float setplay;
#ifdef TOOLS_ENABLED
volatile bool fake_active;
#endif
float volume_db; float volume_db;
float pitch_scale; float pitch_scale;
bool autoplay; bool autoplay;
......
...@@ -543,6 +543,7 @@ void AudioStreamPlayer3D::_notification(int p_what) { ...@@ -543,6 +543,7 @@ void AudioStreamPlayer3D::_notification(int p_what) {
//stop playing if no longer active //stop playing if no longer active
if (!active) { if (!active) {
set_physics_process_internal(false); 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 //_change_notify("playing"); //update property in editor
emit_signal("finished"); emit_signal("finished");
} }
...@@ -640,11 +641,6 @@ void AudioStreamPlayer3D::stop() { ...@@ -640,11 +641,6 @@ void AudioStreamPlayer3D::stop() {
bool AudioStreamPlayer3D::is_playing() const { bool AudioStreamPlayer3D::is_playing() const {
#ifdef TOOLS_ENABLED
if (Engine::get_singleton()->is_editor_hint())
return fake_active;
#endif
if (stream_playback.is_valid()) { if (stream_playback.is_valid()) {
return active; // && stream_playback->is_playing(); return active; // && stream_playback->is_playing();
} }
...@@ -689,16 +685,11 @@ bool AudioStreamPlayer3D::is_autoplay_enabled() { ...@@ -689,16 +685,11 @@ bool AudioStreamPlayer3D::is_autoplay_enabled() {
void AudioStreamPlayer3D::_set_playing(bool p_enable) { void AudioStreamPlayer3D::_set_playing(bool p_enable) {
#ifdef TOOLS_ENABLED
fake_active = p_enable;
#endif
if (p_enable) if (p_enable)
play(); play();
else else
stop(); stop();
} }
bool AudioStreamPlayer3D::_is_active() const { bool AudioStreamPlayer3D::_is_active() const {
return active; return active;
......
...@@ -102,10 +102,6 @@ private: ...@@ -102,10 +102,6 @@ private:
volatile bool active; volatile bool active;
volatile float setplay; volatile float setplay;
#ifdef TOOLS_ENABLED
volatile bool fake_active;
#endif
AttenuationModel attenuation_model; AttenuationModel attenuation_model;
float unit_db; float unit_db;
float unit_size; float unit_size;
......
...@@ -127,7 +127,6 @@ void AudioStreamPlayer::_notification(int p_what) { ...@@ -127,7 +127,6 @@ void AudioStreamPlayer::_notification(int p_what) {
if (!active || (setseek < 0 && !stream_playback->is_playing())) { if (!active || (setseek < 0 && !stream_playback->is_playing())) {
active = false; active = false;
set_process_internal(false); set_process_internal(false);
//_change_notify("playing"); //update property in editor
emit_signal("finished"); emit_signal("finished");
} }
} }
...@@ -212,13 +211,8 @@ void AudioStreamPlayer::stop() { ...@@ -212,13 +211,8 @@ void AudioStreamPlayer::stop() {
bool AudioStreamPlayer::is_playing() const { bool AudioStreamPlayer::is_playing() const {
#ifdef TOOLS_ENABLED
if (Engine::get_singleton()->is_editor_hint())
return fake_active;
#endif
if (stream_playback.is_valid()) { if (stream_playback.is_valid()) {
return active; // && stream_playback->is_playing(); return active; //&& stream_playback->is_playing();
} }
return false; return false;
...@@ -271,16 +265,11 @@ AudioStreamPlayer::MixTarget AudioStreamPlayer::get_mix_target() const { ...@@ -271,16 +265,11 @@ AudioStreamPlayer::MixTarget AudioStreamPlayer::get_mix_target() const {
void AudioStreamPlayer::_set_playing(bool p_enable) { void AudioStreamPlayer::_set_playing(bool p_enable) {
#ifdef TOOLS_ENABLED
fake_active = p_enable;
#endif
if (p_enable) if (p_enable)
play(); play();
else else
stop(); stop();
} }
bool AudioStreamPlayer::_is_active() const { bool AudioStreamPlayer::_is_active() const {
return active; return active;
......
...@@ -53,10 +53,6 @@ private: ...@@ -53,10 +53,6 @@ private:
volatile float setseek; volatile float setseek;
volatile bool active; volatile bool active;
#ifdef TOOLS_ENABLED
volatile bool fake_active;
#endif
float mix_volume_db; float mix_volume_db;
float pitch_scale; float pitch_scale;
float volume_db; float volume_db;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment