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

minor tweaks and comments

Browse source
This commit is contained in:
Spencer Russell 2013-12-22 18:13:57 -05:00
parent e3d997230c
commit 6c8b99407c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/PortAudio.jl
View file

@ -45,7 +45,8 @@ end
function play(node::AudioNode, stream::AudioStream) function play(node::AudioNode, stream::AudioStream)
# TODO: don't break demeter # TODO: don't break demeter
stream.mixer = vcat(stream.mixer.mix_inputs, [node]) stream.mixer.mix_inputs = vcat(stream.mixer.mix_inputs, [node])
return nothing
end end
function play(node::AudioNode) function play(node::AudioNode)
@ -59,7 +60,7 @@ end
function play(arr::AudioBuf, stream::AudioStream) function play(arr::AudioBuf, stream::AudioStream)
# TODO: use a mixer as the root node so multiple playbacks get mixed # TODO: use a mixer as the root node so multiple playbacks get mixed
player = ArrayPlayer(arr) player = ArrayPlayer(arr)
register(player, stream) play(player, stream)
end end
function play(arr::AudioBuf) function play(arr::AudioBuf)
@ -124,6 +125,9 @@ function audio_task(jl_filedesc::Integer, stream::AudioStream)
# have processed our last frame of data). At some point we should do # have processed our last frame of data). At some point we should do
# something with the data we get from the callback # something with the data we get from the callback
wait(jl_rawfd, readable=true) wait(jl_rawfd, readable=true)
# read from the file descriptor so that it's empty. We're using ccall
# here because readbytes() was blocking the whole julia thread. This
# shouldn't block at all because we just waited on it
ccall(:read, Clong, (Cint, Ptr{Void}, Culong), jl_filedesc, desc_bytes, 1) ccall(:read, Clong, (Cint, Ptr{Void}, Culong), jl_filedesc, desc_bytes, 1)
end end
end end