Browse Source

Misc

tags/1.9.4
falkTX 12 years ago
parent
commit
7a24e66f53
3 changed files with 10 additions and 8 deletions
  1. +2
    -0
      source/backend/engine/CarlaEngineJack.cpp
  2. +7
    -7
      source/backend/standalone/Makefile
  3. +1
    -1
      source/discovery/carla-discovery.cpp

+ 2
- 0
source/backend/engine/CarlaEngineJack.cpp View File

@@ -907,11 +907,13 @@ public:
{
CarlaEngineJackClient* const client((CarlaEngineJackClient*)plugin->getEngineClient());

#if 0
if (bridge.client_rename_ptr != nullptr)
{
name = bridge.client_rename_ptr(client->fClient, name);
}
else
#endif
{
// we should not be able to do this, jack really needs to allow client rename
needsReinit = true;


+ 7
- 7
source/backend/standalone/Makefile View File

@@ -17,7 +17,7 @@ LIBS = ../libcarla_engine.a
LIBS += ../libcarla_plugin.a

LINK_FLAGS += $(shell pkg-config --libs liblo)
LINK_FLAGS += -lpthread
LINK_FLAGS += -lpthread -ljack

# --------------------------------------------------------------
# Juce
@@ -102,12 +102,12 @@ OBJS = \
CarlaStandalone.cpp.o

ifeq ($(WIN32),true)
TARGET = ../libcarla_standalone.dll
TARGET = ../libcarla_standalone2.dll
else
ifeq ($(MACOS),true)
TARGET = ../libcarla_standalone.dylib
TARGET = ../libcarla_standalone2.dylib
else
TARGET = ../libcarla_standalone.so
TARGET = ../libcarla_standalone2.so
endif
endif

@@ -126,13 +126,13 @@ debug:
%.cpp.o: %.cpp ../CarlaBackend.hpp ../CarlaEngine.hpp ../CarlaPlugin.hpp ../CarlaHost.hpp
$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@

../libcarla_standalone.dll: $(OBJS) $(LIBS)
../libcarla_standalone2.dll: $(OBJS) $(LIBS)
$(CXX) $^ -shared $(LINK_FLAGS) $(W32_LIBS) -Wl,--output-def,$@.def -o $@

../libcarla_standalone.dylib: $(OBJS) $(LIBS)
../libcarla_standalone2.dylib: $(OBJS) $(LIBS)
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -framework CoreAudio -framework CoreMIDI -framework CoreFoundation -o $@

../libcarla_standalone.so: $(OBJS) $(LIBS)
../libcarla_standalone2.so: $(OBJS) $(LIBS)
$(CXX) $^ $(LINK_FLAGS) -shared -o $@

# --------------------------------------------------------------


+ 1
- 1
source/discovery/carla-discovery.cpp View File

@@ -1276,7 +1276,7 @@ void do_vst_check(void*& libHandle, const bool init)
if (effect->flags & effFlagsIsSynth)
hints |= PLUGIN_IS_SYNTH;

if (vstPluginCanDo(effect, "receiveVstEvents") || vstPluginCanDo(effect, "receiveVstMidiEvent") || (effect->flags & effFlagsIsSynth) > 0)
if (vstPluginCanDo(effect, "receiveVstEvents") || vstPluginCanDo(effect, "receiveVstMidiEvent") || (effect->flags & effFlagsIsSynth) != 0)
midiIns = 1;

if (vstPluginCanDo(effect, "sendVstEvents") || vstPluginCanDo(effect, "sendVstMidiEvent"))


Loading…
Cancel
Save