mirror of
https://github.com/godotengine/godot.git
synced 2024-11-21 19:42:43 +00:00
Expose AudioStreamPlayer{2D,3D}::set_playing
and remove AudioStreamPlayer::{2D,3D}::_is_active
- The `_is_active` method seems to be unused, so it was removed. - The `_set_playing` method is now exposed, as the setter of the `playing` property. - The `play` method can't be used as a setter because it takes a `float` parameter instead of a `bool` parameter.
This commit is contained in:
parent
a5830f6eb9
commit
7fd261c8c1
@ -77,7 +77,7 @@
|
|||||||
<member name="playback_type" type="int" setter="set_playback_type" getter="get_playback_type" enum="AudioServer.PlaybackType" default="0" experimental="">
|
<member name="playback_type" type="int" setter="set_playback_type" getter="get_playback_type" enum="AudioServer.PlaybackType" default="0" experimental="">
|
||||||
The playback type of the stream player. If set other than to the default value, it will force that playback type.
|
The playback type of the stream player. If set other than to the default value, it will force that playback type.
|
||||||
</member>
|
</member>
|
||||||
<member name="playing" type="bool" setter="_set_playing" getter="is_playing" default="false">
|
<member name="playing" type="bool" setter="set_playing" getter="is_playing" default="false">
|
||||||
If [code]true[/code], this node is playing sounds. Setting this property has the same effect as [method play] and [method stop].
|
If [code]true[/code], this node is playing sounds. Setting this property has the same effect as [method play] and [method stop].
|
||||||
</member>
|
</member>
|
||||||
<member name="stream" type="AudioStream" setter="set_stream" getter="get_stream">
|
<member name="stream" type="AudioStream" setter="set_stream" getter="get_stream">
|
||||||
|
@ -81,7 +81,7 @@
|
|||||||
<member name="playback_type" type="int" setter="set_playback_type" getter="get_playback_type" enum="AudioServer.PlaybackType" default="0" experimental="">
|
<member name="playback_type" type="int" setter="set_playback_type" getter="get_playback_type" enum="AudioServer.PlaybackType" default="0" experimental="">
|
||||||
The playback type of the stream player. If set other than to the default value, it will force that playback type.
|
The playback type of the stream player. If set other than to the default value, it will force that playback type.
|
||||||
</member>
|
</member>
|
||||||
<member name="playing" type="bool" setter="_set_playing" getter="is_playing" default="false">
|
<member name="playing" type="bool" setter="set_playing" getter="is_playing" default="false">
|
||||||
If [code]true[/code], audio is playing or is queued to be played (see [method play]).
|
If [code]true[/code], audio is playing or is queued to be played (see [method play]).
|
||||||
</member>
|
</member>
|
||||||
<member name="stream" type="AudioStream" setter="set_stream" getter="get_stream">
|
<member name="stream" type="AudioStream" setter="set_stream" getter="get_stream">
|
||||||
|
@ -102,7 +102,7 @@
|
|||||||
<member name="playback_type" type="int" setter="set_playback_type" getter="get_playback_type" enum="AudioServer.PlaybackType" default="0" experimental="">
|
<member name="playback_type" type="int" setter="set_playback_type" getter="get_playback_type" enum="AudioServer.PlaybackType" default="0" experimental="">
|
||||||
The playback type of the stream player. If set other than to the default value, it will force that playback type.
|
The playback type of the stream player. If set other than to the default value, it will force that playback type.
|
||||||
</member>
|
</member>
|
||||||
<member name="playing" type="bool" setter="_set_playing" getter="is_playing" default="false">
|
<member name="playing" type="bool" setter="set_playing" getter="is_playing" default="false">
|
||||||
If [code]true[/code], audio is playing or is queued to be played (see [method play]).
|
If [code]true[/code], audio is playing or is queued to be played (see [method play]).
|
||||||
</member>
|
</member>
|
||||||
<member name="stream" type="AudioStream" setter="set_stream" getter="get_stream">
|
<member name="stream" type="AudioStream" setter="set_stream" getter="get_stream">
|
||||||
|
@ -56,3 +56,12 @@ Validate extension JSON: Error: Field 'classes/RegEx/methods/compile/arguments':
|
|||||||
Validate extension JSON: Error: Field 'classes/RegEx/methods/create_from_string/arguments': size changed value in new API, from 1 to 2.
|
Validate extension JSON: Error: Field 'classes/RegEx/methods/create_from_string/arguments': size changed value in new API, from 1 to 2.
|
||||||
|
|
||||||
Add optional argument to control error printing on compilation fail. Compatibility methods registered.
|
Add optional argument to control error printing on compilation fail. Compatibility methods registered.
|
||||||
|
|
||||||
|
|
||||||
|
GH-95375
|
||||||
|
--------
|
||||||
|
Validate extension JSON: Error: Field 'classes/AudioStreamPlayer/properties/playing': setter changed value in new API, from "_set_playing" to &"set_playing".
|
||||||
|
Validate extension JSON: Error: Field 'classes/AudioStreamPlayer2D/properties/playing': setter changed value in new API, from "_set_playing" to &"set_playing".
|
||||||
|
Validate extension JSON: Error: Field 'classes/AudioStreamPlayer3D/properties/playing': setter changed value in new API, from "_set_playing" to &"set_playing".
|
||||||
|
|
||||||
|
These setters have been renamed to expose them. GDExtension language bindings couldn't have exposed these properties before.
|
||||||
|
@ -276,10 +276,6 @@ void AudioStreamPlayer2D::_set_playing(bool p_enable) {
|
|||||||
internal->set_playing(p_enable);
|
internal->set_playing(p_enable);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AudioStreamPlayer2D::_is_active() const {
|
|
||||||
return internal->is_active();
|
|
||||||
}
|
|
||||||
|
|
||||||
void AudioStreamPlayer2D::_validate_property(PropertyInfo &p_property) const {
|
void AudioStreamPlayer2D::_validate_property(PropertyInfo &p_property) const {
|
||||||
internal->validate_property(p_property);
|
internal->validate_property(p_property);
|
||||||
}
|
}
|
||||||
@ -385,8 +381,7 @@ void AudioStreamPlayer2D::_bind_methods() {
|
|||||||
ClassDB::bind_method(D_METHOD("set_autoplay", "enable"), &AudioStreamPlayer2D::set_autoplay);
|
ClassDB::bind_method(D_METHOD("set_autoplay", "enable"), &AudioStreamPlayer2D::set_autoplay);
|
||||||
ClassDB::bind_method(D_METHOD("is_autoplay_enabled"), &AudioStreamPlayer2D::is_autoplay_enabled);
|
ClassDB::bind_method(D_METHOD("is_autoplay_enabled"), &AudioStreamPlayer2D::is_autoplay_enabled);
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("_set_playing", "enable"), &AudioStreamPlayer2D::_set_playing);
|
ClassDB::bind_method(D_METHOD("set_playing", "enable"), &AudioStreamPlayer2D::_set_playing);
|
||||||
ClassDB::bind_method(D_METHOD("_is_active"), &AudioStreamPlayer2D::_is_active);
|
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("set_max_distance", "pixels"), &AudioStreamPlayer2D::set_max_distance);
|
ClassDB::bind_method(D_METHOD("set_max_distance", "pixels"), &AudioStreamPlayer2D::set_max_distance);
|
||||||
ClassDB::bind_method(D_METHOD("get_max_distance"), &AudioStreamPlayer2D::get_max_distance);
|
ClassDB::bind_method(D_METHOD("get_max_distance"), &AudioStreamPlayer2D::get_max_distance);
|
||||||
@ -415,7 +410,7 @@ void AudioStreamPlayer2D::_bind_methods() {
|
|||||||
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), "set_stream", "get_stream");
|
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), "set_stream", "get_stream");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_db", PROPERTY_HINT_RANGE, "-80,24,suffix:dB"), "set_volume_db", "get_volume_db");
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_db", PROPERTY_HINT_RANGE, "-80,24,suffix:dB"), "set_volume_db", "get_volume_db");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "pitch_scale", PROPERTY_HINT_RANGE, "0.01,4,0.01,or_greater"), "set_pitch_scale", "get_pitch_scale");
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "pitch_scale", PROPERTY_HINT_RANGE, "0.01,4,0.01,or_greater"), "set_pitch_scale", "get_pitch_scale");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "playing", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "_set_playing", "is_playing");
|
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::BOOL, "autoplay"), "set_autoplay", "is_autoplay_enabled");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream_paused", PROPERTY_HINT_NONE, ""), "set_stream_paused", "get_stream_paused");
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream_paused", PROPERTY_HINT_NONE, ""), "set_stream_paused", "get_stream_paused");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "max_distance", PROPERTY_HINT_RANGE, "1,4096,1,or_greater,exp,suffix:px"), "set_max_distance", "get_max_distance");
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "max_distance", PROPERTY_HINT_RANGE, "1,4096,1,or_greater,exp,suffix:px"), "set_max_distance", "get_max_distance");
|
||||||
|
@ -596,10 +596,6 @@ void AudioStreamPlayer3D::_set_playing(bool p_enable) {
|
|||||||
internal->set_playing(p_enable);
|
internal->set_playing(p_enable);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AudioStreamPlayer3D::_is_active() const {
|
|
||||||
return internal->is_active();
|
|
||||||
}
|
|
||||||
|
|
||||||
void AudioStreamPlayer3D::_validate_property(PropertyInfo &p_property) const {
|
void AudioStreamPlayer3D::_validate_property(PropertyInfo &p_property) const {
|
||||||
internal->validate_property(p_property);
|
internal->validate_property(p_property);
|
||||||
}
|
}
|
||||||
@ -779,8 +775,7 @@ void AudioStreamPlayer3D::_bind_methods() {
|
|||||||
ClassDB::bind_method(D_METHOD("set_autoplay", "enable"), &AudioStreamPlayer3D::set_autoplay);
|
ClassDB::bind_method(D_METHOD("set_autoplay", "enable"), &AudioStreamPlayer3D::set_autoplay);
|
||||||
ClassDB::bind_method(D_METHOD("is_autoplay_enabled"), &AudioStreamPlayer3D::is_autoplay_enabled);
|
ClassDB::bind_method(D_METHOD("is_autoplay_enabled"), &AudioStreamPlayer3D::is_autoplay_enabled);
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("_set_playing", "enable"), &AudioStreamPlayer3D::_set_playing);
|
ClassDB::bind_method(D_METHOD("set_playing", "enable"), &AudioStreamPlayer3D::_set_playing);
|
||||||
ClassDB::bind_method(D_METHOD("_is_active"), &AudioStreamPlayer3D::_is_active);
|
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("set_max_distance", "meters"), &AudioStreamPlayer3D::set_max_distance);
|
ClassDB::bind_method(D_METHOD("set_max_distance", "meters"), &AudioStreamPlayer3D::set_max_distance);
|
||||||
ClassDB::bind_method(D_METHOD("get_max_distance"), &AudioStreamPlayer3D::get_max_distance);
|
ClassDB::bind_method(D_METHOD("get_max_distance"), &AudioStreamPlayer3D::get_max_distance);
|
||||||
@ -830,7 +825,7 @@ void AudioStreamPlayer3D::_bind_methods() {
|
|||||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "unit_size", PROPERTY_HINT_RANGE, "0.1,100,0.01,or_greater"), "set_unit_size", "get_unit_size");
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "unit_size", PROPERTY_HINT_RANGE, "0.1,100,0.01,or_greater"), "set_unit_size", "get_unit_size");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "max_db", PROPERTY_HINT_RANGE, "-24,6,suffix:dB"), "set_max_db", "get_max_db");
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "max_db", PROPERTY_HINT_RANGE, "-24,6,suffix:dB"), "set_max_db", "get_max_db");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "pitch_scale", PROPERTY_HINT_RANGE, "0.01,4,0.01,or_greater"), "set_pitch_scale", "get_pitch_scale");
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "pitch_scale", PROPERTY_HINT_RANGE, "0.01,4,0.01,or_greater"), "set_pitch_scale", "get_pitch_scale");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "playing", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "_set_playing", "is_playing");
|
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::BOOL, "autoplay"), "set_autoplay", "is_autoplay_enabled");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream_paused", PROPERTY_HINT_NONE, ""), "set_stream_paused", "get_stream_paused");
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream_paused", PROPERTY_HINT_NONE, ""), "set_stream_paused", "get_stream_paused");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "max_distance", PROPERTY_HINT_RANGE, "0,4096,0.01,or_greater,suffix:m"), "set_max_distance", "get_max_distance");
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "max_distance", PROPERTY_HINT_RANGE, "0,4096,0.01,or_greater,suffix:m"), "set_max_distance", "get_max_distance");
|
||||||
|
@ -154,10 +154,6 @@ void AudioStreamPlayer::_set_playing(bool p_enable) {
|
|||||||
internal->set_playing(p_enable);
|
internal->set_playing(p_enable);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AudioStreamPlayer::_is_active() const {
|
|
||||||
return internal->is_active();
|
|
||||||
}
|
|
||||||
|
|
||||||
void AudioStreamPlayer::set_stream_paused(bool p_pause) {
|
void AudioStreamPlayer::set_stream_paused(bool p_pause) {
|
||||||
internal->set_stream_paused(p_pause);
|
internal->set_stream_paused(p_pause);
|
||||||
}
|
}
|
||||||
@ -249,8 +245,7 @@ void AudioStreamPlayer::_bind_methods() {
|
|||||||
ClassDB::bind_method(D_METHOD("set_mix_target", "mix_target"), &AudioStreamPlayer::set_mix_target);
|
ClassDB::bind_method(D_METHOD("set_mix_target", "mix_target"), &AudioStreamPlayer::set_mix_target);
|
||||||
ClassDB::bind_method(D_METHOD("get_mix_target"), &AudioStreamPlayer::get_mix_target);
|
ClassDB::bind_method(D_METHOD("get_mix_target"), &AudioStreamPlayer::get_mix_target);
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("_set_playing", "enable"), &AudioStreamPlayer::_set_playing);
|
ClassDB::bind_method(D_METHOD("set_playing", "enable"), &AudioStreamPlayer::_set_playing);
|
||||||
ClassDB::bind_method(D_METHOD("_is_active"), &AudioStreamPlayer::_is_active);
|
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("set_stream_paused", "pause"), &AudioStreamPlayer::set_stream_paused);
|
ClassDB::bind_method(D_METHOD("set_stream_paused", "pause"), &AudioStreamPlayer::set_stream_paused);
|
||||||
ClassDB::bind_method(D_METHOD("get_stream_paused"), &AudioStreamPlayer::get_stream_paused);
|
ClassDB::bind_method(D_METHOD("get_stream_paused"), &AudioStreamPlayer::get_stream_paused);
|
||||||
@ -267,7 +262,7 @@ void AudioStreamPlayer::_bind_methods() {
|
|||||||
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), "set_stream", "get_stream");
|
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "AudioStream"), "set_stream", "get_stream");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_db", PROPERTY_HINT_RANGE, "-80,24,suffix:dB"), "set_volume_db", "get_volume_db");
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_db", PROPERTY_HINT_RANGE, "-80,24,suffix:dB"), "set_volume_db", "get_volume_db");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "pitch_scale", PROPERTY_HINT_RANGE, "0.01,4,0.01,or_greater"), "set_pitch_scale", "get_pitch_scale");
|
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "pitch_scale", PROPERTY_HINT_RANGE, "0.01,4,0.01,or_greater"), "set_pitch_scale", "get_pitch_scale");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "playing", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "_set_playing", "is_playing");
|
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::BOOL, "autoplay"), "set_autoplay", "is_autoplay_enabled");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream_paused", PROPERTY_HINT_NONE, ""), "set_stream_paused", "get_stream_paused");
|
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream_paused", PROPERTY_HINT_NONE, ""), "set_stream_paused", "get_stream_paused");
|
||||||
ADD_PROPERTY(PropertyInfo(Variant::INT, "mix_target", PROPERTY_HINT_ENUM, "Stereo,Surround,Center"), "set_mix_target", "get_mix_target");
|
ADD_PROPERTY(PropertyInfo(Variant::INT, "mix_target", PROPERTY_HINT_ENUM, "Stereo,Surround,Center"), "set_mix_target", "get_mix_target");
|
||||||
|
Loading…
Reference in New Issue
Block a user