diff options
| author | Chris Bradfield <chris@kidscancode.org> | 2017-09-09 20:10:28 -0700 |
|---|---|---|
| committer | Chris Bradfield <chris@kidscancode.org> | 2017-09-09 20:10:28 -0700 |
| commit | 134e24408a3ae6273da5998ee257495eff79eb1a (patch) | |
| tree | 566c3d82ed1925a3d6dcd34c6cb1687328af7f6e /scene/2d/audio_stream_player_2d.cpp | |
| parent | f66e9158a8a49d1fb88cd31975a2a492b3aa1d6e (diff) | |
| parent | d1cb73b47a17de830d9474026ffa7b3587cfbc68 (diff) | |
Merge branch 'master' of git://github.com/godotengine/godot into kcc_lightoccluder2d_doc
Diffstat (limited to 'scene/2d/audio_stream_player_2d.cpp')
| -rw-r--r-- | scene/2d/audio_stream_player_2d.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index 39d3f2d6bf..ea2e77fc47 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -217,13 +217,15 @@ void AudioStreamPlayer2D::_notification(int p_what) { setseek = setplay; active = true; setplay = -1; - _change_notify("playing"); //update property in editor + //do not update, this makes it easier to animate (will shut off otherise) + //_change_notify("playing"); //update property in editor } //stop playing if no longer active if (!active) { set_fixed_process_internal(false); - _change_notify("playing"); //update property in editor + //do not update, this makes it easier to animate (will shut off otherise) + //_change_notify("playing"); //update property in editor emit_signal("finished"); } } @@ -439,7 +441,7 @@ void AudioStreamPlayer2D::_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, "playing", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "_set_playing", "_is_active"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "play", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "_set_playing", "_is_active"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "autoplay"), "set_autoplay", "is_autoplay_enabled"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "max_distance", PROPERTY_HINT_RANGE, "1,65536,1"), "set_max_distance", "get_max_distance"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "attenuation", PROPERTY_HINT_EXP_EASING), "set_attenuation", "get_attenuation"); |