diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-09-13 08:40:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-09-13 08:41:26 -0300 |
| commit | 06138bf18c25a8c5f7e2e5bb1ebd9dcf0b2f28dd (patch) | |
| tree | 0cabfee85fb0fc05fe79ea59f32cf49974b8ea72 /scene/audio | |
| parent | 42504ef0d4123e7fdeb1a81f59e800c3f0bdfa7b (diff) | |
Renamed play to playing property, but now playing and is_playing is the same, to avoid confusing. Closes #11211
Diffstat (limited to 'scene/audio')
| -rw-r--r-- | scene/audio/audio_player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/audio/audio_player.cpp b/scene/audio/audio_player.cpp index fb12867156..6a582c9a3d 100644 --- a/scene/audio/audio_player.cpp +++ b/scene/audio/audio_player.cpp @@ -187,7 +187,7 @@ void AudioStreamPlayer::stop() { bool AudioStreamPlayer::is_playing() const { if (stream_playback.is_valid()) { - return active && stream_playback->is_playing(); + return active; //&& stream_playback->is_playing(); } return false; @@ -302,7 +302,7 @@ void AudioStreamPlayer::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), "set_stream", "get_stream"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "volume_db", PROPERTY_HINT_RANGE, "-80,24"), "set_volume_db", "get_volume_db"); - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "play", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "_set_playing", "_is_active"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "playing", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "_set_playing", "is_playing"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "autoplay"), "set_autoplay", "is_autoplay_enabled"); ADD_PROPERTY(PropertyInfo(Variant::INT, "mix_target", PROPERTY_HINT_ENUM, "Stereo,Surround,Center"), "set_mix_target", "get_mix_target"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "bus", PROPERTY_HINT_ENUM, ""), "set_bus", "get_bus"); |