fix #64206: Repeat Measure sign in one staff of multi-stave inst. cau…

…ses repeated playback of all staves
musescore · Jun 8, 2015 · 80cc88f · 80cc88f
1 parent 2c74356
commit 80cc88f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -412,7 +412,7 @@ AccidentalVal Measure::findAccidental(Segment* s, int staffIdx, int line) const
       int startTrack = staffIdx * VOICES;
       int endTrack   = startTrack + VOICES;
       for (Segment* segment = first(st); segment; segment = segment->next(st)) {
-            if (segment == s) {
+            if (segment == s && staff->isPitchedStaff()) {
                   ClefType clef = staff->clef(s->tick());
                   int l = relStep(line, clef);
                   return tversatz.accidentalVal(l);
@@ -2865,12 +2865,11 @@ bool Measure::isFullMeasureRest()
 //   isRepeatMeasure
 //---------------------------------------------------------
 
-bool Measure::isRepeatMeasure(Part* part)
+bool Measure::isRepeatMeasure(Staff* staff)
       {
-      int firstStaffIdx = score()->staffIdx(part);
-      int nextStaffIdx  = firstStaffIdx + part->nstaves();
-      int strack        = firstStaffIdx * VOICES;
-      int etrack        = nextStaffIdx * VOICES;
+      int staffIdx = score()->staffIdx(staff);
+      int strack        = staffIdx * VOICES;
+      int etrack        = (staffIdx + 1) * VOICES;
       Segment* s        = first(Segment::Type::ChordRest);
 
       if (s == 0)

diff --git a/libmscore/measure.h b/libmscore/measure.h
@@ -290,7 +290,7 @@ class Measure : public MeasureBase {
       bool hasVoice(int track) const;
       bool isMeasureRest(int staffIdx);
       bool isFullMeasureRest();
-      bool isRepeatMeasure(Part* part);
+      bool isRepeatMeasure(Staff* staff);
       bool visible(int staffIdx) const;
       bool slashStyle(int staffIdx) const;
 

diff --git a/libmscore/rendermidi.cpp b/libmscore/rendermidi.cpp
@@ -609,7 +609,7 @@ void Score::renderStaff(EventMap* events, Staff* staff)
             int endTick    = startTick + rs->len;
             int tickOffset = rs->utick - rs->tick;
             for (Measure* m = tick2measure(startTick); m; m = m->nextMeasure()) {
-                  if (lastMeasure && m->isRepeatMeasure(staff->part())) {
+                  if (lastMeasure && m->isRepeatMeasure(staff)) {
                         int offset = m->tick() - lastMeasure->tick();
                         collectMeasureEvents(events, lastMeasure, staff, tickOffset + offset);
                         }