[MU3] Porting 3.5.2_backend fixes to 3.x

CMakeLists.txt

@@ -134,6 +134,7 @@ endif (NOT APPLE AND NOT MINGW AND NOT MSVC)
 
 option(AEOLUS        "Enable pipe organ synthesizer"      OFF)
 option(ZERBERUS      "Enable experimental SFZ sampler"    ON)
+option(USE_ZITA_REVERB "Enable Zita Reverb audio effect"    ON)
 option(OSC           "Enable OSC remote control protocol" ON)
 option(AVSOMR        "Enable AVSOMR import"               OFF) # AVSOMR - optical music recognition by audirevis
 option(OMR           "Enable PDF import"                  OFF) # OMR - optical music recognition
@@ -380,6 +381,10 @@ if (BUILD_FOR_WINSTORE)
   set(FOR_WINSTORE 1)
 endif(BUILD_FOR_WINSTORE)
 
+if (USE_ZITA_REVERB)
+    add_definitions(-DZITA_REVERB)
+endif(USE_ZITA_REVERB)
+
 ##
 ## freetype2 >= 2.5.2
 ##

Makefile

@@ -41,6 +41,7 @@ BUILD_WEBENGINE="ON"  # Override with "OFF" to disable.
 USE_SYSTEM_FREETYPE="OFF" # Override with "ON" to enable. Requires freetype >= 2.5.2.
 COVERAGE="OFF"        # Override with "ON" to enable.
 DOWNLOAD_SOUNDFONT="ON"   # Override with "OFF" to disable latest soundfont download.
+USE_ZITA_REVERB="ON"
 
 UPDATE_CACHE="TRUE"# Override if building a DEB or RPM, or when installing to a non-standard location.
 NO_RPATH="FALSE"# Package maintainers may want to override this (e.g. Debian)
@@ -72,6 +73,7 @@ release:
    	  -DBUILD_WEBENGINE="${BUILD_WEBENGINE}"   \
    	  -DUSE_SYSTEM_FREETYPE="${USE_SYSTEM_FREETYPE}" \
    	  -DDOWNLOAD_SOUNDFONT="${DOWNLOAD_SOUNDFONT}"   \
+	  -DUSE_ZITA_REVERB="${USE_ZITA_REVERB}"   \
   	  -DCMAKE_SKIP_RPATH="${NO_RPATH}"     ..; \
       make lrelease;                             \
       make -j ${CPUS};                           \
@@ -103,6 +105,7 @@ debug:
    	  -DUSE_SYSTEM_FREETYPE="${USE_SYSTEM_FREETYPE}"      \
           -DCOVERAGE="${COVERAGE}"                 \
    	  -DDOWNLOAD_SOUNDFONT="${DOWNLOAD_SOUNDFONT}"      \
+	  -DUSE_ZITA_REVERB="${USE_ZITA_REVERB}"   \
   	  -DCMAKE_SKIP_RPATH="${NO_RPATH}"     ..;            \
       make lrelease;                                        \
       make -j ${CPUS};                                      \

libmscore/sym.cpp

@@ -6068,6 +6068,17 @@ bool GlyphKey::operator==(const GlyphKey& k) const
          && (magX == k.magX) && (magY == k.magY) && (worldScale == k.worldScale) && (color == k.color);
       }
 
+Sym ScoreFont::sym(SymId id) const
+{
+    int index = static_cast<int>(id);
+
+    if (index >= 0 && index < _symbols.size()) {
+        return _symbols[index];
+    }
+
+    return Sym();
+}
+
 //---------------------------------------------------------
 //   draw
 //---------------------------------------------------------

libmscore/sym.h

@@ -3059,7 +3059,7 @@ class ScoreFont {
       bool isValid(SymId id) const                    { return sym(id).isValid(); }
       bool useFallbackFont(SymId id) const;
 
-      const Sym& sym(SymId id) const { return _symbols[int(id)]; }
+      Sym sym(SymId id) const;
 
       friend void initScoreFonts();
       };

libmscore/synthesizerstate.h

@@ -79,7 +79,10 @@ class SynthesizerState : public std::list<SynthesizerGroup> {
 
 static SynthesizerState defaultState = {
       { "master", {
+
+#ifdef ZITA_REVERB
             { 0, "Zita1" },
+#endif
             { 2, "0.1"   },
             { 3, "440"   },
             { 4, "1"     },

mscore/file.cpp

@@ -3168,7 +3168,7 @@ bool MuseScore::saveSvg(Score* score, QIODevice* device, int pageNumber, bool dr
             printer.setElement(e);
 
             // Paint it
-            if (e->type() == ElementType::NOTE) {
+            if (e->type() == ElementType::NOTE && !notesColors.isEmpty()) {
                 QColor color = e->color();
                 int currentNoteIndex = (++lastNoteIndex);
 

mscore/musescore.cpp

@@ -3983,11 +3983,19 @@ MasterSynthesizer* synthesizerFactory()
       ms->registerSynthesizer(createZerberus());
 #endif
       ms->registerEffect(0, new NoEffect);
+
+#ifdef ZITA_REVERB
       ms->registerEffect(0, new ZitaReverb);
+#endif
+
       ms->registerEffect(0, new Compressor);
       // ms->registerEffect(0, new Freeverb);
       ms->registerEffect(1, new NoEffect);
+
+#ifdef ZITA_REVERB
       ms->registerEffect(1, new ZitaReverb);
+#endif
+
       ms->registerEffect(1, new Compressor);
       // ms->registerEffect(1, new Freeverb);
       ms->setEffect(0, 1);