Merge pull request #4847 from changhc/284080-beats-not-listed-correctly

Fix #284080: incorrectly listed beats
musescore · Apr 18, 2019 · a7cff20 · a7cff20
2 parents 4fbb221 + 29cd62d
commit a7cff20
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/libmscore/sig.cpp b/libmscore/sig.cpp
@@ -19,7 +19,7 @@ namespace Ms {
 //   ticks_beat
 //---------------------------------------------------------
 
-static int ticks_beat(int n)
+int ticks_beat(int n)
       {
       int m = (MScore::division * 4) / n;
       if ((MScore::division * 4) % n) {

diff --git a/libmscore/sig.h b/libmscore/sig.h
@@ -20,6 +20,8 @@ namespace Ms {
 class XmlWriter;
 class XmlReader;
 
+int ticks_beat(int n);
+
 //-------------------------------------------------------------------
 //   BeatType
 //-------------------------------------------------------------------

diff --git a/mscore/scoreaccessibility.cpp b/mscore/scoreaccessibility.cpp
@@ -7,6 +7,7 @@
 #include "libmscore/score.h"
 #include "libmscore/measure.h"
 #include "libmscore/spanner.h"
+#include "libmscore/sig.h"
 #include "inspector/inspector.h"
 #include "selectionwindow.h"
 #include "playpanel.h"
@@ -228,6 +229,7 @@ std::pair<int, float> ScoreAccessibility::barbeat(Element *e)
       int ticks = 0;
       TimeSigMap* tsm = e->score()->sigmap();
       Element* p = e;
+      int ticksB = ticks_beat(tsm->timesig(0).timesig().denominator());
       while(p && p->type() != ElementType::SEGMENT && p->type() != ElementType::MEASURE)
             p = p->parent();
 
@@ -237,13 +239,14 @@ std::pair<int, float> ScoreAccessibility::barbeat(Element *e)
       else if (p->type() == ElementType::SEGMENT) {
             Segment* seg = static_cast<Segment*>(p);
             tsm->tickValues(seg->tick().ticks(), &bar, &beat, &ticks);
+            ticksB = ticks_beat(tsm->timesig(seg->tick().ticks()).timesig().denominator());
             }
       else if (p->type() == ElementType::MEASURE) {
             Measure* m = static_cast<Measure*>(p);
             bar = m->no();
             beat = -1;
             ticks = 0;
             }
-      return pair<int,float>(bar + 1, beat + 1 + ticks / static_cast<float>(MScore::division));
+      return pair<int,float>(bar + 1, beat + 1 + ticks / static_cast<float>(ticksB));
       }
 }