mirror of
https://github.com/godotengine/godot.git
synced 2024-11-21 03:18:37 +08:00
bugfix for audio stream generators getting killed accidentally by audio server
This commit is contained in:
parent
fc99492d30
commit
4eac548202
@ -143,6 +143,10 @@ void AudioStreamGeneratorPlayback::clear_buffer() {
|
||||
}
|
||||
|
||||
int AudioStreamGeneratorPlayback::_mix_internal(AudioFrame *p_buffer, int p_frames) {
|
||||
if (!active) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int read_amount = buffer.data_left();
|
||||
if (p_frames < read_amount) {
|
||||
read_amount = p_frames;
|
||||
@ -151,16 +155,15 @@ int AudioStreamGeneratorPlayback::_mix_internal(AudioFrame *p_buffer, int p_fram
|
||||
buffer.read(p_buffer, read_amount);
|
||||
|
||||
if (read_amount < p_frames) {
|
||||
//skipped, not ideal
|
||||
// Fill with zeros as fallback in case of buffer underrun.
|
||||
for (int i = read_amount; i < p_frames; i++) {
|
||||
p_buffer[i] = AudioFrame(0, 0);
|
||||
}
|
||||
|
||||
skips++;
|
||||
}
|
||||
|
||||
mixed += p_frames / generator->get_mix_rate();
|
||||
return read_amount < p_frames ? read_amount : p_frames;
|
||||
return p_frames;
|
||||
}
|
||||
|
||||
float AudioStreamGeneratorPlayback::get_stream_sampling_rate() {
|
||||
@ -181,7 +184,7 @@ void AudioStreamGeneratorPlayback::stop() {
|
||||
}
|
||||
|
||||
bool AudioStreamGeneratorPlayback::is_playing() const {
|
||||
return active; //always playing, can't be stopped
|
||||
return active;
|
||||
}
|
||||
|
||||
int AudioStreamGeneratorPlayback::get_loop_count() const {
|
||||
|
Loading…
Reference in New Issue
Block a user