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

audio: Fix error messages

Browse Source
This commit is contained in:
Hajime Hoshi 2016-04-09 01:10:42 +09:00
parent 2ba5105ba9
commit 38ee66070e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exp/audio/internal/driver/driver_js.go
View File

@ -39,7 +39,7 @@ func NewPlayer(src io.Reader, sampleRate, channelNum, bytesPerSample int) (*Play
class = js.Global.Get("webkitAudioContext") class = js.Global.Get("webkitAudioContext")
} }
if class == js.Undefined { if class == js.Undefined {
return nil, errors.New("audio: audio couldn't be initialized") return nil, errors.New("driver: audio couldn't be initialized")
} }
p := &Player{ p := &Player{
src: src, src: src,

10
exp/audio/internal/driver/driver_windows.go
View File

@ -50,18 +50,18 @@ func newHeader(waveOut C.HWAVEOUT, bufferSize int) (*header, error) {
} }
// TODO: Need to unprepare to avoid memory leak? // TODO: Need to unprepare to avoid memory leak?
if err := C.waveOutPrepareHeader(waveOut, &h.waveHdr, C.sizeOfWavehdr); err != C.MMSYSERR_NOERROR { if err := C.waveOutPrepareHeader(waveOut, &h.waveHdr, C.sizeOfWavehdr); err != C.MMSYSERR_NOERROR {
return nil, fmt.Errorf("audio: waveOutPrepareHeader error: %d", err) return nil, fmt.Errorf("driver: waveOutPrepareHeader error: %d", err)
} }
return h, nil return h, nil
} }
func (h *header) Write(waveOut C.HWAVEOUT, data []byte) error { func (h *header) Write(waveOut C.HWAVEOUT, data []byte) error {
if len(data) != h.bufferSize { if len(data) != h.bufferSize {
return errors.New("audio: len(data) must equal to h.bufferSize") return errors.New("driver: len(data) must equal to h.bufferSize")
} }
C.memcpy(h.buffer, unsafe.Pointer(&data[0]), C.size_t(h.bufferSize)) C.memcpy(h.buffer, unsafe.Pointer(&data[0]), C.size_t(h.bufferSize))
if err := C.waveOutWrite(waveOut, &h.waveHdr, C.sizeOfWavehdr); err != C.MMSYSERR_NOERROR { if err := C.waveOutWrite(waveOut, &h.waveHdr, C.sizeOfWavehdr); err != C.MMSYSERR_NOERROR {
return fmt.Errorf("audio: waveOutWriter error: %d", err) return fmt.Errorf("driver: waveOutWriter error: %d", err)
} }
return nil return nil
} }
@ -96,7 +96,7 @@ func NewPlayer(src io.Reader, sampleRate, channelNum, bytesPerSample int) (*Play
} }
var w C.HWAVEOUT var w C.HWAVEOUT
if err := C.waveOutOpen2(&w, &f); err != C.MMSYSERR_NOERROR { if err := C.waveOutOpen2(&w, &f); err != C.MMSYSERR_NOERROR {
return nil, fmt.Errorf("audio: waveOutOpen error: %d", err) return nil, fmt.Errorf("driver: waveOutOpen error: %d", err)
} }
p := &Player{ p := &Player{
src: src, src: src,
@ -136,7 +136,7 @@ func (p *Player) Proceed() error {
} }
} }
if headerToWrite == nil { if headerToWrite == nil {
return errors.New("audio: no available buffers") return errors.New("driver: no available buffers")
} }
if err := headerToWrite.Write(p.out, p.buffer[:bufferSize]); err != nil { if err := headerToWrite.Write(p.out, p.buffer[:bufferSize]); err != nil {
return err return err