From f233463fa1c739b912fd8b796a15bb2f8a194046 Mon Sep 17 00:00:00 2001 From: Spencer Russell Date: Fri, 13 Dec 2013 01:07:45 -0500 Subject: [PATCH] now finds the custom shim library --- src/PortAudio.jl | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/PortAudio.jl b/src/PortAudio.jl index a1029f1..e348ed5 100644 --- a/src/PortAudio.jl +++ b/src/PortAudio.jl @@ -4,6 +4,14 @@ module PortAudio export init, deinit, play_sin, stop_sin +# Load in the custom C shim +const libportaudio_shim = find_library(["libportaudio_shim",], + [Pkg.dir("PortAudio", "deps", "usr", "lib"),]) + +@assert(libportaudio_shim != "", "Failed to find required library " + + "libportaudio_shim. Try re-running the package script using " + + "Pkg.build(\"PortAudio\")") + typealias PaTime Cdouble typealias PaError Cint typealias PaSampleFormat Culong @@ -15,7 +23,7 @@ function handle_status(err::PaError) if err != PA_NO_ERROR msg = ccall((:Pa_GetErrorText, "libportaudio"), Ptr{Cchar}, (PaError,), err) - error(bytestring(msg)) + error("libportaudio: " + bytestring(msg)) end end @@ -30,12 +38,12 @@ function deinit() end function play_sin() - err = ccall((:play_sin, "libportaudio_shim"), PaError, ()) + err = ccall((:play_sin, libportaudio_shim), PaError, ()) handle_status(err) end function stop_sin() - err = ccall((:stop_sin, "libportaudio_shim"), PaError, ()) + err = ccall((:stop_sin, libportaudio_shim), PaError, ()) handle_status(err) end