Merge pull request #26755 from RomanPudashkin/450_port_fixes

Porting some PRs to 4.5.0

src/appshell/view/appmenumodel.cpp

@@ -422,6 +422,7 @@ MenuItem* AppMenuModel::makeDiagnosticsMenu()
 
     MenuItemList items {
         makeMenuItem("diagnostic-save-diagnostic-files"),
+        makeMenuItem("playback-reload-cache"),
         makeMenu(TranslatableString("appshell/menu/diagnostics", "&System"), systemItems, "menu-system")
     };
 

src/engraving/dom/cmd.cpp

@@ -4300,6 +4300,12 @@ void Score::cmdRealizeChordSymbols(bool literal, Voicing voicing, HDuration dura
             note->setNval(nval, tick);
         }
 
+        if (!seg->isChordRestType()) {
+            Segment* newCrSeg = seg->measure()->undoGetSegment(SegmentType::ChordRest, seg->tick());
+            newCrSeg->setTicks(seg->ticks());
+            seg = newCrSeg;
+        }
+
         setChord(this, seg, h->track(), chord, duration);     //add chord using template
         delete chord;
     }

src/engraving/dom/edit.cpp

@@ -2971,6 +2971,7 @@ void Score::deleteItem(EngravingItem* el)
 
     case ElementType::STEM_SLASH:                   // cannot delete this elements
     case ElementType::HOOK:
+    case ElementType::GUITAR_BEND_TEXT:
         LOGD("cannot remove %s", el->typeName());
         break;
 

src/engraving/dom/fret.cpp

@@ -896,6 +896,15 @@ PropertyValue FretDiagram::propertyDefault(Pid pid) const
     return EngravingItem::propertyDefault(pid);
 }
 
+void FretDiagram::setTrack(track_idx_t val)
+{
+    EngravingItem::setTrack(val);
+
+    if (m_harmony) {
+        m_harmony->setTrack(val);
+    }
+}
+
 //---------------------------------------------------------
 //   endEditDrag
 //---------------------------------------------------------

src/engraving/dom/fret.h

@@ -235,6 +235,8 @@ class FretDiagram final : public EngravingItem
     bool setProperty(Pid propertyId, const PropertyValue&) override;
     PropertyValue propertyDefault(Pid) const override;
 
+    void setTrack(track_idx_t val) override;
+
     String accessibleInfo() const override;
     String screenReaderInfo() const override;
 

src/engraving/dom/guitarbend.h

@@ -251,6 +251,8 @@ class GuitarBendText final : public TextBase
 public:
     GuitarBendText(GuitarBendSegment* parent);
     GuitarBendText* clone() const override { return new GuitarBendText(*this); }
+
+    bool isEditable() const override { return false; }
 };
 } // namespace mu::engraving
 

src/engraving/dom/harmony.cpp

@@ -849,9 +849,14 @@ Fraction Harmony::ticksTillNext(int utick, bool stopAtMeasureEnd) const
 {
     Segment* seg = getParentSeg();
     Fraction duration = seg->ticks();
-    Segment* cur = seg->next();
-    auto rsIt = score()->repeatList().findRepeatSegmentFromUTick(utick);
 
+    const RepeatList& repeats = score()->repeatList();
+    auto rsIt = repeats.findRepeatSegmentFromUTick(utick);
+    if (rsIt == repeats.cend()) {
+        return duration;
+    }
+
+    Segment* cur = seg->next();
     Measure const* currentMeasure = seg->measure();
     Measure const* endMeasure = (stopAtMeasureEnd) ? currentMeasure : (*rsIt)->lastMeasure();
     Harmony const* nextHarmony = nullptr;
@@ -892,9 +897,9 @@ Fraction Harmony::ticksTillNext(int utick, bool stopAtMeasureEnd) const
             // End of repeatSegment or search boundary reached
             if (stopAtMeasureEnd) {
                 break;
-            } else {
+            } else if (!nextHarmony) {
                 // move to next RepeatSegment
-                if (++rsIt != score()->repeatList().end()) {
+                if (++rsIt != repeats.end()) {
                     currentMeasure = (*rsIt)->firstMeasure();
                     endMeasure     = (*rsIt)->lastMeasure();
                     cur = currentMeasure->first();
@@ -903,6 +908,12 @@ Fraction Harmony::ticksTillNext(int utick, bool stopAtMeasureEnd) const
         }
     } while ((nextHarmony == nullptr) && (cur != nullptr));
 
+    if (nextHarmony && rsIt != repeats.end()) {
+        int tickOffset = (*rsIt)->utick - (*rsIt)->tick;
+        int nextHarmonyUtick = nextHarmony->tick().ticks() + tickOffset;
+        duration = Fraction::fromTicks(nextHarmonyUtick - utick);
+    }
+
     return duration;
 }
 
@@ -1062,9 +1073,12 @@ const ChordDescription* Harmony::getDescription(const String& name, const Parsed
 
 const RealizedHarmony& Harmony::getRealizedHarmony() const
 {
-    Fraction tick = this->tick();
     const Staff* st = staff();
+    IF_ASSERT_FAILED(st) {
+        return m_realizedHarmony;
+    }
 
+    const Fraction tick = this->tick();
     const CapoParams& capo = st->capo(tick);
 
     int offset = 0;
@@ -1080,7 +1094,7 @@ const RealizedHarmony& Harmony::getRealizedHarmony() const
     //Adjust for Nashville Notation, might be temporary
     // TODO: set dirty on add/remove of keysig
     if (m_harmonyType == HarmonyType::NASHVILLE && !m_realizedHarmony.valid()) {
-        Key key = staff()->key(tick);
+        Key key = st->key(tick);
 
         //parse root
         int rootTpc = function2Tpc(m_function, key);

src/engraving/dom/repeatlist.cpp

@@ -298,10 +298,14 @@ int RepeatList::utime2utick(double secs) const
 ///
 std::vector<RepeatSegment*>::const_iterator RepeatList::findRepeatSegmentFromUTick(int utick) const
 {
-    return std::lower_bound(this->cbegin(), this->cend(), utick, [](RepeatSegment const* rs, int utick) {
-        // Skip RS where endtick is less than us
-        return utick > (rs->utick + rs->len());
-    });
+    for (auto it = cbegin(); it != cend(); ++it) {
+        const RepeatSegment* seg = *it;
+        if (utick >= seg->utick && utick < seg->utick + seg->len()) {
+            return it;
+        }
+    }
+
+    return cend();
 }
 
 //---------------------------------------------------------

src/engraving/dom/score.cpp

@@ -554,7 +554,7 @@ void Score::rebuildTempoAndTimeSigMaps(Measure* measure, std::optional<BeatsPerS
                     staff(staffIdx)->addTimeSig(ts);
                 }
             }
-        } else if (segment.isChordRestType()) {
+        } else if (segment.isChordRestType() || segment.isTimeTickType()) {
             if (!isMaster()) {
                 continue;
             }

src/engraving/dom/types.h

@@ -553,6 +553,23 @@ struct ScoreChangesRange {
     {
         return isValidBoundary() || !changedTypes.empty();
     }
+
+    void clear()
+    {
+        *this = ScoreChangesRange();
+    }
+
+    void combine(const ScoreChangesRange& r)
+    {
+        tickFrom = std::min(tickFrom, r.tickFrom);
+        tickTo = std::max(tickTo, r.tickTo);
+        staffIdxFrom = std::min(staffIdxFrom, r.staffIdxFrom);
+        staffIdxTo = std::max(staffIdxTo, r.staffIdxTo);
+        changedItems.insert(r.changedItems.begin(), r.changedItems.end());
+        changedTypes.insert(r.changedTypes.begin(), r.changedTypes.end());
+        changedPropertyIdSet.insert(r.changedPropertyIdSet.begin(), r.changedPropertyIdSet.end());
+        changedStyleIdSet.insert(r.changedStyleIdSet.begin(), r.changedStyleIdSet.end());
+    }
 };
 } // namespace mu::engraving
 

src/engraving/playback/playbackeventsrenderer.cpp

@@ -116,6 +116,11 @@ void PlaybackEventsRenderer::renderChordSymbol(const Harmony* chordSymbol,
         return;
     }
 
+    const Staff* staff = chordSymbol->staff();
+    IF_ASSERT_FAILED(staff) {
+        return;
+    }
+
     const RealizedHarmony& realized = chordSymbol->getRealizedHarmony();
     const RealizedHarmony::PitchMap& notes = realized.notes();
 
@@ -130,7 +135,7 @@ void PlaybackEventsRenderer::renderChordSymbol(const Harmony* chordSymbol,
 
     voice_layer_idx_t voiceIdx = static_cast<voice_layer_idx_t>(chordSymbol->voice());
     staff_layer_idx_t staffIdx = static_cast<staff_layer_idx_t>(chordSymbol->staffIdx());
-    Key key = chordSymbol->staff()->key(chordSymbol->tick());
+    Key key = staff->key(chordSymbol->tick());
 
     ArticulationMap articulations = makeStandardArticulationMap(profile, eventTimestamp, duration);
 
@@ -161,15 +166,19 @@ void PlaybackEventsRenderer::renderChordSymbol(const Harmony* chordSymbol, const
         return;
     }
 
+    const Staff* staff = chordSymbol->staff();
+    IF_ASSERT_FAILED(staff) {
+        return;
+    }
+
     const RealizedHarmony& realized = chordSymbol->getRealizedHarmony();
     const RealizedHarmony::PitchMap& notes = realized.notes();
 
     PlaybackEventList& events = result[actualTimestamp];
 
     voice_layer_idx_t voiceIdx = static_cast<voice_layer_idx_t>(chordSymbol->voice());
     staff_layer_idx_t staffIdx = static_cast<staff_layer_idx_t>(chordSymbol->staffIdx());
-
-    Key key = chordSymbol->staff()->key(chordSymbol->tick());
+    Key key = staff->key(chordSymbol->tick());
 
     ArticulationMap articulations = makeStandardArticulationMap(profile, actualTimestamp, actualDuration);
 

src/engraving/playback/playbackmodel.cpp

@@ -385,6 +385,10 @@ void PlaybackModel::processSegment(const int tickPositionOffset, const Segment*
         collectChangesTracks(trackId, trackChanges);
     }
 
+    if (segment->isTimeTickType()) {
+        return; // optimization: search only for annotations
+    }
+
     for (const EngravingItem* item : segment->elist()) {
         if (!item || !item->isChordRest() || !item->part()) {
             continue;
@@ -457,7 +461,7 @@ void PlaybackModel::processMeasureRepeat(const int tickPositionOffset, const Mea
     bool isFirstSegmentOfRepeatedMeasure = true;
 
     for (const Segment* seg = referringMeasure->first(); seg; seg = seg->next()) {
-        if (!seg->isChordRestType()) {
+        if (!seg->isChordRestType() && !seg->isTimeTickType()) {
             continue;
         }
 
@@ -497,7 +501,7 @@ void PlaybackModel::updateEvents(const int tickFrom, const int tickTo, const tra
             bool isFirstSegmentOfMeasure = true;
 
             for (Segment* segment = measure->first(); segment; segment = segment->next()) {
-                if (!segment->isChordRestType()) {
+                if (!segment->isChordRestType() && !segment->isTimeTickType()) {
                     continue;
                 }
 

src/framework/audio/internal/worker/eventaudiosource.cpp

@@ -68,6 +68,10 @@ void EventAudioSource::setIsActive(const bool active)
         return;
     }
 
+    if (m_synth->isActive() == active) {
+        return;
+    }
+
     m_synth->setIsActive(active);
     m_synth->flushSound();
 }