zymon/PortAudio.jl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop trying to read from audio file if no data is available

Browse source 
As soon as libsndfile has finished reading a file it no longer returns
any data. This can send the `render` method for `FileRenderer` into an
infinite loop. This way if not enough data is available a partial buffer
is returned.
This commit is contained in:
Joris Kraak 2014-08-01 14:01:49 +02:00
parent 289d7a56cd
commit 0cd33b8289
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/sndfile.jl
View file

@ -153,10 +153,13 @@ FilePlayer(path::String) = FilePlayer(af_open(path))
function render(node::FileRenderer, device_input::AudioBuf, info::DeviceInfo) function render(node::FileRenderer, device_input::AudioBuf, info::DeviceInfo)
@assert node.file.sfinfo.samplerate == info.sample_rate @assert node.file.sfinfo.samplerate == info.sample_rate
# Keep reading data from the file until the output buffer is full # Keep reading data from the file until the output buffer is full, but stop
# as soon as no more data can be read from the file
audio = Array(AudioSample, node.file.sfinfo.channels, 0) audio = Array(AudioSample, node.file.sfinfo.channels, 0)
while size(audio, 2) < info.buf_size read_audio = zeros(AudioSample, node.file.sfinfo.channels, 1)
audio = hcat(audio, read(node.file, info.buf_size-size(audio, 2), AudioSample)) while size(audio, 2) < info.buf_size && size(read_audio, 2) > 0
read_audio = read(node.file, info.buf_size-size(audio, 2), AudioSample)
audio = hcat(audio, read_audio)
end end
if audio == Nothing if audio == Nothing