|
@@ -1016,14 +1016,14 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
|
|
|
preMeasureNumber = note?.sourceMeasure?.MeasureNumberXML
|
|
|
allMeasures.push(note.sourceMeasure);
|
|
|
}
|
|
|
- if (si === 0 && state.isSpecialBookCategory) {
|
|
|
- for (const expression of (note.sourceMeasure as SourceMeasure)?.TempoExpressions) {
|
|
|
- if (expression?.InstantaneousTempo?.beatUnit) {
|
|
|
- // 取最后一个有效的tempo
|
|
|
- beatUnit = expression.InstantaneousTempo.beatUnit;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (si === 0 && state.isSpecialBookCategory) {
|
|
|
+ // for (const expression of (note.sourceMeasure as SourceMeasure)?.TempoExpressions) {
|
|
|
+ // if (expression?.InstantaneousTempo?.beatUnit) {
|
|
|
+ // // 取最后一个有效的tempo
|
|
|
+ // beatUnit = expression.InstantaneousTempo.beatUnit;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
// 判断是否是同一小节
|
|
|
if (staveIndex == note.sourceMeasure?.MeasureNumberXML && i !== 0) {
|
|
|
staveNoteIndex++
|
|
@@ -1136,7 +1136,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
|
|
|
}
|
|
|
// console.log(getTimeByBeatUnit(beatUnit, measureSpeed, iterator.currentMeasure.activeTimeSignature.Denominator))
|
|
|
let gradualLength = 0;
|
|
|
- let speed = (state.isSpecialBookCategory ? measureSpeed : baseSpeed) || 1;
|
|
|
+ let speed = measureSpeed ? measureSpeed : baseSpeed;
|
|
|
gradualChange = iterator.currentMeasure.speedInfo || gradualChange;
|
|
|
gradualSpeed = osmd.Sheet.SoundTempos?.get(note.sourceMeasure.measureListIndex) || gradualSpeed;
|
|
|
if (!gradualSpeed || gradualSpeed.length < 2) {
|