Merge pull request #3442 from lasconic/fix-volta-22

Fix several issues with repeat and volta. Counterpart of PR #3371

Author: lasconic

libmscore/jump.cpp

@@ -45,6 +45,7 @@ Jump::Jump(Score* s)
       setFlags(ElementFlag::MOVABLE | ElementFlag::SELECTABLE);
       setTextStyleType(TextStyleType::REPEAT_RIGHT);
       setLayoutToParentWidth(true);
+      _playRepeats = false;
       }
 
 //---------------------------------------------------------
@@ -100,6 +101,8 @@ void Jump::read(XmlReader& e)
                   _playUntil = e.readElementText();
             else if (tag == "continueAt")
                   _continueAt = e.readElementText();
+            else if (tag == "playRepeats")
+                  _playRepeats = e.readBool();
             else if (!Text::readProperties(e))
                   e.unknown();
             }
@@ -117,6 +120,7 @@ void Jump::write(Xml& xml) const
       xml.tag("jumpTo", _jumpTo);
       xml.tag("playUntil", _playUntil);
       xml.tag("continueAt", _continueAt);
+      xml.tag("playRepeats", _playRepeats);
       xml.etag();
       }
 
@@ -160,6 +164,8 @@ QVariant Jump::getProperty(P_ID propertyId) const
                   return playUntil();
             case P_ID::CONTINUE_AT:
                   return continueAt();
+            case P_ID::PLAY_REPEATS:
+                  return playRepeats();
             default:
                   break;
             }
@@ -182,12 +188,16 @@ bool Jump::setProperty(P_ID propertyId, const QVariant& v)
             case P_ID::CONTINUE_AT:
                   setContinueAt(v.toString());
                   break;
+            case P_ID::PLAY_REPEATS:
+                  setPlayRepeats(v.toInt());
+                  break;
             default:
                   if (!Text::setProperty(propertyId, v))
                         return false;
                   break;
             }
       score()->setLayoutAll(true);
+      score()->setPlaylistDirty();
       return true;
       }
 
@@ -203,6 +213,9 @@ QVariant Jump::propertyDefault(P_ID propertyId) const
             case P_ID::CONTINUE_AT:
                   return QString("");
 
+            case P_ID::PLAY_REPEATS:
+                  return false;
+
             default:
                   break;
             }

libmscore/jump.h

@@ -41,6 +41,7 @@ class Jump : public Text {
       QString _jumpTo;
       QString _playUntil;
       QString _continueAt;
+      bool _playRepeats;
 
    public:
       enum class Type : char {
@@ -76,6 +77,8 @@ class Jump : public Text {
       void undoSetJumpTo(const QString& s);
       void undoSetPlayUntil(const QString& s);
       void undoSetContinueAt(const QString& s);
+      bool playRepeats() const             { return _playRepeats; }
+      void setPlayRepeats(bool val)        { _playRepeats = val;  }
 
       virtual bool systemFlag() const override      { return true;        }
 

libmscore/measure.h

@@ -282,6 +282,9 @@ class Measure : public MeasureBase {
       void setRepeatFlags(Repeat val)              { _repeatFlags = val;  }
       void setRepeatFlag(Repeat val)               { _repeatFlags = _repeatFlags | val; }
       void resetRepeatFlag(Repeat val)             { _repeatFlags = Repeat(int(_repeatFlags) & ~int(val)); }
+      bool repeatEnd()                             { return _repeatFlags & Repeat::END; }
+      bool repeatStart()                           { return _repeatFlags & Repeat::START; }
+      bool repeatJump()                            { return _repeatFlags & Repeat::JUMP; }
 
       AccidentalVal findAccidental(Note*) const;
       AccidentalVal findAccidental(Segment* s, int staffIdx, int line, bool &error) const;

libmscore/property.cpp

@@ -237,6 +237,7 @@ static const PropertyData propertyList[] = {
       { P_ID::FRET_FRETS,          false, "frets",                 P_TYPE::INT },
       { P_ID::FRET_BARRE,          false, "barre",                 P_TYPE::INT },
       { P_ID::FRET_OFFSET,         false, "fretOffset",            P_TYPE::INT },
+      { P_ID::PLAY_REPEATS,        false, "playRepeats",           P_TYPE::BOOL},
 
       { P_ID::END,                 false, "",                      P_TYPE::INT }
       };

libmscore/property.h

@@ -230,6 +230,7 @@ enum class P_ID : unsigned char {
       FRET_FRETS,
       FRET_BARRE,
       FRET_OFFSET,
+      PLAY_REPEATS,
       END
       };