Rename plugin (remove useless and confusing "-native")

.gitignore

@@ -77,7 +77,7 @@ carla-discovery-posix32
 carla-discovery-posix64
 
 carla-frontend
-carla-native-lv2-export
+carla-lv2-export
 
 data/linux/unzipfx2cat32
 data/linux/unzipfx2cat64

Makefile

@@ -135,16 +135,7 @@ bin/carla-discovery-native$(APP_EXT): libs .FORCE
 
 # --------------------------------------------------------------
 
-plugin: bin/carla-native.lv2/manifest.ttl
-
-bin/carla-native.lv2/carla-native$(LIB_EXT): backend .FORCE
-	$(MAKE) -C source/plugin ../../$@
-
-bin/carla-native.lv2/manifest.ttl: bin/carla-native-lv2-export$(APP_EXT) bridges-plugin discovery .FORCE
-	cd bin && ./carla-native-lv2-export$(APP_EXT); cd ..
-	cd bin/carla-native.lv2 && $(LINK) ../*bridge-* ../carla-discovery-* .; cd ..
-
-bin/carla-native-lv2-export$(APP_EXT): bin/carla-native.lv2/carla-native$(LIB_EXT) .FORCE
+plugin: libs .FORCE
 	$(MAKE) -C source/plugin
 
 # --------------------------------------------------------------
@@ -380,8 +371,7 @@ install:
 	install -d $(DESTDIR)$(PREFIX)/bin/
 	install -d $(DESTDIR)$(PREFIX)/lib/carla/
 	install -d $(DESTDIR)$(PREFIX)/lib/carla/styles/
-	install -d $(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/
-	install -d $(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/styles/
+	install -d $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
 	install -d $(DESTDIR)$(PREFIX)/lib/vst/
 	install -d $(DESTDIR)$(PREFIX)/lib/pkgconfig/
 	install -d $(DESTDIR)$(PREFIX)/include/carla/
@@ -446,13 +436,14 @@ install:
 
 	# Install lv2 plugin
 	install -m 644 \
-		bin/carla-native.lv2/carla-native.* \
-		bin/carla-native.lv2/*.ttl \
-		$(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/
+		bin/carla.lv2/carla.* \
+		bin/carla.lv2/*.ttl \
+		$(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
 
 	# Install vst plugin
 	install -m 644 \
-		bin/carla-native-vst*.* \
+		bin/CarlaRack*.* \
+		bin/CarlaPatchbay*.* \
 		$(DESTDIR)$(PREFIX)/lib/vst/
 
 	# Install binaries (backend)
@@ -461,22 +452,11 @@ install:
 		bin/carla-discovery-* \
 		$(DESTDIR)$(PREFIX)/lib/carla/
 
-	# Install binaries (lv2 plugin)
-	install -m 755 \
-		bin/*bridge-* \
-		bin/carla-discovery-* \
-		$(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/
-
 	# Install theme
 	install -m 644 \
 		bin/styles/* \
 		$(DESTDIR)$(PREFIX)/lib/carla/styles/
 
-	# Install theme (lv2 plugin)
-	install -m 644 \
-		bin/styles/* \
-		$(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/styles/
-
 	# Install python code
 	install -m 644 \
 		source/carla \
@@ -553,13 +533,22 @@ install:
 	$(LINK) $(PREFIX)/share/carla/ui_carla_settings_driver.py $(DESTDIR)$(PREFIX)/share/carla/resources/
 	$(LINK) $(PREFIX)/share/carla/ui_inputdialog_value.py     $(DESTDIR)$(PREFIX)/share/carla/resources/
 
+	# Link binaries for lv2 plugin
+	@for i in $(shell find $(DESTDIR)$(PREFIX)/lib/carla/ -maxdepth 1 -type f -exec basename {} ';'); do \
+		$(LINK) $(PREFIX)/lib/carla/$$i $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/; \
+	done
+	rm -f $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/libcarla_*.*
+
+	# Link styles for lv2 plugin
+	$(LINK) $(PREFIX)/lib/carla/styles/ $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
+
 	# Link resources for lv2 plugin
-	rm -rf $(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/resources
-	$(LINK) $(PREFIX)/share/carla/resources/ $(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/
+	rm -rf $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/resources
+	$(LINK) $(PREFIX)/share/carla/resources/ $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
 
 	# Link resources for vst plugin
 	rm -rf $(DESTDIR)$(PREFIX)/lib/vst/carla-resources
-	$(LINK) $(PREFIX)/lib/lv2/carla-native.lv2/resources $(DESTDIR)$(PREFIX)/lib/vst/carla-resources
+	$(LINK) $(PREFIX)/lib/lv2/carla.lv2/resources $(DESTDIR)$(PREFIX)/lib/vst/carla-resources
 
 	# Adjust PREFIX value in script files
 	sed -i "s?X-PREFIX-X?$(PREFIX)?" \
@@ -577,6 +566,8 @@ install:
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/carla*
+	rm -f $(DESTDIR)$(PREFIX)/lib/vst/CarlaRack*.*
+	rm -f $(DESTDIR)$(PREFIX)/lib/vst/CarlaPatchbay*.*
 	rm -f $(DESTDIR)$(PREFIX)/lib/pkgconfig/carla-standalone.pc
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/carla.desktop
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/carla-control.desktop
@@ -587,7 +578,8 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/share/mime/packages/carla.xml
 	rm -rf $(DESTDIR)$(PREFIX)/include/carla/
 	rm -rf $(DESTDIR)$(PREFIX)/lib/carla/
-	rm -rf $(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/
+	rm -rf $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
+	rm -rf $(DESTDIR)$(PREFIX)/lib/vst/carla-resources
 	rm -rf $(DESTDIR)$(PREFIX)/share/carla/
 
 # --------------------------------------------------------------

source/plugin/Makefile

@@ -74,20 +74,22 @@ endif
 
 # --------------------------------------------------------------
 
-TARGETS = 
+TARGETS =
 
 ifneq ($(WIN32),true)
 TARGETS += \
-	../../bin/carla-native.lv2/carla-native$(LIB_EXT) \
-	../../bin/carla-native-lv2-export$(APP_EXT)
+	../../bin/carla.lv2/carla$(LIB_EXT) \
+	../../bin/carla-lv2-export$(APP_EXT)
 endif
 
 ifeq ($(LINUX),true)
 ifeq ($(DEFAULT_QT),4)
 ifeq ($(HAVE_X11),true)
 TARGETS += \
-	../../bin/carla-native-vstfx$(LIB_EXT) \
-	../../bin/carla-native-vstsyn$(LIB_EXT)
+	../../bin/CarlaRack$(LIB_EXT) \
+	../../bin/CarlaRackFX$(LIB_EXT) \
+	../../bin/CarlaPatchbay$(LIB_EXT) \
+	../../bin/CarlaPatchbayFX$(LIB_EXT)
 endif
 endif
 endif
@@ -98,40 +100,52 @@ all: $(TARGETS)
 
 clean:
 	$(RM) $(TARGETS) *.o
-	$(RM) carla-native.lv2/*.*
+	$(RM) carla.lv2/*.*
 
 debug:
 	$(MAKE) DEBUG=true
 
 # --------------------------------------------------------------
 
-carla-native-base.cpp.o: carla-native-base.cpp ../modules/CarlaNative.h
+carla-base.cpp.o: carla-base.cpp ../modules/CarlaNative.h
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-carla-native-lv2.cpp.o: carla-native-lv2.cpp carla-native-base.cpp ../modules/CarlaNative.h
+carla-lv2.cpp.o: carla-lv2.cpp carla-base.cpp ../modules/CarlaNative.h
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-carla-native-lv2-export.cpp.o: carla-native-lv2-export.cpp carla-native-base.cpp ../modules/CarlaNative.h
+carla-lv2-export.cpp.o: carla-lv2-export.cpp carla-base.cpp ../modules/CarlaNative.h
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-carla-native-vst.cpp.fx.o: carla-native-vst.cpp carla-native-base.cpp ../modules/CarlaNative.h
+carla-vst.cpp.rack-fx.o: carla-vst.cpp carla-base.cpp ../modules/CarlaNative.h
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-carla-native-vst.cpp.syn.o: carla-native-vst.cpp carla-native-base.cpp ../modules/CarlaNative.h
+carla-vst.cpp.rack-syn.o: carla-vst.cpp carla-base.cpp ../modules/CarlaNative.h
 	$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_SYNTH -c -o $@
 
+carla-vst.cpp.patchbay-fx.o: carla-vst.cpp carla-base.cpp ../modules/CarlaNative.h
+	$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_PATCHBAY -c -o $@
+
+carla-vst.cpp.patchbay-syn.o: carla-vst.cpp carla-base.cpp ../modules/CarlaNative.h
+	$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_PATCHBAY -DCARLA_PLUGIN_SYNTH -c -o $@
+
 # --------------------------------------------------------------
 
-../../bin/carla-native.lv2/carla-native$(LIB_EXT): carla-native-lv2.cpp.o $(LIBS)
+../../bin/carla.lv2/carla$(LIB_EXT): carla-lv2.cpp.o $(LIBS)
 	$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@
 
-../../bin/carla-native-lv2-export$(APP_EXT): carla-native-lv2-export.cpp.o $(LIBS)
+../../bin/carla-lv2-export$(APP_EXT): carla-lv2-export.cpp.o $(LIBS)
 	$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(LINK_FLAGS) -o $@
 
-../../bin/carla-native-vstfx$(LIB_EXT): carla-native-vst.cpp.fx.o $(LIBS)
+../../bin/CarlaRack$(LIB_EXT): carla-vst.cpp.rack-syn.o $(LIBS)
+	$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@
+
+../../bin/CarlaRackFX$(LIB_EXT): carla-vst.cpp.rack-fx.o $(LIBS)
+	$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@
+
+../../bin/CarlaPatchbay$(LIB_EXT): carla-vst.cpp.patchbay-syn.o $(LIBS)
 	$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@
 
-../../bin/carla-native-vstsyn$(LIB_EXT): carla-native-vst.cpp.syn.o $(LIBS)
+../../bin/CarlaPatchbayFX$(LIB_EXT): carla-vst.cpp.patchbay-fx.o $(LIBS)
 	$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------

source/plugin/carla-native-base.cpp → source/plugin/carla-base.cpp

@@ -43,6 +43,9 @@ struct PluginListManager {
 #endif
 #ifdef CARLA_NATIVE_PLUGIN_LV2
         : lv2Descs(),
+#endif
+#ifdef CARLA_NATIVE_PLUGIN_VST
+        : _dummy(0),
 #endif
           descs()
     {
@@ -104,6 +107,9 @@ struct PluginListManager {
 #endif
 #ifdef CARLA_NATIVE_PLUGIN_LV2
     LinkedList<const LV2_Descriptor*> lv2Descs;
+#endif
+#ifdef CARLA_NATIVE_PLUGIN_VST
+    char _dummy;
 #endif
     LinkedList<const NativePluginDescriptor*> descs;
 };

source/plugin/carla-native-lv2-export.cpp → source/plugin/carla-lv2-export.cpp

@@ -16,7 +16,7 @@
  */
 
 #define CARLA_NATIVE_PLUGIN_LV2
-#include "carla-native-base.cpp"
+#include "carla-base.cpp"
 
 #include "juce_core.h"
 
@@ -121,7 +121,7 @@ static void writeManifestFile(PluginListManager& plm)
 
         text += "<http://kxstudio.sf.net/carla/plugins/" + label + ">\n";
         text += "    a lv2:Plugin ;\n";
-        text += "    lv2:binary <carla-native" PLUGIN_EXT "> ;\n";
+        text += "    lv2:binary <carla" PLUGIN_EXT "> ;\n";
         text += "    rdfs:seeAlso <" + label + ".ttl> .\n";
         text += "\n";
     }
@@ -131,7 +131,7 @@ static void writeManifestFile(PluginListManager& plm)
 
     text += "<http://kxstudio.sf.net/carla/ui>\n";
     text += "    a <" LV2_EXTERNAL_UI__Widget "> ;\n";
-    text += "    ui:binary <carla-native" PLUGIN_EXT "> ;\n";
+    text += "    ui:binary <carla" PLUGIN_EXT "> ;\n";
     text += "    lv2:extensionData ui:idleInterface ,\n";
     text += "                      ui:showInterface ,\n";
     text += "                      <" LV2_PROGRAMS__UIInterface "> ;\n";
@@ -140,7 +140,7 @@ static void writeManifestFile(PluginListManager& plm)
     // -------------------------------------------------------------------
     // Write file now
 
-    std::fstream manifest("carla-native.lv2/manifest.ttl", std::ios::out);
+    std::fstream manifest("carla.lv2/manifest.ttl", std::ios::out);
     manifest << text.toRawUTF8();
     manifest.close();
 }
@@ -155,7 +155,7 @@ static intptr_t host_dispatcher(NativeHostHandle, NativeHostDispatcherOpcode, in
 static void writePluginFile(const NativePluginDescriptor* const pluginDesc)
 {
     const String pluginLabel(pluginDesc->label);
-    const String pluginFile("carla-native.lv2/" + pluginLabel + ".ttl");
+    const String pluginFile("carla.lv2/" + pluginLabel + ".ttl");
 
     uint32_t portIndex = 0;
     String text;

source/plugin/carla-native-lv2.cpp → source/plugin/carla-lv2.cpp

@@ -16,7 +16,7 @@
  */
 
 #define CARLA_NATIVE_PLUGIN_LV2
-#include "carla-native-base.cpp"
+#include "carla-base.cpp"
 
 #include "CarlaLv2Utils.hpp"
 #include "CarlaMathUtils.hpp"

source/plugin/carla-native-vst.cpp → source/plugin/carla-vst.cpp

@@ -15,8 +15,8 @@
  * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#define CARLA_NATIVE_PLUGIN_LV2
-#include "carla-native-base.cpp"
+#define CARLA_NATIVE_PLUGIN_VST
+#include "carla-base.cpp"
 
 #include "CarlaMathUtils.hpp"
 #include "juce_core.h"