nanahira/taiko-web
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #11 from LoveEevee/soundbuffer

Browse Source 
Fix song previews
This commit is contained in:
Bui 2018-09-11 18:27:10 +01:00 committed by GitHub
commit 7744fdac45
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/src/js/songselect.js
View File

@ -3,7 +3,7 @@ function SongSelect(){
var _songs; var _songs;
var _selectedSong = {title:'', folder:'', difficulty:''}; var _selectedSong = {title:'', folder:'', difficulty:''};
var _preview; var _preview;
var _preview_ended var _preview_id = 0
var _diffNames={ var _diffNames={
easy:"かんたん", easy:"かんたん",
normal:"ふつう", normal:"ふつう",
@ -14,7 +14,7 @@ function SongSelect(){
this.startPreview = function(id, prvtime, first_open=true) { this.startPreview = function(id, prvtime, first_open=true) {
_this.endPreview(); _this.endPreview();
var startLoad = +new Date var startLoad = +new Date
_preview_ended = false var current_id = _preview_id
if(first_open){ if(first_open){
snd.musicGain.fadeOut(0.4) snd.musicGain.fadeOut(0.4)
} }
@ -30,7 +30,7 @@ function SongSelect(){
this.previewLoaded(startLoad, prvtime, first_open) this.previewLoaded(startLoad, prvtime, first_open)
}else{ }else{
snd.previewGain.load("/songs/" + id + "/main.mp3").then(sound => { snd.previewGain.load("/songs/" + id + "/main.mp3").then(sound => {
if(!_preview_ended){ if(current_id == _preview_id){
songObj.sound = sound songObj.sound = sound
_preview = sound _preview = sound
this.previewLoaded(startLoad, prvtime, first_open) this.previewLoaded(startLoad, prvtime, first_open)
@ -48,7 +48,7 @@ function SongSelect(){
} }
this.endPreview = function() { this.endPreview = function() {
_preview_ended = true _preview_id++
if (_preview) { if (_preview) {
_preview.stop(); _preview.stop();
}; };

4
public/src/js/soundbuffer.js
View File

@ -124,7 +124,9 @@ class Sound{
playLoop(time, absolute, seek1, seek2, until){ playLoop(time, absolute, seek1, seek2, until){
time = this.convertTime(time, absolute) time = this.convertTime(time, absolute)
seek1 = seek1 || 0 seek1 = seek1 || 0
seek2 = seek2 || 0 if(typeof seek2 == "undefined"){
seek2 = seek1
}
until = until || this.duration until = until || this.duration
this.loop = { this.loop = {
started: time + until - seek1, started: time + until - seek1,