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

fixes bug when there's less than a full blocksize available in the ringbuffer

Browse source
This commit is contained in:
Spencer Russell 2016-07-31 01:42:47 -04:00
parent 7cccb28d2b
commit fd425b3ace
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/PortAudio.jl
View file

@ -231,14 +231,15 @@ function SampledSignals.unsafe_write(sink::PortAudioSink, buf::SampleBuf)
total = nframes(buf) total = nframes(buf)
nwritten = 0 nwritten = 0
while nwritten < total while nwritten < total
towrite = min(CHUNKSIZE, total-nwritten) while nwritable(sink.ringbuf) == 0
wait(sink.ringbuf)
end
# in 0.4 transpose! throws an error if the range is a UInt
towrite = Int(min(nwritable(sink.ringbuf), CHUNKSIZE, total-nwritten))
# make a buffer of interleaved samples # make a buffer of interleaved samples
# TODO: don't directly access buf.data # TODO: don't directly access buf.data
transpose!(view(sink.chunkbuf, :, 1:towrite), transpose!(view(sink.chunkbuf, :, 1:towrite),
view(buf.data, (1:towrite)+nwritten, :)) view(buf.data, (1:towrite)+nwritten, :))
while nwritable(sink.ringbuf) < towrite
wait(sink.ringbuf)
end
write(sink.ringbuf, sink.chunkbuf, towrite*nchannels(sink)) write(sink.ringbuf, sink.chunkbuf, towrite*nchannels(sink))
nwritten += towrite nwritten += towrite
@ -251,10 +252,11 @@ function SampledSignals.unsafe_read!(source::PortAudioSource, buf::SampleBuf)
total = nframes(buf) total = nframes(buf)
nread = 0 nread = 0
while nread < total while nread < total
toread = min(CHUNKSIZE, total-nread) while nreadable(source.ringbuf) == 0
while nreadable(source.ringbuf) < toread
wait(source.ringbuf) wait(source.ringbuf)
end end
# in 0.4 transpose! throws an error if the range is a UInt
toread = Int(min(nreadable(source.ringbuf), CHUNKSIZE, total-nread))
read!(source.ringbuf, source.chunkbuf, toread*nchannels(source)) read!(source.ringbuf, source.chunkbuf, toread*nchannels(source))
# de-interleave the samples # de-interleave the samples
# TODO: don't directly access buf.data # TODO: don't directly access buf.data