mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-24 18:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio: byte -> uint8

Browse Source
This commit is contained in:
Hajime Hoshi 2017-06-04 16:05:22 +09:00
parent ffc6be0c10
commit 10bd1c1786
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
audio/audio.go
View File

@ -59,7 +59,7 @@ func min(a, b int) int {
return b return b
} }
func (p *players) Read(b []byte) (int, error) { func (p *players) Read(b []uint8) (int, error) {
p.Lock() p.Lock()
defer p.Unlock() defer p.Unlock()
@ -73,7 +73,7 @@ func (p *players) Read(b []byte) (int, error) {
if len(players) == 0 { if len(players) == 0 {
l := len(b) l := len(b)
l &= mask l &= mask
copy(b, make([]byte, l)) copy(b, make([]uint8, l))
return l, nil return l, nil
} }
closed := []*Player{} closed := []*Player{}
@ -248,7 +248,7 @@ func (c *Context) Update() error {
l := (c.frames * int64(bytesPerFrame)) - c.writtenBytes l := (c.frames * int64(bytesPerFrame)) - c.writtenBytes
l &= mask l &= mask
c.writtenBytes += l c.writtenBytes += l
buf := make([]byte, l) buf := make([]uint8, l)
n, err := io.ReadFull(c.players, buf) n, err := io.ReadFull(c.players, buf)
if err != nil { if err != nil {
return err return err
@ -307,7 +307,7 @@ type Player struct {
src ReadSeekCloser src ReadSeekCloser
sampleRate int sampleRate int
buf []byte buf []uint8
pos int64 pos int64
volume float64 volume float64
@ -333,7 +333,7 @@ func NewPlayer(context *Context, src ReadSeekCloser) (*Player, error) {
players: context.players, players: context.players,
src: src, src: src,
sampleRate: context.sampleRate, sampleRate: context.sampleRate,
buf: []byte{}, buf: []uint8{},
volume: 1, volume: 1,
} }
// Get the current position of the source. // Get the current position of the source.
@ -354,7 +354,7 @@ func NewPlayer(context *Context, src ReadSeekCloser) (*Player, error) {
// The format of src should be same as noted at NewPlayer. // The format of src should be same as noted at NewPlayer.
// //
// NewPlayerFromBytes's error is always nil as of 1.5.0-alpha. // NewPlayerFromBytes's error is always nil as of 1.5.0-alpha.
func NewPlayerFromBytes(context *Context, src []byte) (*Player, error) { func NewPlayerFromBytes(context *Context, src []uint8) (*Player, error) {
b := BytesReadSeekCloser(src) b := BytesReadSeekCloser(src)
p, err := NewPlayer(context, b) p, err := NewPlayer(context, b)
if err != nil { if err != nil {
@ -381,7 +381,7 @@ func (p *Player) Close() error {
} }
func (p *Player) readToBuffer(length int) error { func (p *Player) readToBuffer(length int) error {
bb := make([]byte, length) bb := make([]uint8, length)
p.srcM.Lock() p.srcM.Lock()
n, err := p.src.Read(bb) n, err := p.src.Read(bb)
p.srcM.Unlock() p.srcM.Unlock()
@ -462,7 +462,7 @@ func (p *Player) Seek(offset time.Duration) error {
return err return err
} }
p.m.Lock() p.m.Lock()
p.buf = []byte{} p.buf = []uint8{}
p.pos = pos p.pos = pos
p.m.Unlock() p.m.Unlock()
return nil return nil