From 5308d76078511d7e495b995d5dcc593be6ebf363 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 28 Oct 2017 20:40:29 +0200 Subject: [PATCH] Don't export carla-patchbay vst, which does not exist yet --- source/plugin/Makefile | 42 ++------------------- source/plugin/carla-vst.cpp | 73 ++++++------------------------------- 2 files changed, 14 insertions(+), 101 deletions(-) diff --git a/source/plugin/Makefile b/source/plugin/Makefile index 6cc1e84c4..18d65c586 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile @@ -103,10 +103,7 @@ ifeq ($(HAVE_X11),true) ifeq ($(HAVE_PYQT),true) TARGETS += \ $(BINDIR)/CarlaRack$(LIB_EXT) \ - $(BINDIR)/CarlaRackFX$(LIB_EXT) \ - $(BINDIR)/CarlaPatchbay$(LIB_EXT) \ - $(BINDIR)/CarlaPatchbay16$(LIB_EXT) \ - $(BINDIR)/CarlaPatchbayFX$(LIB_EXT) + $(BINDIR)/CarlaRackFX$(LIB_EXT) endif endif endif @@ -142,21 +139,6 @@ $(BINDIR)/CarlaRackFX$(LIB_EXT): $(OBJDIR)/carla-vst.cpp.rack-fx.o $(LIBS) @echo "Linking CarlaRackFX$(LIB_EXT)" @$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@ -$(BINDIR)/CarlaPatchbay$(LIB_EXT): $(OBJDIR)/carla-vst.cpp.patchbay-syn.o $(LIBS) - -@mkdir -p $(BINDIR) - @echo "Linking CarlaPatchbay$(LIB_EXT)" - @$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@ - -$(BINDIR)/CarlaPatchbay16$(LIB_EXT): $(OBJDIR)/carla-vst.cpp.patchbay-syn16.o $(LIBS) - -@mkdir -p $(BINDIR) - @echo "Linking CarlaPatchbay16$(LIB_EXT)" - @$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@ - -$(BINDIR)/CarlaPatchbayFX$(LIB_EXT): $(OBJDIR)/carla-vst.cpp.patchbay-fx.o $(LIBS) - -@mkdir -p $(BINDIR) - @echo "Linking CarlaPatchbayFX$(LIB_EXT)" - @$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@ - # ---------------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/carla-lv2.cpp.o: carla-lv2.cpp @@ -167,27 +149,12 @@ $(OBJDIR)/carla-lv2.cpp.o: carla-lv2.cpp $(OBJDIR)/carla-vst.cpp.rack-fx.o: carla-vst.cpp -@mkdir -p $(OBJDIR) @echo "Compiling $< (RackFX)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_PATCHBAY=0 -DCARLA_PLUGIN_SYNTH=0 -c -o $@ + @$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_SYNTH=0 -c -o $@ $(OBJDIR)/carla-vst.cpp.rack-syn.o: carla-vst.cpp -@mkdir -p $(OBJDIR) @echo "Compiling $< (RackSynth)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_PATCHBAY=0 -DCARLA_PLUGIN_SYNTH=1 -c -o $@ - -$(OBJDIR)/carla-vst.cpp.patchbay-fx.o: carla-vst.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling $< (PatchbayFX)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_PATCHBAY=1 -DCARLA_PLUGIN_SYNTH=0 -c -o $@ - -$(OBJDIR)/carla-vst.cpp.patchbay-syn.o: carla-vst.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling $< (PatchbaySynth)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_PATCHBAY=1 -DCARLA_PLUGIN_SYNTH=1 -c -o $@ - -$(OBJDIR)/carla-vst.cpp.patchbay-syn16.o: carla-vst.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling $< (PatchbaySynth 16ch)" - @$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_PATCHBAY=1 -DCARLA_PLUGIN_SYNTH=1 -DCARLA_PLUGIN_16CH -c -o $@ + @$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_SYNTH=1 -c -o $@ # ---------------------------------------------------------------------------------------------------------------------------- @@ -218,9 +185,6 @@ $(OBJDIR)/carla-lv2-export.cpp.o: carla-lv2-export.cpp -include $(OBJDIR)/carla-lv2.cpp.d -include $(OBJDIR)/carla-lv2-export.cpp.d --include $(OBJDIR)/carla-vst.cpp.patchbay-fx.d --include $(OBJDIR)/carla-vst.cpp.patchbay-syn.d --include $(OBJDIR)/carla-vst.cpp.patchbay-syn16.d -include $(OBJDIR)/carla-vst.cpp.rack-fx.d -include $(OBJDIR)/carla-vst.cpp.rack-syn.d diff --git a/source/plugin/carla-vst.cpp b/source/plugin/carla-vst.cpp index 98c85378d..95ced8ed6 100644 --- a/source/plugin/carla-vst.cpp +++ b/source/plugin/carla-vst.cpp @@ -15,10 +15,6 @@ * For a full copy of the GNU General Public License see the doc/GPL.txt file. */ -#ifndef CARLA_PLUGIN_PATCHBAY -# error CARLA_PLUGIN_PATCHBAY undefined -#endif - #ifndef CARLA_PLUGIN_SYNTH # error CARLA_PLUGIN_SYNTH undefined #endif @@ -178,6 +174,8 @@ public: switch (opcode) { case effSetSampleRate: + CARLA_SAFE_ASSERT_RETURN(opt > 0.0f, 0); + if (carla_isEqual(fSampleRate, static_cast(opt))) return 0; @@ -188,6 +186,8 @@ public: break; case effSetBlockSize: + CARLA_SAFE_ASSERT_RETURN(value > 0, 0); + if (fBufferSize == static_cast(value)) return 0; @@ -728,25 +728,15 @@ static intptr_t vst_dispatcherCallback(AEffect* effect, int32_t opcode, int32_t if (d_lastSampleRate <= 0.0) d_lastSampleRate = 44100.0; - const NativePluginDescriptor* pluginDesc = nullptr; -#if CARLA_PLUGIN_PATCHBAY -# ifdef CARLA_PLUGIN_16CH - const char* const pluginLabel = "carlapatchbay16"; -# else - const char* const pluginLabel = "carlapatchbay"; -# endif -#else - const char* const pluginLabel = "carlarack"; -#endif - PluginListManager& plm(PluginListManager::getInstance()); + const NativePluginDescriptor* pluginDesc = nullptr; for (LinkedList::Itenerator it = plm.descs.begin2(); it.valid(); it.next()) { const NativePluginDescriptor* const& tmpDesc(it.getValue(nullptr)); CARLA_SAFE_ASSERT_CONTINUE(tmpDesc != nullptr); - if (std::strcmp(tmpDesc->label, pluginLabel) == 0) + if (std::strcmp(tmpDesc->label, "carlarack") == 0) { pluginDesc = tmpDesc; break; @@ -794,22 +784,10 @@ static intptr_t vst_dispatcherCallback(AEffect* effect, int32_t opcode, int32_t case effGetEffectName: if (char* const cptr = (char*)ptr) { -#if CARLA_PLUGIN_PATCHBAY -# if CARLA_PLUGIN_SYNTH -# ifdef CARLA_PLUGIN_16CH - std::strncpy(cptr, "Carla-Patchbay16", 32); -# else - std::strncpy(cptr, "Carla-Patchbay", 32); -# endif -# else - std::strncpy(cptr, "Carla-PatchbayFX", 32); -# endif +#if CARLA_PLUGIN_SYNTH + std::strncpy(cptr, "CarlaRack", 32); #else -# if CARLA_PLUGIN_SYNTH - std::strncpy(cptr, "Carla-Rack", 32); -# else - std::strncpy(cptr, "Carla-RackFX", 32); -# endif + std::strncpy(cptr, "CarlaRackFX", 32); #endif return 1; } @@ -826,22 +804,10 @@ static intptr_t vst_dispatcherCallback(AEffect* effect, int32_t opcode, int32_t case effGetProductString: if (char* const cptr = (char*)ptr) { -#if CARLA_PLUGIN_PATCHBAY -# if CARLA_PLUGIN_SYNTH -# ifdef CARLA_PLUGIN_16CH - std::strncpy(cptr, "CarlaPatchbay16", 32); -# else - std::strncpy(cptr, "CarlaPatchbay", 32); -# endif -# else - std::strncpy(cptr, "CarlaPatchbayFX", 32); -# endif -#else -# if CARLA_PLUGIN_SYNTH +#if CARLA_PLUGIN_SYNTH std::strncpy(cptr, "CarlaRack", 32); -# else +#else std::strncpy(cptr, "CarlaRackFX", 32); -# endif #endif return 1; } @@ -917,33 +883,16 @@ const AEffect* VSTPluginMain(audioMasterCallback audioMaster) static const int32_t uniqueId = CCONST('C', 'r', 'l', 'a'); #if CARLA_PLUGIN_SYNTH -# if CARLA_PLUGIN_PATCHBAY -# ifdef CARLA_PLUGIN_16CH - effect->uniqueID = uniqueId+5; -# else - effect->uniqueID = uniqueId+4; -# endif -# else effect->uniqueID = uniqueId+3; -# endif #else -# if CARLA_PLUGIN_PATCHBAY - effect->uniqueID = uniqueId+2; -# else effect->uniqueID = uniqueId+1; -# endif #endif // plugin fields effect->numParams = 0; effect->numPrograms = 0; -#ifdef CARLA_PLUGIN_16CH - effect->numInputs = 16; - effect->numOutputs = 16; -#else effect->numInputs = 2; effect->numOutputs = 2; -#endif // plugin flags effect->flags |= effFlagsCanReplacing;