diff --git a/Makefile b/Makefile index 1e991132..54db1ffd 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ ifeq ($(ARCH), mac) CXXFLAGS += -DAPPLE -stdlib=libc++ LDFLAGS += -stdlib=libc++ -lpthread -ldl \ -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo \ - -Ldep/lib -lGLEW -lglfw -ljansson -lsamplerate -lcurl -lzip -lportaudio -lrtmidi + -Ldep/lib -lGLEW -lglfw -ljansson -lsamplerate -lcurl -lzip -lrtaudio -lrtmidi TARGET = Rack BUNDLE = dist/$(TARGET).app endif @@ -59,7 +59,7 @@ endif debug: $(TARGET) ifeq ($(ARCH), mac) - lldb ./Rack + DYLD_FALLBACK_LIBRARY_PATH=dep/lib gdb -ex run ./Rack else LD_LIBRARY_PATH=dep/lib gdb -ex run ./Rack endif diff --git a/dep/Makefile b/dep/Makefile index ce4c9286..5535a050 100755 --- a/dep/Makefile +++ b/dep/Makefile @@ -41,6 +41,7 @@ ifeq ($(ARCH),mac) libcurl = lib/libcurl.dylib libzip = lib/libzip.dylib rtmidi = lib/librtmidi.dylib + rtaudio = lib/librtaudio.dylib endif ifeq ($(ARCH),win) diff --git a/src/core/AudioInterface.cpp b/src/core/AudioInterface.cpp index 6fcfd373..4e220890 100644 --- a/src/core/AudioInterface.cpp +++ b/src/core/AudioInterface.cpp @@ -208,7 +208,6 @@ std::string AudioInterface::getDeviceName(int deviceId) { if (deviceId < 0) return ""; - std::lock_guard lock(bufferMutex); try { RtAudio::DeviceInfo deviceInfo = stream.getDeviceInfo(deviceId); return stringf("%s (%d in, %d out)", deviceInfo.name.c_str(), deviceInfo.inputChannels, deviceInfo.outputChannels); @@ -256,7 +255,7 @@ void AudioInterface::openDevice(int deviceId, float sampleRate, int blockSize) { inParameters.nChannels = numInputs; RtAudio::StreamOptions options; - options.flags |= RTAUDIO_MINIMIZE_LATENCY; + // options.flags |= RTAUDIO_SCHEDULE_REALTIME; try { // Don't use stream parameters if 0 input or output channels