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

forwards InterruptException to waiters instead of killing audio task

Browse source
This commit is contained in:
Spencer Russell 2016-03-23 17:55:03 -04:00
parent 5854270183
commit 333bbbf8d8
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/PortAudio.jl
View file

@ -215,7 +215,7 @@ function SampleTypes.unsafe_write(sink::PortAudioSink, buf::SampleBuf)
try try
while written < total while written < total
donecond = wait(c) donecond = wait(c)
n = min(size(sink.pabuf, 2), total-written) n = min(size(sink.jlbuf, 1), total-written)
bufstart = 1+written bufstart = 1+written
bufend = n+written bufend = n+written
@devec sink.jlbuf[1:n, :] = buf[bufstart:bufend, :] @devec sink.jlbuf[1:n, :] = buf[bufstart:bufend, :]
@ -308,8 +308,18 @@ function audiotask{T, U}(stream::PortAudioStream{T, U})
stream.bufstate = PortAudioPending stream.bufstate = PortAudioPending
catch ex catch ex
warn("Audio Task died with exception: $ex") if isa(ex, InterruptException)
Base.show_backtrace(STDOUT, catch_backtrace()) for w in stream.source.waiters
notify(w, ex; error=true)
end
for w in stream.sink.waiters
notify(w, ex; error=true)
end
else
warn("Audio Task died with exception: $ex")
Base.show_backtrace(STDOUT, catch_backtrace())
break
end
end end
end end
end end