Fix fermata time stretch handling on partial re-layout

musescore · Jan 10, 2019 · 2bd75bb · 2bd75bb
1 parent 6d522ee
commit 2bd75bb
Show file tree

Hide file tree

Showing 6 changed files with 393 additions and 11 deletions.
diff --git a/libmscore/fraction.h b/libmscore/fraction.h
@@ -63,7 +63,6 @@ class Fraction {
       Fraction operator+(const Fraction& v) const { return Fraction(*this) += v; }
       Fraction operator-(const Fraction& v) const { return Fraction(*this) -= v; }
       Fraction operator*(const Fraction& v) const { return Fraction(*this) *= v; }
-      Fraction operator*(int v)             const { return Fraction(*this) *= v; }
       Fraction operator/(const Fraction& v) const { return Fraction(*this) /= v; }
       Fraction operator/(int v)             const { return Fraction(*this) /= v; }
 
@@ -79,6 +78,9 @@ class Fraction {
       operator QVariant() const { return QVariant::fromValue(*this); }
       };
 
+inline Fraction operator*(const Fraction& f, int v) { return Fraction(f) *= v; }
+inline Fraction operator*(int v, const Fraction& f) { return Fraction(f) *= v; }
+
 #ifdef SCRIPT_INTERFACE
 
 //---------------------------------------------------------

diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -2657,6 +2657,11 @@ void Score::getNextMeasure(LayoutContext& lc)
             }
 
       measure->computeTicks();
+
+      // Reset tempo to set correct time stretch for fermata.
+      if (isMaster())
+            resetTempoRange(measure->tick(), measure->endTick());
+
       for (Segment& segment : measure->segments()) {
             if (segment.isBreathType()) {
                   qreal length = 0.0;
@@ -2709,7 +2714,7 @@ void Score::getNextMeasure(LayoutContext& lc)
                         if (e->isFermata())
                               stretch = qMax(stretch, toFermata(e)->timeStretch());
                         else if (e->isTempoText()) {
-                              if (score()->isMaster()) {
+                              if (isMaster()) {
                                     TempoText* tt = toTempoText(e);
                                     setTempo(tt->segment(), tt->tempo());
                                     }
@@ -4187,11 +4192,6 @@ void Score::doLayoutRange(int stick, int etick)
 
       lc.prevMeasure = 0;
 
-      // we need to reset tempo because fermata is setted
-      //inside getNextMeasure and it lead to twice timeStretch
-      if (isMaster())
-            resetTempoRange(stick, etick);
-
       getNextMeasure(lc);
       lc.curSystem = collectSystem(lc);
 

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -3315,11 +3315,12 @@ void Score::resetTempo()
 
 void Score::resetTempoRange(int tick1, int tick2)
       {
+      const bool zeroInRange = (tick1 <= 0 && tick2 > 0);
       tempomap()->clearRange(tick1, tick2);
-      if (tempomap()->empty())
+      if (zeroInRange)
             tempomap()->setTempo(0, _defaultTempo);
       sigmap()->clearRange(tick1, tick2);
-      if (sigmap()->empty()) {
+      if (zeroInRange) {
             Measure* m = firstMeasure();
             if (m)
                   sigmap()->add(0, SigEvent(m->len(),  m->timesig(), 0));

diff --git a/mtest/libmscore/midi/testTimeStretchFermata-ref.mid b/mtest/libmscore/midi/testTimeStretchFermata-ref.mid