Merge pull request #1 from LoveEevee/master

Fix pausing in bufferedloop

src/js/bufferedloop.js

@@ -5,8 +5,8 @@ class BufferedLoop{
 		this.context=new AudioContext()
 		this.buffers=[]
 		this.sources=new Set()
+		this.loadCallback=[]
 		this.bufferedTime=0
-		this.iteration=0
 		this.bgm1=bgm1
 		this.bgm2=bgm2
 		this.loadSound(bgm1.url,0)
@@ -28,12 +28,14 @@ class BufferedLoop{
 	setLoaded(){
 		if(this.buffers[0]&&this.buffers[1]){
 			this.loaded=true
-			if(this.loadCallback){
+			for(var i in this.loadCallback){
-				this.loadCallback()
+				this.loadCallback[i]()
-				delete this.loadCallback
 			}
 		}
 	}
+	onLoad(callback){
+		this.loadCallback.push(callback)
+	}
 	playSound(buffer,time,duration){
 		var self=this
 		var source=this.context.createBufferSource()
@@ -41,10 +43,13 @@ class BufferedLoop{
 		source.connect(this.context.destination)
 		source.start(time)
 		this.bufferedTime=time+duration
-		this.sources.add(source)
+		var sourceObject={
-		setTimeout(function(){
+			source:source,
-			self.sources.delete(source)
+			timeout:setTimeout(function(){
-		},duration*1000)
+				self.sources.delete(sourceObject)
+			},duration*1000)
+		}
+		this.sources.add(sourceObject)
 	}
 	addLoop(){
 		if(this.context.currentTime>this.bufferedTime-1){
@@ -59,10 +64,12 @@ class BufferedLoop{
 	play(){
 		var self=this
 		if(!this.loaded){
-			this.loadCallback=this.play
+			return this.onLoad(function(){
-			return
+				self.play()
+			})
 		}
 		this.start=this.context.currentTime+0.1
+		this.iteration=0
 		this.playSound(
 			this.buffers[0],
 			this.start,
@@ -75,8 +82,9 @@ class BufferedLoop{
 	}
 	pause(){
 		clearInterval(this.interval)
-		this.sources.forEach(function(source){
+		this.sources.forEach(function(sourceObject){
-			source.stop(0)
+			sourceObject.source.stop(0)
+			clearTimeout(sourceObject.timeout)
 		})
 	}
 }