mirror of
https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git
synced 2024-11-15 07:21:50 +08:00
Allow preview to start when there is an error converting
This commit is contained in:
parent
c2ea4514ca
commit
0b757c0983
@ -1267,26 +1267,35 @@ class SongSelect{
|
|||||||
if(!loadOnly){
|
if(!loadOnly){
|
||||||
this.preview = songObj.preview_sound
|
this.preview = songObj.preview_sound
|
||||||
this.preview.gain = snd.previewGain
|
this.preview.gain = snd.previewGain
|
||||||
this.previewLoaded(startLoad, prvTime)
|
this.previewLoaded(startLoad, songObj.preview_time)
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
var previewFilename = prvTime > 0.1 ? "/preview.mp3" : "/main.mp3"
|
var previewFilename = prvTime > 0.1 ? "/preview.mp3" : "/main.mp3"
|
||||||
snd.previewGain.load("/songs/" + id + previewFilename).then(sound => {
|
|
||||||
|
var loadPreview = previewFilename => {
|
||||||
|
return snd.previewGain.load("/songs/" + id + previewFilename)
|
||||||
|
}
|
||||||
|
|
||||||
|
songObj.preview_time = 0
|
||||||
|
loadPreview(previewFilename).catch(() => {
|
||||||
|
songObj.preview_time = prvTime
|
||||||
|
return loadPreview("/main.mp3")
|
||||||
|
}).then(sound => {
|
||||||
if(currentId === this.previewId){
|
if(currentId === this.previewId){
|
||||||
songObj.preview_sound = sound
|
songObj.preview_sound = sound
|
||||||
this.preview = sound
|
this.preview = sound
|
||||||
this.previewLoaded(startLoad, prvTime)
|
this.previewLoaded(startLoad, songObj.preview_time)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
previewLoaded(startLoad, prvtime){
|
previewLoaded(startLoad, prvTime){
|
||||||
var endLoad = this.getMS()
|
var endLoad = this.getMS()
|
||||||
var difference = endLoad - startLoad
|
var difference = endLoad - startLoad
|
||||||
var minDelay = 300
|
var minDelay = 300
|
||||||
var delay = minDelay - Math.min(minDelay, difference)
|
var delay = minDelay - Math.min(minDelay, difference)
|
||||||
this.preview.playLoop(delay / 1000, false, 0)
|
this.preview.playLoop(delay / 1000, false, prvTime / 1000)
|
||||||
}
|
}
|
||||||
endPreview(){
|
endPreview(){
|
||||||
this.previewId++
|
this.previewId++
|
||||||
|
Loading…
Reference in New Issue
Block a user