提交: 7bd84dc38b5304f074bea4ad7819601cfb52df0e - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• 修订版: 7bd84dc38b5304f074bea4ad7819601cfb52df0e (tree)
• 时间: 2019-01-16 23:40:16
• 作者: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

mp3にとりあえず対応

更改概述

• modified: get.sh
• modified: src/sound.go
• modified: src/system.go

差异

--- a/get.sh
+++ b/get.sh
@@ -5,3 +5,6 @@ go get -u github.com/go-gl/glfw/v3.2/glfw
 go get -u github.com/go-gl/gl/v2.1/gl
 go get -u github.com/jfreymuth/go-vorbis/ogg/vorbis
 go get -u github.com/timshannon/go-openal/openal
+go get -u github.com/faiface/beep
+go get -u github.com/hajimehoshi/oto
+go get -u github.com/hajimehoshi/go-mp3

--- a/src/sound.go
+++ b/src/sound.go
@@ -3,11 +3,18 @@ package main
 import (
 	"encoding/binary"
 	"fmt"
-	"github.com/jfreymuth/go-vorbis/ogg/vorbis"
-	"github.com/timshannon/go-openal/openal"
 	"io"
 	"math"
 	"os"
+	"path/filepath"
+	"time"
+
+	"github.com/jfreymuth/go-vorbis/ogg/vorbis"
+	"github.com/timshannon/go-openal/openal"
+
+	"github.com/faiface/beep"
+	"github.com/faiface/beep/mp3"
+	"github.com/faiface/beep/speaker"
 )
 
 const (
@@ -15,6 +22,11 @@ const (
 	audioFrequency = 48000
 )
 
+// ------------------------------------------------------------------
+// Audio Source
+
+// AudioSource structure.
+// It contains OpenAl's sound destination and buffer
 type AudioSource struct {
 	Src  openal.Source
 	bufs openal.Buffers
@@ -40,6 +52,9 @@ func (s *AudioSource) Delete() {
 	s.Src.Delete()
 }
 
+// ------------------------------------------------------------------
+// Mixer
+
 type Mixer struct {
 	buf        [audioOutLen * 2]float32
 	sendBuf    []int16
@@ -150,6 +165,9 @@ func (m *Mixer) Mix(wav []byte, fidx float64, bytesPerSample, channels int,
 	return float64(len(wav))
 }
 
+// ------------------------------------------------------------------
+// Normalizer
+
 type Normalizer struct {
 	mul  float64
 	l, r *NormalizerLR
@@ -210,6 +228,9 @@ func (n *NormalizerLR) process(bai float64, sam *float32) float64 {
 	return bai
 }
 
+// ------------------------------------------------------------------
+// Vorbis
+
 type Vorbis struct {
 	dec        *vorbis.Vorbis
 	fp         *os.File
@@ -222,9 +243,12 @@ type Vorbis struct {
 func newVorbis() *Vorbis {
 	return &Vorbis{openReq: make(chan string, 1), normalizer: NewNormalizer()}
 }
+
+// Opens a file asynchronously
 func (v *Vorbis) Open(file string) {
 	v.openReq <- file
 }
+
 func (v *Vorbis) openFile(file string) bool {
 	v.clear()
 	var err error
@@ -233,6 +257,7 @@ func (v *Vorbis) openFile(file string) bool {
 	}
 	return v.restart()
 }
+
 func (v *Vorbis) restart() bool {
 	if v.fp == nil {
 		return false
@@ -246,6 +271,7 @@ func (v *Vorbis) restart() bool {
 	v.buf = nil
 	return true
 }
+
 func (v *Vorbis) clear() {
 	if v.dec != nil {
 		v.dec = nil
@@ -255,6 +281,7 @@ func (v *Vorbis) clear() {
 		v.fp = nil
 	}
 }
+
 func (v *Vorbis) samToAudioOut(buf [][]float32) (out []int16) {
 	var o1i int
 	if len(buf) == 1 {
@@ -276,6 +303,7 @@ func (v *Vorbis) samToAudioOut(buf [][]float32) (out []int16) {
 	v.bufi -= float64(int(v.bufi))
 	return
 }
+
 func (v *Vorbis) read() []int16 {
 	select {
 	case file := <-v.openReq:
@@ -302,6 +330,67 @@ func (v *Vorbis) read() []int16 {
 	return sys.nullSndBuf[:]
 }
 
+// ------------------------------------------------------------------
+// Bgm
+
+type Bgm struct {
+	filename string
+	vorbis   *Vorbis
+	ctrlmp3  *beep.Ctrl
+}
+
+func newBgm() *Bgm {
+	return &Bgm{
+		vorbis: newVorbis(),
+	}
+}
+
+func (bgm *Bgm) IsVorbis() bool {
+	return filepath.Ext(bgm.filename) == ".ogg"
+}
+
+func (bgm *Bgm) IsMp3() bool {
+	return filepath.Ext(bgm.filename) == ".mp3"
+}
+
+func (bgm *Bgm) Open(filename string) {
+	if filepath.Base(bgm.filename) != filepath.Base(filename) {
+		bgm.filename = filename
+		speaker.Clear()
+
+		if bgm.IsVorbis() {
+			bgm.vorbis.Open(filename)
+		} else if bgm.IsMp3() {
+			bgm.ReadMp3()
+		}
+	}
+}
+
+func (bgm *Bgm) ReadMp3() {
+	f, _ := os.Open(bgm.filename)
+	s, format, err := mp3.Decode(f)
+	if err != nil {
+		return
+	}
+	streamer := beep.Loop(-1, s)
+	bgm.ctrlmp3 = &beep.Ctrl{Streamer: streamer}
+	speaker.Init(format.SampleRate, format.SampleRate.N(time.Second/20))
+	speaker.Play(bgm.ctrlmp3)
+	return
+}
+func (bgm *Bgm) Mp3Paused() {
+	speaker.Lock()
+	bgm.ctrlmp3.Paused = true
+	speaker.Unlock()
+	return
+}
+func (bgm *Bgm) ReadVorbis() []int16 {
+	return bgm.vorbis.read()
+}
+
+// ------------------------------------------------------------------
+// Wave
+
 type Wave struct {
 	SamplesPerSec  uint32
 	Channels       uint16
@@ -400,12 +489,18 @@ func ReadWave(f *os.File, ofs int64) (*Wave, error) {
 	return &w, nil
 }
 
+// ------------------------------------------------------------------
+// Snd
+
 type Snd struct {
 	table     map[[2]int32]*Wave
 	ver, ver2 uint16
 }
 
-func newSnd() *Snd { return &Snd{table: make(map[[2]int32]*Wave)} }
+func newSnd() *Snd {
+	return &Snd{table: make(map[[2]int32]*Wave)}
+}
+
 func LoadSnd(filename string) (*Snd, error) {
 	s := newSnd()
 	f, err := os.Open(filename)
@@ -478,6 +573,9 @@ func (s *Snd) play(gn [2]int32) bool {
 	return c.sound != nil
 }
 
+// ------------------------------------------------------------------
+// Sound
+
 type Sound struct {
 	sound   *Wave
 	volume  int16

--- a/src/system.go
+++ b/src/system.go
@@ -35,7 +35,7 @@ var sys = System{
 	lifeMul:    1, team1VS2Life: 1,
 	turnsRecoveryRate: 1.0 / 300,
 	mixer:             *newMixer(),
-	bgm:               *newVorbis(),
+	bgm:               *newBgm(),
 	sounds:            newSounds(16),
 	allPalFX:          *newPalFX(),
 	bgPalFX:           *newPalFX(),
@@ -87,7 +87,7 @@ type System struct {
 	debugScript             string
 	debugDraw               bool
 	mixer                   Mixer
-	bgm                     Vorbis
+	bgm                     Bgm
 	audioContext            *openal.Context
 	nullSndBuf              [audioOutLen * 2]int16
 	sounds                  Sounds
@@ -392,7 +392,15 @@ func (s *System) soundWrite() {
 		if bgmSrc.Src.BuffersProcessed() > 0 {
 			out := s.nullSndBuf[:]
 			if !s.nomusic {
-				out = s.bgm.read()
+				if s.bgm.IsVorbis() {
+					out = s.bgm.ReadVorbis()
+				} else if s.bgm.IsMp3() && s.bgm.ctrlmp3 != nil {
+					s.bgm.ctrlmp3.Paused = false
+				}
+			} else {
+				if s.bgm.IsMp3() && s.bgm.ctrlmp3 != nil {
+					s.bgm.Mp3Paused()
+				}
 			}
 			buf := bgmSrc.Src.UnqueueBuffer()
 			buf.SetDataInt16(openal.FormatStereo16, out, audioFrequency)