mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio: Refactoring: No need to hold a buffer source

Browse Source
This commit is contained in:
Hajime Hoshi 2016-04-23 02:33:13 +09:00
parent f1c7176569
commit f7211f3391
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
audio/internal/driver/driver_js.go
View File

@ -29,7 +29,6 @@ type Player struct {
positionInSamples int64 positionInSamples int64
bufferedData []byte bufferedData []byte
context *js.Object context *js.Object
bufferSource *js.Object
} }
func NewPlayer(sampleRate, channelNum, bytesPerSample int) (*Player, error) { func NewPlayer(sampleRate, channelNum, bytesPerSample int) (*Player, error) {
@ -45,7 +44,6 @@ func NewPlayer(sampleRate, channelNum, bytesPerSample int) (*Player, error) {
channelNum: channelNum, channelNum: channelNum,
bytesPerSample: bytesPerSample, bytesPerSample: bytesPerSample,
bufferedData: []byte{}, bufferedData: []byte{},
bufferSource: nil,
context: class.New(), context: class.New(),
} }
p.positionInSamples = int64(p.context.Get("currentTime").Float() * float64(p.sampleRate)) p.positionInSamples = int64(p.context.Get("currentTime").Float() * float64(p.sampleRate))
@ -84,10 +82,10 @@ func (p *Player) Proceed(data []byte) 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 = p.context.Call("createBufferSource") s := p.context.Call("createBufferSource")
p.bufferSource.Set("buffer", buf) s.Set("buffer", buf)
p.bufferSource.Call("connect", p.context.Get("destination")) s.Call("connect", p.context.Get("destination"))
p.bufferSource.Call("start", float64(p.positionInSamples)/float64(p.sampleRate)) s.Call("start", float64(p.positionInSamples)/float64(p.sampleRate))
p.positionInSamples += int64(len(il)) p.positionInSamples += int64(len(il))
p.bufferedData = p.bufferedData[dataSize:] p.bufferedData = p.bufferedData[dataSize:]
} }
@ -95,11 +93,5 @@ func (p *Player) Proceed(data []byte) error {
} }
func (p *Player) Close() error { func (p *Player) Close() error {
if p.bufferSource == nil {
return nil
}
p.bufferSource.Call("stop")
p.bufferSource.Call("disconnect")
p.bufferSource = nil
return nil return nil
} }