|
@@ -926,40 +926,51 @@ export const setTick = (stop: () => void, speed?: number) => {
|
|
|
numerator = state.osmd.numerator
|
|
|
denominator = state.osmd.denominator
|
|
|
}
|
|
|
- if (detailState.activeDetail.isAppPlay) {
|
|
|
- state.ticking = true
|
|
|
- postMessage(
|
|
|
- {
|
|
|
- api: 'cloudMetronome',
|
|
|
- content: {
|
|
|
- // 少量情况下需要重复
|
|
|
- repeat: numerator === 2 ? 2 : 1,
|
|
|
- denominator,
|
|
|
- numerator,
|
|
|
- },
|
|
|
- },
|
|
|
- (res) => {
|
|
|
- state.ticking = false
|
|
|
- if (res?.content.status === 'finish') {
|
|
|
- mixStop()
|
|
|
- } else if (res?.content.status === 'cancel') {
|
|
|
- event.emit('tickDestroy')
|
|
|
- }
|
|
|
- }
|
|
|
- )
|
|
|
- } else {
|
|
|
- const activeTickRepeat = numerator === 2 ? 2 : 1
|
|
|
- detailState.activeTickRepeat = activeTickRepeat
|
|
|
- console.log('ticking')
|
|
|
- state.tickPlayer = new TickPlayer(numerator, (speed || state.speed) / 90)
|
|
|
- state.tickPlayer?.start(numerator, (speed || state.speed) / 90, activeTickRepeat)
|
|
|
- state.tickPlayer?.event.off('tick', setActiveKey)
|
|
|
- state.tickPlayer?.event.off('stop', mixStop)
|
|
|
- state.tickPlayer?.event.off('destroy', onTickDestroy)
|
|
|
- state.tickPlayer?.event.on('tick', setActiveKey)
|
|
|
- state.tickPlayer?.event.on('stop', mixStop)
|
|
|
- state.tickPlayer?.event.on('destroy', onTickDestroy)
|
|
|
- }
|
|
|
+ // if (detailState.activeDetail.isAppPlay) {
|
|
|
+ // state.ticking = true
|
|
|
+ // postMessage(
|
|
|
+ // {
|
|
|
+ // api: 'cloudMetronome',
|
|
|
+ // content: {
|
|
|
+ // // 少量情况下需要重复
|
|
|
+ // repeat: numerator === 2 ? 2 : 1,
|
|
|
+ // denominator,
|
|
|
+ // numerator,
|
|
|
+ // },
|
|
|
+ // },
|
|
|
+ // (res) => {
|
|
|
+ // state.ticking = false
|
|
|
+ // if (res?.content.status === 'finish') {
|
|
|
+ // mixStop()
|
|
|
+ // } else if (res?.content.status === 'cancel') {
|
|
|
+ // event.emit('tickDestroy')
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // )
|
|
|
+ // } else {
|
|
|
+ // const activeTickRepeat = numerator === 2 ? 2 : 1
|
|
|
+ // detailState.activeTickRepeat = activeTickRepeat
|
|
|
+ // console.log('ticking')
|
|
|
+ // state.tickPlayer = new TickPlayer(numerator, (speed || state.speed) / 90)
|
|
|
+ // state.tickPlayer?.start(numerator, (speed || state.speed) / 90, activeTickRepeat)
|
|
|
+ // state.tickPlayer?.event.off('tick', setActiveKey)
|
|
|
+ // state.tickPlayer?.event.off('stop', mixStop)
|
|
|
+ // state.tickPlayer?.event.off('destroy', onTickDestroy)
|
|
|
+ // state.tickPlayer?.event.on('tick', setActiveKey)
|
|
|
+ // state.tickPlayer?.event.on('stop', mixStop)
|
|
|
+ // state.tickPlayer?.event.on('destroy', onTickDestroy)
|
|
|
+ // }
|
|
|
+ const activeTickRepeat = numerator === 2 ? 2 : 1
|
|
|
+ detailState.activeTickRepeat = activeTickRepeat
|
|
|
+ console.log('ticking')
|
|
|
+ state.tickPlayer = new TickPlayer(numerator, (speed || state.speed) / 90)
|
|
|
+ state.tickPlayer?.start(numerator, (speed || state.speed) / 90, activeTickRepeat)
|
|
|
+ state.tickPlayer?.event.off('tick', setActiveKey)
|
|
|
+ state.tickPlayer?.event.off('stop', mixStop)
|
|
|
+ state.tickPlayer?.event.off('destroy', onTickDestroy)
|
|
|
+ state.tickPlayer?.event.on('tick', setActiveKey)
|
|
|
+ state.tickPlayer?.event.on('stop', mixStop)
|
|
|
+ state.tickPlayer?.event.on('destroy', onTickDestroy)
|
|
|
} else {
|
|
|
mixStop()
|
|
|
}
|