diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp index 8b147ad78964a..4887113745e9a 100644 --- a/importexport/musicxml/importmxmlpass2.cpp +++ b/importexport/musicxml/importmxmlpass2.cpp @@ -265,7 +265,7 @@ static void fillGap(Measure* measure, int track, const Fraction& tstart, const F // qDebug("\nfillGIFV fillGap(measure %p track %d tstart %d tend %d) restLen %d len", // measure, track, tstart, tend, restLen); // note: as MScore::division (#ticks in a quarter note) equals 480 - // MScore::division / 64 (#ticks in a 256th note) uequals 7.5 but is rounded down to 7 + // MScore::division / 64 (#ticks in a 256th note) equals 7.5 but is rounded down to 7 while (restLen > Fraction(1,256)) { Fraction len = restLen; TDuration d(TDuration::DurationType::V_INVALID); diff --git a/mscore/file.cpp b/mscore/file.cpp index f3dca65288a50..b4f482ddbb93a 100644 --- a/mscore/file.cpp +++ b/mscore/file.cpp @@ -965,6 +965,16 @@ MasterScore* MuseScore::getNewFile() bpm *= 16; } break; + case 128: + if (ts.numerator() % 3 == 0) { + text = "metNote64ndUpspacemetAugmentationDot = %1"; + bpm *= 9; + } + else { + text = "metNote128thUp = %1"; + bpm *= 32; + } + break; default: break; } diff --git a/mscore/menus.cpp b/mscore/menus.cpp index f6d32639eba5a..0d42b13c1561b 100644 --- a/mscore/menus.cpp +++ b/mscore/menus.cpp @@ -1935,6 +1935,12 @@ void MuseScore::addTempo() else text = "metNote64thUp = 80"; break; + case 128: + if(f.numerator() % 3 == 0) + text = "metNote64ndUpspacemetAugmentationDot = 80"; + else + text = "metNote128thUp = 80"; + break; default: break; } diff --git a/mscore/timedialog.cpp b/mscore/timedialog.cpp index ee018dbbd8de1..ce3c545861e1e 100644 --- a/mscore/timedialog.cpp +++ b/mscore/timedialog.cpp @@ -158,6 +158,7 @@ int TimeDialog::denominator2Idx(int denominator) const case 16: val = 4; break; case 32: val = 5; break; case 64: val = 6; break; + case 128:val = 7; break; } return val; } @@ -177,6 +178,7 @@ int TimeDialog::denominator() const case 4: val = 16; break; case 5: val = 32; break; case 6: val = 64; break; + case 7: val = 128; break; } return val; } diff --git a/mscore/timedialog.ui b/mscore/timedialog.ui index 27df6e2195b83..e131dc157e52b 100644 --- a/mscore/timedialog.ui +++ b/mscore/timedialog.ui @@ -136,6 +136,11 @@ 64 + + + 128 + + diff --git a/mscore/timesigwizard.ui b/mscore/timesigwizard.ui index 744d2327614a5..2e10631388c2e 100644 --- a/mscore/timesigwizard.ui +++ b/mscore/timesigwizard.ui @@ -143,6 +143,11 @@ 64 + + + 128 + + @@ -490,6 +495,9 @@ tempoGroup spinboxTempo - + + + +