Browse Source

macOS: Fix empty spaces in plugin list; fix build with juce

tags/v2.1-alpha1-winvst
parent
commit
0038f94bf2
2 changed files with 23 additions and 9 deletions
  1. +15
    -0
      source/bridges-plugin/Makefile
  2. +8
    -9
      source/frontend/carla_database.py

+ 15
- 0
source/bridges-plugin/Makefile View File

@@ -275,6 +275,11 @@ $(OBJDIR)/CarlaPluginVST2.cpp.o: $(CWD)/backend/plugin/CarlaPluginVST2.cpp
@echo "Compiling CarlaPluginVST2.cpp (bridge)" @echo "Compiling CarlaPluginVST2.cpp (bridge)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -ObjC++ -c -o $@


$(OBJDIR)/CarlaPluginJuce.cpp.o: $(CWD)/backend/plugin/CarlaPluginJuce.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling CarlaPluginJuce.cpp (bridge)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -ObjC++ -c -o $@

$(OBJDIR)/CarlaStandalone.cpp.o: $(CWD)/backend/CarlaStandalone.cpp $(OBJDIR)/CarlaStandalone.cpp.o: $(CWD)/backend/CarlaStandalone.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@echo "Compiling CarlaStandalone.cpp (bridge)" @echo "Compiling CarlaStandalone.cpp (bridge)"
@@ -320,6 +325,11 @@ $(OBJDIR)/CarlaPluginVST2.cpp.posix32.o: $(CWD)/backend/plugin/CarlaPluginVST2.c
@echo "Compiling CarlaPluginVST2.cpp (posix32 bridge)" @echo "Compiling CarlaPluginVST2.cpp (posix32 bridge)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@


$(OBJDIR)/CarlaPluginJuce.cpp.posix32.o: $(CWD)/backend/plugin/CarlaPluginJuce.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling CarlaPluginJuce.cpp (posix32 bridge)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@

$(OBJDIR)/CarlaBridgePlugin.cpp.posix32.o: CarlaBridgePlugin.cpp $(OBJDIR)/CarlaBridgePlugin.cpp.posix32.o: CarlaBridgePlugin.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@echo "Compiling $< (posix32 bridge)" @echo "Compiling $< (posix32 bridge)"
@@ -360,6 +370,11 @@ $(OBJDIR)/CarlaPluginVST2.cpp.posix64.o: $(CWD)/backend/plugin/CarlaPluginVST2.c
@echo "Compiling CarlaPluginVST2.cpp (posix64 bridge)" @echo "Compiling CarlaPluginVST2.cpp (posix64 bridge)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@


$(OBJDIR)/CarlaPluginJuce.cpp.posix64.o: $(CWD)/backend/plugin/CarlaPluginJuce.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling CarlaPluginJuce.cpp (posix64 bridge)"
@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@

$(OBJDIR)/CarlaBridgePlugin.cpp.posix64.o: CarlaBridgePlugin.cpp $(OBJDIR)/CarlaBridgePlugin.cpp.posix64.o: CarlaBridgePlugin.cpp
-@mkdir -p $(OBJDIR) -@mkdir -p $(OBJDIR)
@echo "Compiling $< (posix64 bridge)" @echo "Compiling $< (posix64 bridge)"


+ 8
- 9
source/frontend/carla_database.py View File

@@ -1837,7 +1837,7 @@ class PluginDatabaseW(QDialog):
# ---------------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------------
# AU (extra non-cached) # AU (extra non-cached)


auPlugins = toList(settingsDB.value("Plugins/AU_posix32", [])) if MACOS else []
auPlugins32 = toList(settingsDB.value("Plugins/AU_posix32", [])) if MACOS else []


# ---------------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------------
# Kits # Kits
@@ -1852,8 +1852,9 @@ class PluginDatabaseW(QDialog):
dssiCount = 0 dssiCount = 0
vstCount = 0 vstCount = 0
vst3Count = 0 vst3Count = 0
au32Count = 0
sf2Count = 0 sf2Count = 0
sfzCount = 0
sfzCount = len(sfzs)


for plugins in ladspaPlugins: for plugins in ladspaPlugins:
ladspaCount += len(plugins) ladspaCount += len(plugins)
@@ -1867,19 +1868,17 @@ class PluginDatabaseW(QDialog):
for plugins in vst3Plugins: for plugins in vst3Plugins:
vst3Count += len(plugins) vst3Count += len(plugins)


for plugins in auPlugins:
auCount += len(plugins)
for plugins in auPlugins32:
au32Count += len(plugins)


for plugins in sf2s: for plugins in sf2s:
sf2Count += len(plugins) sf2Count += len(plugins)


sfzCount += len(sfzs)

self.ui.tableWidget.setRowCount(self.fLastTableIndex+ladspaCount+dssiCount+vstCount+vst3Count+auCount+sf2Count+sfzCount)
self.ui.tableWidget.setRowCount(self.fLastTableIndex+ladspaCount+dssiCount+vstCount+vst3Count+au32Count+sf2Count+sfzCount)


if MACOS: if MACOS:
self.ui.label.setText(self.tr("Have %i Internal, %i LADSPA, %i DSSI, %i LV2, %i VST2, %i VST3 and %i AudioUnit plugins, plus %i Sound Kits" % ( self.ui.label.setText(self.tr("Have %i Internal, %i LADSPA, %i DSSI, %i LV2, %i VST2, %i VST3 and %i AudioUnit plugins, plus %i Sound Kits" % (
internalCount, ladspaCount, dssiCount, lv2Count, vstCount, vst3Count, auCount, sf2Count+sfzCount)))
internalCount, ladspaCount, dssiCount, lv2Count, vstCount, vst3Count, auCount+au32Count, sf2Count+sfzCount)))
else: else:
self.ui.label.setText(self.tr("Have %i Internal, %i LADSPA, %i DSSI, %i LV2, %i VST2 and %i VST3 plugins, plus %i Sound Kits" % ( self.ui.label.setText(self.tr("Have %i Internal, %i LADSPA, %i DSSI, %i LV2, %i VST2 and %i VST3 plugins, plus %i Sound Kits" % (
internalCount, ladspaCount, dssiCount, lv2Count, vstCount, vst3Count, sf2Count+sfzCount))) internalCount, ladspaCount, dssiCount, lv2Count, vstCount, vst3Count, sf2Count+sfzCount)))
@@ -1903,7 +1902,7 @@ class PluginDatabaseW(QDialog):
for plugin in plugins: for plugin in plugins:
self._addPluginToTable(plugin, "VST3") self._addPluginToTable(plugin, "VST3")


for plugins in auPlugins:
for plugins in auPlugins32:
for plugin in plugins: for plugin in plugins:
self._addPluginToTable(plugin, "AU") self._addPluginToTable(plugin, "AU")




Loading…
Cancel
Save