audio: Add Close method

exp/audio/audio.go

@@ -37,3 +37,7 @@ func NewPlayer(src io.ReadSeeker, sampleRate int) *Player {
 func (p *Player) Play() error {
 	return p.play()
 }
+
+func (p *Player) Close() error {
+	return p.close()
+}

exp/audio/audio_js.go

@@ -26,9 +26,27 @@ import (
 var context *js.Object
 
 type player struct {
-	src        io.ReadSeeker
+	src          io.ReadSeeker
-	sampleRate int
+	sampleRate   int
-	position   float64
+	position     float64
+	bufferSource *js.Object
+}
+
+func initialize() bool {
+	// Do nothing in node.js.
+	if js.Global.Get("require") != js.Undefined {
+		return false
+	}
+
+	class := js.Global.Get("AudioContext")
+	if class == js.Undefined {
+		class = js.Global.Get("webkitAudioContext")
+	}
+	if class == js.Undefined {
+		return false
+	}
+	context = class.New()
+	return true
 }
 
 func newPlayer(src io.ReadSeeker, sampleRate int) *Player {
@@ -39,9 +57,10 @@ func newPlayer(src io.ReadSeeker, sampleRate int) *Player {
 	}
 
 	p := &player{
-		src:        src,
+		src:          src,
-		sampleRate: sampleRate,
+		sampleRate:   sampleRate,
-		position:   context.Get("currentTime").Float(),
+		position:     context.Get("currentTime").Float(),
+		bufferSource: nil,
 	}
 	return &Player{p}
 }
@@ -65,6 +84,11 @@ func (p *player) play() error {
 	if len(buf) == 0 {
 		return nil
 	}
+	// TODO: p.position should be updated
+	if p.bufferSource != nil {
+		p.bufferSource.Call("start", p.position)
+		return nil
+	}
 	const channelNum = 2
 	const bytesPerSample = channelNum * 16 / 8
 	b := context.Call("createBuffer", channelNum, len(buf)/bytesPerSample, p.sampleRate)
@@ -76,27 +100,16 @@ func (p *player) play() error {
 		l.SetIndex(i, float64(il[i])/max)
 		r.SetIndex(i, float64(ir[i])/max)
 	}
-	s := context.Call("createBufferSource")
+	p.bufferSource = context.Call("createBufferSource")
-	s.Set("buffer", b)
+	p.bufferSource.Set("buffer", b)
-	s.Call("connect", context.Get("destination"))
+	p.bufferSource.Call("connect", context.Get("destination"))
-	s.Call("start", p.position)
+	p.bufferSource.Call("start", p.position)
 	p.position += b.Get("duration").Float()
 	return nil
 }
 
-func initialize() bool {
+func (p *player) close() error {
-	// Do nothing in node.js.
+	p.bufferSource.Call("stop")
-	if js.Global.Get("require") != js.Undefined {
+	p.bufferSource.Call("disconnect")
-		return false
+	return nil
-	}
-
-	class := js.Global.Get("AudioContext")
-	if class == js.Undefined {
-		class = js.Global.Get("webkitAudioContext")
-	}
-	if class == js.Undefined {
-		return false
-	}
-	context = class.New()
-	return true
 }

exp/audio/audio_openal.go

@@ -50,4 +50,8 @@ func (p *player) play() error {
 	return p.Play()
 }
 
+func (p *player) close() error {
+	return p.Close()
+}
+
 // TODO: Implement Close method