From a8daff86e76b930a3cc22b9f62fa43fd63f50943 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 21 Aug 2012 01:46:43 +0100 Subject: [PATCH] Carla: Disable RtAudio for now has it's incomplete (JACK only) --- c++/carla-backend/Makefile | 6 +++--- c++/carla-backend/carla_engine.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/c++/carla-backend/Makefile b/c++/carla-backend/Makefile index 5e5674b..e48b78a 100644 --- a/c++/carla-backend/Makefile +++ b/c++/carla-backend/Makefile @@ -7,9 +7,9 @@ CC ?= gcc CXX ?= g++ -HAVE_ALSA = $(shell pkg-config --exists alsa && echo true) +# HAVE_ALSA = $(shell pkg-config --exists alsa && echo true) HAVE_JACK = $(shell pkg-config --exists jack && echo true) -HAVE_PULSEAUDIO = $(shell pkg-config --exists libpulse-simple && echo true) +# HAVE_PULSEAUDIO = $(shell pkg-config --exists libpulse-simple && echo true) HAVE_FLUIDSYNTH = $(shell pkg-config --exists fluidsynth && echo true) HAVE_LINUXSAMPLER = $(shell pkg-config --exists linuxsampler && echo true) HAVE_SUIL = $(shell pkg-config --exists suil-0 && echo true) @@ -20,7 +20,7 @@ CARLA_C_FLAGS = $(BASE_FLAGS) $(CFLAGS) CARLA_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) CARLA_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtGui) -CARLA_CXX_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT # -DNDEBUG +CARLA_CXX_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT # -DNDEBUG CARLA_CXX_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header CARLA_LD_FLAGS = -shared -ldl -lm -fPIC $(LDFLAGS) diff --git a/c++/carla-backend/carla_engine.h b/c++/carla-backend/carla_engine.h index e489983..a0660a7 100644 --- a/c++/carla-backend/carla_engine.h +++ b/c++/carla-backend/carla_engine.h @@ -138,7 +138,7 @@ struct CarlaEngineClientNativeHandle { #ifdef CARLA_ENGINE_JACK jack_client_t* jackClient; #endif -#ifdef CARLA_ENGINE_JACK +#ifdef CARLA_ENGINE_RTAUDIO RtAudio* rtAudioPtr; #endif @@ -147,7 +147,7 @@ struct CarlaEngineClientNativeHandle { #ifdef CARLA_ENGINE_JACK jackClient = nullptr; #endif -#ifdef CARLA_ENGINE_JACK +#ifdef CARLA_ENGINE_RTAUDIO rtAudioPtr = nullptr; #endif }