mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-12-25 19:28:57 +01:00
examples/audio: Use Ogg again
This commit is contained in:
parent
3d24ffe3e0
commit
3d1d5d4355
@ -28,7 +28,7 @@ import (
|
|||||||
|
|
||||||
"github.com/hajimehoshi/ebiten"
|
"github.com/hajimehoshi/ebiten"
|
||||||
"github.com/hajimehoshi/ebiten/audio"
|
"github.com/hajimehoshi/ebiten/audio"
|
||||||
"github.com/hajimehoshi/ebiten/audio/mp3"
|
"github.com/hajimehoshi/ebiten/audio/vorbis"
|
||||||
"github.com/hajimehoshi/ebiten/audio/wav"
|
"github.com/hajimehoshi/ebiten/audio/wav"
|
||||||
"github.com/hajimehoshi/ebiten/ebitenutil"
|
"github.com/hajimehoshi/ebiten/ebitenutil"
|
||||||
raudio "github.com/hajimehoshi/ebiten/examples/resources/audio"
|
raudio "github.com/hajimehoshi/ebiten/examples/resources/audio"
|
||||||
@ -39,7 +39,7 @@ const (
|
|||||||
screenWidth = 320
|
screenWidth = 320
|
||||||
screenHeight = 240
|
screenHeight = 240
|
||||||
|
|
||||||
// This sample rate doesn't match with wav/mp3's sample rate,
|
// This sample rate doesn't match with wav/vorbis's sample rate,
|
||||||
// but decoders adjust them.
|
// but decoders adjust them.
|
||||||
sampleRate = 48000
|
sampleRate = 48000
|
||||||
)
|
)
|
||||||
@ -69,7 +69,7 @@ func playerBarRect() (x, y, w, h int) {
|
|||||||
|
|
||||||
func NewPlayer(audioContext *audio.Context) (*Player, error) {
|
func NewPlayer(audioContext *audio.Context) (*Player, error) {
|
||||||
const bytesPerSample = 4 // TODO: This should be defined in audio package
|
const bytesPerSample = 4 // TODO: This should be defined in audio package
|
||||||
s, err := mp3.Decode(audioContext, audio.BytesReadSeekCloser(raudio.Classic_mp3))
|
s, err := vorbis.Decode(audioContext, audio.BytesReadSeekCloser(raudio.Ragtime_ogg))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user