mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-12-26 03:38:55 +01:00
audio: context is in a member of player
This commit is contained in:
parent
fb5a366b97
commit
976d61816c
@ -23,12 +23,11 @@ import (
|
|||||||
"github.com/gopherjs/gopherjs/js"
|
"github.com/gopherjs/gopherjs/js"
|
||||||
)
|
)
|
||||||
|
|
||||||
var context *js.Object
|
|
||||||
|
|
||||||
type player struct {
|
type player struct {
|
||||||
src io.Reader
|
src io.Reader
|
||||||
sampleRate int
|
sampleRate int
|
||||||
position float64
|
position float64
|
||||||
|
context *js.Object
|
||||||
bufferSource *js.Object
|
bufferSource *js.Object
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -40,7 +39,7 @@ func startPlaying(src io.Reader, sampleRate int) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if currentPlayer != nil || context != nil {
|
if currentPlayer != nil {
|
||||||
panic("audio: currentPlayer already exists")
|
panic("audio: currentPlayer already exists")
|
||||||
}
|
}
|
||||||
class := js.Global.Get("AudioContext")
|
class := js.Global.Get("AudioContext")
|
||||||
@ -50,14 +49,13 @@ func startPlaying(src io.Reader, sampleRate int) error {
|
|||||||
if class == js.Undefined {
|
if class == js.Undefined {
|
||||||
panic("audio: audio couldn't be initialized")
|
panic("audio: audio couldn't be initialized")
|
||||||
}
|
}
|
||||||
context = class.New()
|
|
||||||
|
|
||||||
currentPlayer = &player{
|
currentPlayer = &player{
|
||||||
src: src,
|
src: src,
|
||||||
sampleRate: sampleRate,
|
sampleRate: sampleRate,
|
||||||
position: context.Get("currentTime").Float(),
|
|
||||||
bufferSource: nil,
|
bufferSource: nil,
|
||||||
|
context: class.New(),
|
||||||
}
|
}
|
||||||
|
currentPlayer.position = currentPlayer.context.Get("currentTime").Float()
|
||||||
if err := currentPlayer.start(); err != nil {
|
if err := currentPlayer.start(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -80,7 +78,7 @@ func (p *player) proceed() error {
|
|||||||
if 0 < n {
|
if 0 < n {
|
||||||
const channelNum = 2
|
const channelNum = 2
|
||||||
const bytesPerSample = channelNum * 16 / 8
|
const bytesPerSample = channelNum * 16 / 8
|
||||||
b := context.Call("createBuffer", channelNum, n/bytesPerSample, p.sampleRate)
|
b := p.context.Call("createBuffer", channelNum, n/bytesPerSample, p.sampleRate)
|
||||||
l := b.Call("getChannelData", 0)
|
l := b.Call("getChannelData", 0)
|
||||||
r := b.Call("getChannelData", 1)
|
r := b.Call("getChannelData", 1)
|
||||||
il, ir := toLR(buf[:n])
|
il, ir := toLR(buf[:n])
|
||||||
@ -89,9 +87,9 @@ func (p *player) proceed() error {
|
|||||||
l.SetIndex(i, float64(il[i])/max)
|
l.SetIndex(i, float64(il[i])/max)
|
||||||
r.SetIndex(i, float64(ir[i])/max)
|
r.SetIndex(i, float64(ir[i])/max)
|
||||||
}
|
}
|
||||||
p.bufferSource = context.Call("createBufferSource")
|
p.bufferSource = p.context.Call("createBufferSource")
|
||||||
p.bufferSource.Set("buffer", b)
|
p.bufferSource.Set("buffer", b)
|
||||||
p.bufferSource.Call("connect", context.Get("destination"))
|
p.bufferSource.Call("connect", p.context.Get("destination"))
|
||||||
p.bufferSource.Call("start", p.position)
|
p.bufferSource.Call("start", p.position)
|
||||||
p.position += b.Get("duration").Float()
|
p.position += b.Get("duration").Float()
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user