|
|
@@ -850,6 +850,8 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
|
|
|
|
|
|
let preNoteMeasureNumber = 0; // 上一个小节的number值
|
|
|
|
|
|
+ let currentRealTempo; // 当前小节的速度与拍号信息
|
|
|
+
|
|
|
const _notes = [] as any[];
|
|
|
if (state.gradualTimes) {
|
|
|
console.log("后台设置的渐慢小节时间", state.gradual, state.gradualTimes);
|
|
|
@@ -964,13 +966,16 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
|
|
|
}
|
|
|
note.maxNoteNum = maxNoteNum;
|
|
|
note.trackIndex = minIndex;
|
|
|
+ currentRealTempo = iterator.currentMeasure.tempoExpressions.length ? iterator.currentMeasure.tempoExpressions.find((item: any) => item?.InstantaneousTempo?.isMetronomeMark) || currentRealTempo : currentRealTempo;
|
|
|
+
|
|
|
_notes.push({
|
|
|
note,
|
|
|
iterator: { ...iterator },
|
|
|
currentTime,
|
|
|
isDouble,
|
|
|
isMutileSubject,
|
|
|
- measuresTempoInBPM: note?.sourceMeasure?.tempoInBPM
|
|
|
+ measuresTempoInBPM: note?.sourceMeasure?.tempoInBPM,
|
|
|
+ currentRealTempo
|
|
|
});
|
|
|
}
|
|
|
|
