mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-11-12 22:17:26 +01:00
parent
a9653d1e7a
commit
6b1502ee71
@ -204,7 +204,9 @@ func (p *Player) update() error {
|
|||||||
if p.audioPlayer.IsPlaying() {
|
if p.audioPlayer.IsPlaying() {
|
||||||
p.current = p.audioPlayer.Current()
|
p.current = p.audioPlayer.Current()
|
||||||
}
|
}
|
||||||
p.seekBarIfNeeded()
|
if err := p.seekBarIfNeeded(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
p.switchPlayStateIfNeeded()
|
p.switchPlayStateIfNeeded()
|
||||||
p.playSEIfNeeded()
|
p.playSEIfNeeded()
|
||||||
p.updateVolumeIfNeeded()
|
p.updateVolumeIfNeeded()
|
||||||
@ -312,23 +314,26 @@ func (p *Player) justPressedPosition() (int, int, bool) {
|
|||||||
return 0, 0, false
|
return 0, 0, false
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Player) seekBarIfNeeded() {
|
func (p *Player) seekBarIfNeeded() error {
|
||||||
// Calculate the next seeking position from the current cursor position.
|
// Calculate the next seeking position from the current cursor position.
|
||||||
x, y, ok := p.justPressedPosition()
|
x, y, ok := p.justPressedPosition()
|
||||||
if !ok {
|
if !ok {
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
bx, by, bw, bh := playerBarRect()
|
bx, by, bw, bh := playerBarRect()
|
||||||
const padding = 4
|
const padding = 4
|
||||||
if y < by-padding || by+bh+padding <= y {
|
if y < by-padding || by+bh+padding <= y {
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
if x < bx || bx+bw <= x {
|
if x < bx || bx+bw <= x {
|
||||||
return
|
return nil
|
||||||
}
|
}
|
||||||
pos := time.Duration(x-bx) * p.total / time.Duration(bw)
|
pos := time.Duration(x-bx) * p.total / time.Duration(bw)
|
||||||
p.current = pos
|
p.current = pos
|
||||||
p.audioPlayer.Seek(pos)
|
if err := p.audioPlayer.Seek(pos); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Player) draw(screen *ebiten.Image) {
|
func (p *Player) draw(screen *ebiten.Image) {
|
||||||
@ -420,7 +425,9 @@ func (g *Game) Update() error {
|
|||||||
panic("not reached")
|
panic("not reached")
|
||||||
}
|
}
|
||||||
|
|
||||||
g.musicPlayer.Close()
|
if err := g.musicPlayer.Close(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
g.musicPlayer = nil
|
g.musicPlayer = nil
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
|
Loading…
Reference in New Issue
Block a user