maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

-some fixes to audio

Browse source
This commit is contained in:
Juan Linietsky 2015-11-01 01:55:22 -03:00
parent bd736e5af2
commit 281d6fac1e
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scene/audio/stream_player.cpp
View file

@ -141,8 +141,8 @@ void StreamPlayer::play(float p_from_offset) {
ERR_FAIL_COND(!is_inside_tree());
if (playback.is_null())
return;
if (playback->is_playing())
stop();
//if (is_playing())
stop();
//_THREAD_SAFE_METHOD_
playback->play(p_from_offset);
@ -175,7 +175,7 @@ bool StreamPlayer::is_playing() const {
if (playback.is_null())
return false;
return playback->is_playing();
return playback->is_playing() || resampler.has_data();
}
void StreamPlayer::set_loop(bool p_enable) {
@ -267,7 +267,9 @@ void StreamPlayer::seek_pos(float p_time) {
if (playback.is_null())
return;
return playback->seek_pos(p_time);
//works better...
stop();
playback->play(p_time);
}

5
servers/audio/audio_rb_resampler.h
View file

@ -67,6 +67,11 @@ public:
return todo;
}
_FORCE_INLINE_ bool has_data() const {
return rb && rb_read_pos!=rb_write_pos;
}
_FORCE_INLINE_ int16_t *get_write_buffer() { return read_buf; }
_FORCE_INLINE_ void write(uint32_t p_frames) {