mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-20 05:12:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

audio: Add readerDriverPlayer.UnwrittenBufferSize to get the exact position

Browse Source
This commit is contained in:
Hajime Hoshi 2021-02-28 01:42:48 +09:00
parent cb3fc3c51c
commit dbdfce5fed
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/internal/go2cpp/player_js.go
View File

@ -175,6 +175,10 @@ func (p *Player) SetVolume(volume float64) {
p.volume = volume
}
func (p *Player) UnwrittenBufferSize() int64 {
return int64(p.v.Get("unwrittenBufferSize").Int())
}
func (p *Player) Close() error {
runtime.SetFinalizer(p, nil)
return p.close(true)

16
audio/readerplayer.go
View File

@ -33,6 +33,7 @@ type readerDriverPlayer interface {
Reset()
Volume() float64
SetVolume(volume float64)
UnwrittenBufferSize() int64
io.Closer
}
@ -51,11 +52,13 @@ type readerPlayer struct {
context *Context
player readerDriverPlayer
src *timeStream
sampleRate int
m sync.Mutex
}
func (c *readerPlayerFactory) newPlayerImpl(context *Context, src io.Reader) (playerImpl, error) {
s, err := newTimeStream(src, context.SampleRate())
sampleRate := context.SampleRate()
s, err := newTimeStream(src, sampleRate)
if err != nil {
return nil, err
}
@ -64,6 +67,7 @@ func (c *readerPlayerFactory) newPlayerImpl(context *Context, src io.Reader) (pl
context: context,
player: c.driver.NewPlayer(s),
src: s,
sampleRate: sampleRate,
}
return p, nil
}
@ -116,9 +120,8 @@ func (p *readerPlayer) Current() time.Duration {
p.m.Lock()
defer p.m.Unlock()
// TODO: Add a new function to readerDriverPlayer and use it.
// src's position doesn't reflect the exact playing position.
return p.src.Current()
sample := (p.src.Current() - p.player.UnwrittenBufferSize()) / bytesPerSample
return time.Duration(sample) * time.Second / time.Duration(p.sampleRate)
}
func (p *readerPlayer) Rewind() error {
@ -190,7 +193,6 @@ func (s *timeStream) Seek(offset time.Duration) error {
return nil
}
func (s *timeStream) Current() time.Duration {
sample := s.pos / bytesPerSample
return time.Duration(sample) * time.Second / time.Duration(s.sampleRate)
func (s *timeStream) Current() int64 {
return s.pos
}