|
@@ -1122,6 +1122,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
|
|
|
// 计算音符时值,使用转换成1/4的速度计算
|
|
|
beatSpeed = measuresTempoInBPM;
|
|
|
// let beatSpeed = measureSpeed || baseSpeed
|
|
|
+ beatSpeed = beatSpeed / state.originAudioPlayRate;
|
|
|
// 如果有节拍器,需要将节拍器的时间算出来
|
|
|
if (i === 0) {
|
|
|
if(state.isOpenMetronome){
|
|
@@ -1133,7 +1134,8 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
|
|
|
// console.log("fixtime:", fixtime, '速度:', beatSpeed, "state.isSpecialBookCategory:", state.isSpecialBookCategory, 'state.isOpenMetronome:', state.isOpenMetronome);
|
|
|
}
|
|
|
let gradualLength = 0;
|
|
|
- let speed = (state.isSpecialBookCategory ? measureSpeed : baseSpeed) || 1;
|
|
|
+ // 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) {
|