Merge pull request #25755 from RomanPudashkin/444_port_fixes

RomanPudashkin · web-flow · commit 4c4a203e073d · 2024-12-06T16:01:34.000+02:00
444_port_fixes
diff --git a/src/engraving/dom/spanner.cpp b/src/engraving/dom/spanner.cpp
@@ -1506,6 +1506,18 @@ bool Spanner::isUserModified() const
 
 void Spanner::eraseSpannerSegments()
 {
+    for (SpannerSegment* seg : m_segments) {
+        if (System* system = seg->system()) {
+            system->remove(seg);
+        }
+    }
+
+    for (SpannerSegment* seg : m_unusedSegments) {
+        if (System* system = seg->system()) {
+            system->remove(seg);
+        }
+    }
+
     muse::DeleteAll(m_segments);
     muse::DeleteAll(m_unusedSegments);
     m_segments.clear();
diff --git a/src/framework/audio/internal/synthesizers/fluidsynth/fluidsynth.cpp b/src/framework/audio/internal/synthesizers/fluidsynth/fluidsynth.cpp
@@ -369,6 +369,10 @@ samples_t FluidSynth::process(float* buffer, samples_t samplesPerChannel)
             durationInSamples = microSecsToSamples(duration, m_sampleRate);
         }
 
+        if (durationInSamples == 0) {
+            continue;
+        }
+
         IF_ASSERT_FAILED(sampleOffset + durationInSamples <= samplesPerChannel) {
             break;
         }
diff --git a/src/framework/audio/qml/Muse/Audio/KnobControl.qml b/src/framework/audio/qml/Muse/Audio/KnobControl.qml
@@ -45,7 +45,7 @@ Dial {
     width: implicitWidth
     height: width
 
-    wheelEnabled: true
+    wheelEnabled: false
 
     from: 0
     to: 1
diff --git a/src/framework/audio/qml/Muse/Audio/VolumeSlider.qml b/src/framework/audio/qml/Muse/Audio/VolumeSlider.qml
@@ -44,7 +44,7 @@ Slider {
     value: convertor.volumeLevelToLocal(root.volumeLevel)
     stepSize: 0.1
     orientation: Qt.Vertical
-    wheelEnabled: true
+    wheelEnabled: false
 
     signal increaseRequested()
     signal decreaseRequested()
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/PageTabButton.qml b/src/framework/uicomponents/qml/Muse/UiComponents/PageTabButton.qml
@@ -131,6 +131,12 @@ RadioDelegate {
         implicitWidth: root.leftPadding + contentRow.implicitWidth + root.rightPadding
         implicitHeight: contentRow.implicitHeight
 
+        TextMetrics {
+            id: textMetricsNormal
+            font: root.normalStateFont
+            text: root.title
+        }
+
         TextMetrics {
             id: textMetricsSelected
             font: root.selectedStateFont
@@ -155,7 +161,7 @@ RadioDelegate {
                 horizontalAlignment: root.isVertical ? Text.AlignHCenter : Text.AlignLeft
                 font: root.normalStateFont
                 text: root.title
-                width: textMetricsSelected.advanceWidth
+                width: Math.max(textMetricsNormal.advanceWidth, textMetricsSelected.advanceWidth)
 
                 visible: !root.iconOnly
             }
diff --git a/src/framework/vst/internal/synth/vstsynthesiser.cpp b/src/framework/vst/internal/synth/vstsynthesiser.cpp
@@ -217,6 +217,10 @@ samples_t VstSynthesiser::process(float* buffer, samples_t samplesPerChannel)
             durationInSamples = microSecsToSamples(duration, m_sampleRate);
         }
 
+        if (durationInSamples == 0) {
+            continue;
+        }
+
         IF_ASSERT_FAILED(sampleOffset + durationInSamples <= samplesPerChannel) {
             break;
         }
diff --git a/src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp b/src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp
@@ -2895,7 +2895,7 @@ void MusicXMLParserPass2::measureLayout(Measure* measure)
     while (m_e.readNextStartElement()) {
         if (m_e.name() == "measure-distance") {
             const Spatium val(m_e.readDouble() / 10.0);
-            if (!measure->prev()->isHBox()) {
+            if (!measure->prev() || !measure->prev()->isHBox()) {
                 MeasureBase* gap = m_score->insertBox(ElementType::HBOX, measure);
                 toHBox(gap)->setBoxWidth(val);
             }
diff --git a/src/playback/view/internal/inputresourceitem.cpp b/src/playback/view/internal/inputresourceitem.cpp
@@ -179,54 +179,85 @@ bool InputResourceItem::hasNativeEditorSupport() const
 
 QVariantMap InputResourceItem::buildMuseMenuItem(const ResourceByVendorMap& resourcesByVendor) const
 {
-    muse::String currentPack = m_currentInputParams.resourceMeta.attributeVal(u"musePack");
-    muse::String currentVendorName = m_currentInputParams.resourceMeta.attributeVal(u"museVendorName");
-
     QVariantList subItemsByType;
+
+    // Vendor -> Pack -> Category -> Instruments
+    using Instruments = std::vector<std::pair<std::string /*id*/, String /*name*/> >;
+    using CategoryMap = std::map<String, Instruments>;
+    using PackMap = std::map<String, CategoryMap>;
+    using VendorMap = std::map<String, PackMap>;
+
     for (const auto& pair : resourcesByVendor) {
-        std::map<muse::String,
-                 std::map<muse::String,
-                          std::vector<
-                              std::tuple<int, muse::String, const AudioResourceMeta&> > > > vendorMap;
+        VendorMap vendorMap;
+
         for (const AudioResourceMeta& resourceMeta : pair.second) {
+            const muse::String& vendorName = resourceMeta.attributeVal(u"museVendorName");
             const muse::String& pack = resourceMeta.attributeVal(u"musePack");
+            const muse::String& category = resourceMeta.attributeVal(u"museCategory");
             const muse::String& name = resourceMeta.attributeVal(u"museName");
-            const muse::String& vendorName = resourceMeta.attributeVal(u"museVendorName");
-            int unique_id = resourceMeta.attributeVal(u"museUID").toInt();
 
-            vendorMap[vendorName][pack].push_back({ unique_id, name, resourceMeta });
+            vendorMap[vendorName][pack][category].emplace_back(std::make_pair(resourceMeta.id, name));
         }
+
         for (const auto& vendor : vendorMap) {
             QVariantList subItemsByVendor;
             bool isCurrentVendor = false;
+
             for (const auto& pack : vendor.second) {
                 QVariantList subItemsByPack;
                 bool isCurrentPack = false;
-                for (const auto& inst : pack.second) {
-                    QString instName = std::get<1>(inst).toQString();
-                    auto instId = std::get<2>(inst).id;
-                    bool isCurrentInstrument = m_currentInputParams.resourceMeta.id == instId;
-                    subItemsByPack << buildMenuItem(QString::fromStdString(instId),
-                                                    instName,
-                                                    isCurrentInstrument);
-                    isCurrentPack = isCurrentPack || isCurrentInstrument;
+
+                for (const auto& category : pack.second) {
+                    QVariantList subItemsByCategory;
+                    bool isCurrentCategory = false;
+
+                    for (const auto& inst : category.second) {
+                        const std::string& instId = inst.first;
+                        QString instName = inst.second.toQString();
+                        bool isCurrentInstrument = m_currentInputParams.resourceMeta.id == instId;
+                        subItemsByCategory << buildMenuItem(QString::fromStdString(instId),
+                                                            instName,
+                                                            isCurrentInstrument);
+                        isCurrentCategory = isCurrentCategory || isCurrentInstrument;
+                    }
+
+                    // Create submenu only if there are 2 or more categories
+                    if (pack.second.size() > 1 && !category.first.empty()) {
+                        QString categoryString = category.first.toQString();
+                        subItemsByPack << buildMenuItem(categoryString,
+                                                        categoryString,
+                                                        isCurrentCategory,
+                                                        subItemsByCategory);
+                    } else {
+                        subItemsByPack << subItemsByCategory;
+                    }
+
+                    isCurrentPack = isCurrentPack || isCurrentCategory;
+                }
+
+                // Create submenu only if there are 2 or more packs
+                if (vendor.second.size() > 1 && !pack.first.empty()) {
+                    QString packString = pack.first.toQString();
+                    subItemsByVendor << buildMenuItem(packString,
+                                                      packString,
+                                                      isCurrentPack,
+                                                      subItemsByPack);
+                } else {
+                    subItemsByVendor << subItemsByPack;
                 }
-                isCurrentVendor = isCurrentVendor || isCurrentPack;
 
-                QString packString = pack.first.toQString();
-                subItemsByVendor << buildMenuItem(packString,
-                                                  packString,
-                                                  isCurrentPack,
-                                                  subItemsByPack);
+                isCurrentVendor = isCurrentVendor || isCurrentPack;
             }
-            // In case we don't have a vendor name, we just add the packages to the top level
-            if (vendor.first.empty()) {
-                subItemsByType << subItemsByVendor;
-            } else {
-                subItemsByType << buildMenuItem(vendor.first.toQString(),
-                                                vendor.first.toQString(),
+
+            // Create submenu only if there are 2 or more vendors
+            if (vendorMap.size() > 1 && !vendor.first.empty()) {
+                QString vendorString = vendor.first.toQString();
+                subItemsByType << buildMenuItem(vendorString,
+                                                vendorString,
                                                 isCurrentVendor,
                                                 subItemsByVendor);
+            } else {
+                subItemsByType << subItemsByVendor;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,10 @@ samples_t FluidSynth::process(float* buffer, samples_t samplesPerChannel)`
`369`	`369`	`durationInSamples = microSecsToSamples(duration, m_sampleRate);`
`370`	`370`	`}`
`371`	`371`
	`372`	`+ if (durationInSamples == 0) {`
	`373`	`+ continue;`
	`374`	`+ }`
	`375`	`+`
`372`	`376`	`IF_ASSERT_FAILED(sampleOffset + durationInSamples <= samplesPerChannel) {`
`373`	`377`	`break;`
`374`	`378`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,10 @@ samples_t VstSynthesiser::process(float* buffer, samples_t samplesPerChannel)`
`217`	`217`	`durationInSamples = microSecsToSamples(duration, m_sampleRate);`
`218`	`218`	`}`
`219`	`219`
	`220`	`+ if (durationInSamples == 0) {`
	`221`	`+ continue;`
	`222`	`+ }`
	`223`	`+`
`220`	`224`	`IF_ASSERT_FAILED(sampleOffset + durationInSamples <= samplesPerChannel) {`
`221`	`225`	`break;`
`222`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2895,7 +2895,7 @@ void MusicXMLParserPass2::measureLayout(Measure* measure)`
`2895`	`2895`	`while (m_e.readNextStartElement()) {`
`2896`	`2896`	`if (m_e.name() == "measure-distance") {`
`2897`	`2897`	`const Spatium val(m_e.readDouble() / 10.0);`
`2898`		`- if (!measure->prev()->isHBox()) {`
	`2898`	`+ if (!measure->prev() \|\| !measure->prev()->isHBox()) {`
`2899`	`2899`	`MeasureBase* gap = m_score->insertBox(ElementType::HBOX, measure);`
`2900`	`2900`	`toHBox(gap)->setBoxWidth(val);`
`2901`	`2901`	`}`