Browse Source

Misc

tags/1.9.4
falkTX 11 years ago
parent
commit
10ceab2a47
3 changed files with 14 additions and 12 deletions
  1. +1
    -1
      source/backend/plugin/LinuxSamplerPlugin.cpp
  2. +2
    -0
      source/bridges/CarlaBridgeClient.cpp
  3. +11
    -11
      source/bridges/Makefile

+ 1
- 1
source/backend/plugin/LinuxSamplerPlugin.cpp View File

@@ -466,7 +466,7 @@ public:
clearBuffers();

uint32_t aOuts;
aOuts = fUses16Outs ? 16 : 2;
aOuts = fUses16Outs ? 32 : 2;

pData->audioOut.createNew(aOuts);



+ 2
- 0
source/bridges/CarlaBridgeClient.cpp View File

@@ -36,7 +36,9 @@ CarlaBridgeClient::CarlaBridgeClient(const char* const uiTitle)
, fUI(CarlaBridgeToolkit::createNew(this, uiTitle))
#endif
{
#ifdef BUILD_BRIDGE_UI
CARLA_ASSERT(uiTitle != nullptr && uiTitle[0] != '\0');
#endif
carla_debug("CarlaBridgeClient::CarlaBridgeClient(\"%s\")", uiTitle);
}



+ 11
- 11
source/bridges/Makefile View File

@@ -64,17 +64,17 @@ NATIVE_BUILD_FLAGS = $(POSIX_BUILD_FLAGS)
# -DWANT_NATIVE
NATIVE_LINK_FLAGS = $(POSIX_LINK_FLAGS)

# ifeq ($(HAVE_FLUIDSYNTH),true)
# NATIVE_BUILD_FLAGS += -DWANT_FLUIDSYNTH
# NATIVE_BUILD_FLAGS += $(shell pkg-config --cflags fluidsynth)
# NATIVE_LINK_FLAGS += $(shell pkg-config --libs fluidsynth)
# endif
#
# ifeq ($(HAVE_LINUXSAMPLER),true)
# NATIVE_BUILD_FLAGS += -DWANT_LINUXSAMPLER
# NATIVE_BUILD_FLAGS += $(shell pkg-config --cflags linuxsampler)
# NATIVE_LINK_FLAGS += $(shell pkg-config --libs linuxsampler)
# endif
ifeq ($(HAVE_FLUIDSYNTH),true)
NATIVE_BUILD_FLAGS += -DWANT_FLUIDSYNTH
NATIVE_BUILD_FLAGS += $(FLUIDSYNTH_FLAGS)
NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS)
endif
ifeq ($(HAVE_LINUXSAMPLER),true)
NATIVE_BUILD_FLAGS += -DWANT_LINUXSAMPLER
NATIVE_BUILD_FLAGS += $(LINUXSAMPLER_FLAGS)
NATIVE_LINK_FLAGS += $(LINUXSAMPLER_LIBS)
endif

# ifeq ($(HAVE_AF_DEPS),true)
# NATIVE_BUILD_FLAGS += -DWANT_AUDIOFILE


Loading…
Cancel
Save