|
@@ -341,11 +341,14 @@ export default defineComponent({
|
|
|
// 合成节拍器资源
|
|
|
async function mergeBeatAudio(){
|
|
|
let beatMusic, beatAccompany
|
|
|
+ if(!state.isMixBeat) {
|
|
|
+ return [beatMusic, beatAccompany]
|
|
|
+ }
|
|
|
console.time("音频合成时间")
|
|
|
try{
|
|
|
const crunker = new Crunker()
|
|
|
console.time("音频加载时间")
|
|
|
- const [musicBuff, accompanyBuff, tickBuff, tockBuff] = await crunker.fetchAudio(state.music?`${state.music}?v=${Date.now()}`:null, state.accompany?`${state.accompany}?v=${Date.now()}`:null, tickMp3, tockMp3)
|
|
|
+ const [musicBuff, accompanyBuff, tickBuff, tockBuff] = await crunker.fetchAudio(state.music?`${state.music}?v=${Date.now()}`:undefined, state.accompany?`${state.accompany}?v=${Date.now()}`:undefined, tickMp3, tockMp3)
|
|
|
console.timeEnd("音频加载时间")
|
|
|
// 计算音频空白时间
|
|
|
const silenceDuration = musicBuff&&!state.isEvxml ? crunker.calculateSilenceDuration(musicBuff) : 0
|