Filter out zyn macros in source build; Fix project load

source/carla_host.py

@@ -514,7 +514,7 @@ class HostWindow(QMainWindow):
     def loadProjectLater(self, filename):
         self.fProjectFilename = QFileInfo(filename).absoluteFilePath()
         self.setProperWindowTitle()
-        QTimer.singleShot(0, self.slot_loadProjectNow)
+        QTimer.singleShot(1, self.slot_loadProjectNow)
 
     def saveProjectNow(self):
         if not self.fProjectFilename:

source/native-plugins/Makefile

@@ -30,7 +30,7 @@ endif # EXPERIMENTAL_PLUGINS
 # Flags for ZynAddSubFX
 
 ifeq ($(HAVE_ZYN_DEPS),true)
-ZYN_CXX_FLAGS  = $(BUILD_CXX_FLAGS) -isystem zynaddsubfx -Izynaddsubfx/rtosc
+ZYN_CXX_FLAGS  = $(BUILD_CXX_FLAGS) -Izynaddsubfx -Izynaddsubfx/rtosc
 ZYN_CXX_FLAGS += $(shell pkg-config --cflags fftw3 mxml zlib)
 ZYN_LD_FLAGS   = $(shell pkg-config --libs liblo)
 ifeq ($(HAVE_X11),true)
@@ -297,12 +297,12 @@ $(OBJDIR)/zynaddsubfx-synth.cpp.o: zynaddsubfx-synth.cpp $(ZYN_UI_FILES_H)
 $(OBJDIR)/zynaddsubfx-src.cpp.o: zynaddsubfx-src.cpp $(ZYN_UI_FILES_H)
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
-	@$(CXX) $< $(ZYN_CXX_FLAGS) -w -c -o $@
+	@$(CXX) $< $(ZYN_CXX_FLAGS) -Wno-unused-parameter -c -o $@
 
 $(OBJDIR)/zynaddsubfx-ui.cpp.o: zynaddsubfx-ui.cpp $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
-	@$(CXX) $< $(ZYN_CXX_FLAGS) -w -c -o $@
+	@$(CXX) $< $(ZYN_CXX_FLAGS) -Wno-unused-parameter -Wno-unused-variable -c -o $@
 
 # ----------------------------------------------------------------------------------------------------------------------------
 

source/native-plugins/zynaddsubfx-src.cpp

@@ -40,9 +40,14 @@ extern "C" {
 // rtosc includes
 #include "zynaddsubfx/rtosc/cpp/midimapper.cpp"
 #include "zynaddsubfx/rtosc/cpp/miditable.cpp"
+#undef RTOSC_INVALID_MIDI
+#undef MAX_UNHANDLED_PATH
 #include "zynaddsubfx/rtosc/cpp/ports.cpp"
+#undef __builtin_expect
 #include "zynaddsubfx/rtosc/cpp/subtree-serialize.cpp"
 #include "zynaddsubfx/rtosc/cpp/thread-link.cpp"
+#undef off_t
+#undef static
 #include "zynaddsubfx/rtosc/cpp/undo-history.cpp"
 
 // zynaddsubfx includes
@@ -57,19 +62,36 @@ extern "C" {
 #include "zynaddsubfx/Effects/Distorsion.cpp"
 #include "zynaddsubfx/Effects/DynamicFilter.cpp"
 #include "zynaddsubfx/Effects/Echo.cpp"
+#undef MAX_DELAY
 #include "zynaddsubfx/Effects/Effect.cpp"
 #include "zynaddsubfx/Effects/EffectLFO.cpp"
 #include "zynaddsubfx/Effects/EffectMgr.cpp"
+#undef rObject
 #include "zynaddsubfx/Effects/EQ.cpp"
 #include "zynaddsubfx/Effects/Phaser.cpp"
+#undef PHASER_LFO_SHAPE
+#undef ONE_
+#undef ZERO_
 #include "zynaddsubfx/Effects/Reverb.cpp"
 #include "zynaddsubfx/Misc/Allocator.cpp"
 #include "zynaddsubfx/Misc/Bank.cpp"
+#undef INSTRUMENT_EXTENSION
+#undef FORCE_BANK_DIR_FILE
 #include "zynaddsubfx/Misc/Config.cpp"
+#undef rStdString
+#undef rStdStringCb
+#undef rObject
 #include "zynaddsubfx/Misc/Master.cpp"
+#undef rObject
 #include "zynaddsubfx/Misc/Microtonal.cpp"
+#undef MAX_LINE_SIZE
+#undef rObject
 #include "zynaddsubfx/Misc/MiddleWare.cpp"
 #include "zynaddsubfx/Misc/Part.cpp"
+#undef rChangeCb
+#define rChangeCb
+#undef rObject
+#undef CLONE
 #include "zynaddsubfx/Misc/PresetExtractor.cpp"
 #include "zynaddsubfx/Misc/Recorder.cpp"
 //#include "zynaddsubfx/Misc/Stereo.cpp"
@@ -78,21 +100,41 @@ extern "C" {
 #include "zynaddsubfx/Misc/WaveShapeSmps.cpp"
 #include "zynaddsubfx/Misc/XMLwrapper.cpp"
 #include "zynaddsubfx/Params/ADnoteParameters.cpp"
+#undef EXPAND
+#undef rObject
 #include "zynaddsubfx/Params/Controller.cpp"
+#undef rObject
 #include "zynaddsubfx/Params/EnvelopeParams.cpp"
+#undef rObject
 #include "zynaddsubfx/Params/FilterParams.cpp"
+#undef rObject
 #include "zynaddsubfx/Params/LFOParams.cpp"
+#undef rObject
 #include "zynaddsubfx/Params/PADnoteParameters.cpp"
+#undef rObject
+#undef PC
+#undef P_C
 #include "zynaddsubfx/Params/Presets.cpp"
 #include "zynaddsubfx/Params/PresetsArray.cpp"
 #include "zynaddsubfx/Params/PresetsStore.cpp"
 #include "zynaddsubfx/Params/SUBnoteParameters.cpp"
+#undef rObject
+#undef doPaste
+#undef doPPaste
 #include "zynaddsubfx/Synth/ADnote.cpp"
 #include "zynaddsubfx/Synth/Envelope.cpp"
 #include "zynaddsubfx/Synth/LFO.cpp"
 #include "zynaddsubfx/Synth/OscilGen.cpp"
+#undef rObject
+#undef PC
+#undef DIFF
+#undef PRESERVE
+#undef RESTORE
+#undef FUNC
+#undef FILTER
 #include "zynaddsubfx/Synth/PADnote.cpp"
 #include "zynaddsubfx/Synth/Resonance.cpp"
+#undef rObject
 #include "zynaddsubfx/Synth/SUBnote.cpp"
 #include "zynaddsubfx/Synth/SynthNote.cpp"
 #include "zynaddsubfx/UI/ConnectionDummy.cpp"