Find playable dynamic at hairpin end if snapped one isn't playable

Author: Reedbeta

src/engraving/dom/hairpin.cpp

@@ -327,11 +327,11 @@ EngravingItem* HairpinSegment::findElementToSnapBefore(bool ignoreInvisible) con
     return nullptr;
 }
 
-EngravingItem* HairpinSegment::findElementToSnapAfter(bool ignoreInvisible) const
+EngravingItem* HairpinSegment::findElementToSnapAfter(bool ignoreInvisible, bool requirePlayable) const
 {
     // Note: we don't need to look for a hairpin after.
     // It is the next hairpin which looks for a hairpin before.
-    return findEndDynamicOrExpression(ignoreInvisible);
+    return findEndDynamicOrExpression(ignoreInvisible, requirePlayable);
 }
 
 void HairpinSegment::endDragGrip(EditData& ed)
@@ -398,7 +398,7 @@ TextBase* HairpinSegment::findStartDynamicOrExpression(bool ignoreInvisible) con
     return dynamicsAndExpr.back();
 }
 
-TextBase* HairpinSegment::findEndDynamicOrExpression(bool ignoreInvisible) const
+TextBase* HairpinSegment::findEndDynamicOrExpression(bool ignoreInvisible, bool requirePlayable) const
 {
     Fraction refTick = hairpin()->tick2();
     Measure* measure = score()->tick2measure(refTick - Fraction::eps());
@@ -424,6 +424,9 @@ TextBase* HairpinSegment::findEndDynamicOrExpression(bool ignoreInvisible) const
             if (ignoreInvisible && !item->addToSkyline()) {
                 continue;
             }
+            if (requirePlayable && (!item->isDynamic() || !toDynamic(item)->playDynamic())) {
+                continue;
+            }
             bool endsMatch = item->track() == hairpin()->track()
                              && item->placement() == placement()
                              && item->getProperty(Pid::VOICE_ASSIGNMENT) == hairpin()->getProperty(Pid::VOICE_ASSIGNMENT);

src/engraving/dom/hairpin.h

@@ -70,13 +70,13 @@ class HairpinSegment final : public TextLineBaseSegment
     bool hasVoiceAssignmentProperties() const override { return spanner()->hasVoiceAssignmentProperties(); }
 
     EngravingItem* findElementToSnapBefore(bool ignoreInvisible = true) const;
-    EngravingItem* findElementToSnapAfter(bool ignoreInvisible = true) const;
+    EngravingItem* findElementToSnapAfter(bool ignoreInvisible = true, bool requirePlayable = false) const;
 
     void endDragGrip(EditData& ed) override;
 
 private:
     TextBase* findStartDynamicOrExpression(bool ignoreInvisible = true) const;
-    TextBase* findEndDynamicOrExpression(bool ignoreInvisible = true) const;
+    TextBase* findEndDynamicOrExpression(bool ignoreInvisible = true, bool requirePlayable = false) const;
 
     void startDragGrip(EditData&) override;
     void dragGrip(EditData&) override;

src/engraving/dom/segment.cpp

@@ -1413,7 +1413,7 @@ EngravingItem* Segment::findAnnotation(ElementType type, track_idx_t minTrack, t
 //---------------------------------------------------------
 //   findAnnotations
 ///  Returns the list of found annotations
-///  or nullptr if nothing was found.
+///  or an empty list if nothing was found.
 //---------------------------------------------------------
 
 std::vector<EngravingItem*> Segment::findAnnotations(ElementType type, track_idx_t minTrack, track_idx_t maxTrack) const

src/engraving/playback/playbackcontext.cpp

@@ -93,12 +93,14 @@ static mu::engraving::DynamicType findNominalEndDynamicType(const Hairpin* hairp
         }
 
         const track_idx_t trackIdx = hairpin->track();
-        const EngravingItem* dynamic = endSegment->findAnnotation(ElementType::DYNAMIC, trackIdx, trackIdx);
-        if (!dynamic || !dynamic->isDynamic() || !toDynamic(dynamic)->playDynamic()) {
-            return mu::engraving::DynamicType::OTHER;
+        const EngravingItemList dynamics = endSegment->findAnnotations(ElementType::DYNAMIC, trackIdx, trackIdx);
+        for (const EngravingItem* dynamic : dynamics) {
+            if (dynamic && dynamic->isDynamic() && toDynamic(dynamic)->playDynamic()) {
+                return toDynamic(dynamic)->dynamicType();
+            }
         }
 
-        return toDynamic(dynamic)->dynamicType();
+        return mu::engraving::DynamicType::OTHER;
     }
 
     const LineSegment* seg = hairpin->backSegment();
@@ -108,17 +110,13 @@ static mu::engraving::DynamicType findNominalEndDynamicType(const Hairpin* hairp
 
     // Optimization: first check if there is a cached dynamic
     const EngravingItem* snappedItem = seg->ldata()->itemSnappedAfter();
-    if (!snappedItem || !snappedItem->isDynamic()) {
-        snappedItem = toHairpinSegment(seg)->findElementToSnapAfter(false /*ignoreInvisible*/);
-        if (!snappedItem || !snappedItem->isDynamic()) {
+    if (!snappedItem || !snappedItem->isDynamic() || !toDynamic(snappedItem)->playDynamic()) {
+        snappedItem = toHairpinSegment(seg)->findElementToSnapAfter(false /*ignoreInvisible*/, true /* requirePlayable */);
+        if (!snappedItem || !snappedItem->isDynamic() || !toDynamic(snappedItem)->playDynamic()) {
             return mu::engraving::DynamicType::OTHER;
         }
     }
 
-    if (!toDynamic(snappedItem)->playDynamic()) {
-        return mu::engraving::DynamicType::OTHER;
-    }
-
     return toDynamic(snappedItem)->dynamicType();
 }