godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only call finished signal when it really finishes, closes #5222

Browse Source
This commit is contained in:
Juan Linietsky 2016-06-29 18:46:43 -03:00
parent 449a28e75a
commit ac6257bf8a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/audio/stream_player.cpp
View File

@ -77,7 +77,7 @@ void StreamPlayer::sp_update() {
if (to_mix==0) { if (to_mix==0) {
if (!stop_request) { if (!stop_request) {
stop_request=true; stop_request=true;
call_deferred("stop"); call_deferred("_do_stop");
} }
return; return;
} }
@ -91,7 +91,10 @@ void StreamPlayer::sp_update() {
} }
} }
void StreamPlayer::_do_stop() {
stop();
emit_signal("finished");
}
void StreamPlayer::_notification(int p_what) { void StreamPlayer::_notification(int p_what) {
@ -181,7 +184,7 @@ void StreamPlayer::stop() {
stop_request=false; stop_request=false;
playback->stop(); playback->stop();
resampler.flush(); resampler.flush();
emit_signal("finished");
//set_idle_process(false); //set_idle_process(false);
} }
@ -381,6 +384,7 @@ void StreamPlayer::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_set_play","play"),&StreamPlayer::_set_play); ObjectTypeDB::bind_method(_MD("_set_play","play"),&StreamPlayer::_set_play);
ObjectTypeDB::bind_method(_MD("_get_play"),&StreamPlayer::_get_play); ObjectTypeDB::bind_method(_MD("_get_play"),&StreamPlayer::_get_play);
ObjectTypeDB::bind_method(_MD("_do_stop"),&StreamPlayer::_do_stop);
ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"AudioStream"), _SCS("set_stream"), _SCS("get_stream") ); ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"AudioStream"), _SCS("set_stream"), _SCS("get_stream") );
ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/play"), _SCS("_set_play"), _SCS("_get_play") ); ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/play"), _SCS("_set_play"), _SCS("_get_play") );

2
scene/audio/stream_player.h
View File

@ -71,6 +71,8 @@ class StreamPlayer : public Node {
AudioRBResampler resampler; AudioRBResampler resampler;
void _do_stop();
bool _play; bool _play;
void _set_play(bool p_play); void _set_play(bool p_play);
bool _get_play() const; bool _get_play() const;