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

now pulls samplerate from device by default. fixes #4

Browse source
This commit is contained in:
Spencer Russell 2016-08-08 23:34:54 -04:00
parent fb30e51f91
commit e7cdbad4b3
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/PortAudio.jl
View file

@ -51,6 +51,7 @@ type PortAudioDevice
hostapi::UTF8String hostapi::UTF8String
maxinchans::Int maxinchans::Int
maxoutchans::Int maxoutchans::Int
defaultsamplerate::Float64
idx::PaDeviceIndex idx::PaDeviceIndex
end end
@ -59,6 +60,7 @@ PortAudioDevice(info::PaDeviceInfo, idx) = PortAudioDevice(
unsafe_string(Pa_GetHostApiInfo(info.host_api).name), unsafe_string(Pa_GetHostApiInfo(info.host_api).name),
info.max_input_channels, info.max_input_channels,
info.max_output_channels, info.max_output_channels,
info.default_sample_rate,
idx) idx)
function devices() function devices()
@ -130,7 +132,18 @@ end
# this is the top-level outer constructor that all the other outer constructors # this is the top-level outer constructor that all the other outer constructors
# end up calling # end up calling
function PortAudioStream(indev::PortAudioDevice, outdev::PortAudioDevice, function PortAudioStream(indev::PortAudioDevice, outdev::PortAudioDevice,
inchans=-1, outchans=-1; eltype=Float32, samplerate=48000Hz, blocksize=DEFAULT_BLOCKSIZE) inchans=-1, outchans=-1; eltype=Float32, samplerate=-1, blocksize=DEFAULT_BLOCKSIZE)
if samplerate == -1
sampleratein = indev.defaultsamplerate * Hz;
samplerateout = outdev.defaultsamplerate * Hz;
if inchans > 0 && outchans > 0 && sampleratein != samplerateout
error("Can't open duplex stream with mismatched samplerates")
elseif inchans > 0
samplerate = sampleratein
else
samplerate = samplerateout
end
end
PortAudioStream{eltype, typeof(samplerate)}(indev, outdev, inchans, outchans, samplerate, blocksize) PortAudioStream{eltype, typeof(samplerate)}(indev, outdev, inchans, outchans, samplerate, blocksize)
end end