load audio from resources

Author: elgopher

audio/audio.go

@@ -63,16 +63,28 @@ func GetStat() Stat {
 	return system.Stat()
 }
 
-// SaveAudio stores audio system state to byte slice. State is stored in binary form.
+// Save stores audio system state to byte slice. State is stored in binary form.
 // The format is described in Synthesizer.Save source code.
-func SaveAudio() ([]byte, error) {
+func Save() ([]byte, error) {
 	return system.Save()
 }
 
-// LoadAudio restores audio system state from byte slice. State is restored from binary form.
+// Load restores audio system state from byte slice. State is restored from binary form.
 // The format is described in Synthesizer.Save source code.
-func LoadAudio(b []byte) error {
-	return system.Load(b)
+func Load(b []byte) error {
+	if err := system.Load(b); err != nil {
+		return err
+	}
+
+	for sfxNo := range Sfx {
+		Sfx[sfxNo] = system.GetSfx(sfxNo)
+	}
+
+	for patternNo := range Pat {
+		Pat[patternNo] = system.GetMusic(patternNo)
+	}
+
+	return nil
 }
 
 var system System = &Synthesizer{}
@@ -246,10 +258,6 @@ type PatternSfx struct {
 	Enabled bool // Not implemented yet.
 }
 
-func byteToBool(b byte) bool {
-	return b == 1
-}
-
 // SetSystem is executed by the back-end to replace audio system with his own implementation.
 func SetSystem(s System) {
 	system = s

audio/internal.go

@@ -50,3 +50,27 @@ func singleNoteSamples(speed byte) int {
 
 	return int(speed) * 183
 }
+
+func minInt[T ~int | ~uint8](x, y T) T {
+	if x < y {
+		return x
+	}
+
+	return y
+}
+
+func midInt[T ~int](x, y, z T) T {
+	if x > y {
+		x, y = y, x
+	}
+
+	if y > z {
+		y = z
+	}
+
+	if x > y {
+		y = x
+	}
+
+	return y
+}

audio/live.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/elgopher/pi"
 	"github.com/elgopher/pi/audio/internal"
 )
 
@@ -36,7 +35,7 @@ func (l *LiveReader) ReadSamples(buf []float64) int {
 	maxRealSample := int(now.Sub(l.started) / sampleDuration)
 	maxCallerSample := l.lastSample + len(buf)
 
-	maxSample := pi.MinInt(maxRealSample, maxCallerSample)
+	maxSample := minInt(maxRealSample, maxCallerSample)
 	samplesToRead := maxSample - l.lastSample
 
 	samplesToDrop := maxRealSample - maxCallerSample - int(l.BufferSize/sampleDuration) + 1
@@ -60,7 +59,7 @@ func (l *LiveReader) dropSamples(samplesToDrop int) {
 	}
 
 	for samplesToDrop > 0 {
-		n := pi.MinInt(samplesToDrop, len(l.reusedBuffer))
+		n := minInt(samplesToDrop, len(l.reusedBuffer))
 		l.ReadSamplesFunc(l.reusedBuffer[:n])
 		samplesToDrop -= n
 	}

audio/synth.go

@@ -7,7 +7,6 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/elgopher/pi"
 	"github.com/elgopher/pi/audio/internal"
 )
 
@@ -108,7 +107,7 @@ func (s *Synthesizer) Play(sfxNo, ch, offset, length int) {
 		ch = s.findAvailableChannel()
 	}
 
-	offset = pi.MidInt(offset, 0, 31)
+	offset = midInt(offset, 0, 31)
 
 	s.channels[ch].playing = true
 
@@ -209,24 +208,24 @@ func (s *Synthesizer) SetSfx(sfxNo int, effect SoundEffect) {
 		s.sfx = map[byte]SoundEffect{}
 	}
 
-	effect.LoopStart = pi.MinInt(63, effect.LoopStart)
-	effect.LoopStop = pi.MinInt(63, effect.LoopStop)
-	effect.Detune = pi.MinInt(2, effect.Detune)
-	effect.Reverb = pi.MinInt(2, effect.Reverb)
-	effect.Dampen = pi.MinInt(2, effect.Dampen)
+	effect.LoopStart = minInt(63, effect.LoopStart)
+	effect.LoopStop = minInt(63, effect.LoopStop)
+	effect.Detune = minInt(2, effect.Detune)
+	effect.Reverb = minInt(2, effect.Reverb)
+	effect.Dampen = minInt(2, effect.Dampen)
 
 	for i := 0; i < len(effect.Notes); i++ {
 		volume := effect.Notes[i].Volume
-		effect.Notes[i].Volume = pi.MinInt(7, volume)
+		effect.Notes[i].Volume = minInt(7, volume)
 
 		pitch := effect.Notes[i].Pitch
-		effect.Notes[i].Pitch = pi.MinInt(63, pitch)
+		effect.Notes[i].Pitch = minInt(63, pitch)
 
 		instrument := effect.Notes[i].Instrument
-		effect.Notes[i].Instrument = pi.MinInt(15, instrument)
+		effect.Notes[i].Instrument = minInt(15, instrument)
 
 		eff := effect.Notes[i].Effect
-		effect.Notes[i].Effect = pi.MinInt(7, eff)
+		effect.Notes[i].Effect = minInt(7, eff)
 	}
 
 	s.sfx[byte(sfxNo)] = effect
@@ -253,7 +252,7 @@ func (s *Synthesizer) SetMusic(patternNo int, pattern Pattern) {
 
 	for i := 0; i < len(pattern.Sfx); i++ {
 		sfxNo := pattern.Sfx[i].SfxNo
-		pattern.Sfx[i].SfxNo = pi.MinInt(maxSfxNo, sfxNo)
+		pattern.Sfx[i].SfxNo = minInt(maxSfxNo, sfxNo)
 	}
 
 	s.pattern[byte(patternNo)] = pattern
@@ -347,6 +346,10 @@ func (s *Synthesizer) Load(state []byte) error {
 	return nil
 }
 
+func byteToBool(b byte) bool {
+	return b == 1
+}
+
 func (s *Synthesizer) Save() ([]byte, error) {
 	buffer := bytes.NewBuffer(nil)
 

devtools/internal/lib/github_com-elgopher-pi-audio.go

@@ -48,7 +48,7 @@ func startAudio() (stop func(), ready <-chan struct{}, _ error) {
 		// (again via MessageChannel) instead of directly calling synthesizer. Audio Worklet processor will use
 		// pi.Synthesizer. Based on incoming events it will update the pi.Synthesizer.
 
-		state, err := audio.SaveAudio()
+		state, err := audio.Save()
 		if err != nil {
 			return stop, nil, fmt.Errorf("problem saving audio state: %w", err)
 		}

ebitengine/audio.go

@@ -35,8 +35,11 @@ package pi
 
 import (
 	_ "embed"
+	"errors"
+	"fmt"
 	"io/fs"
 
+	"github.com/elgopher/pi/audio"
 	"github.com/elgopher/pi/font"
 )
 
@@ -65,7 +68,7 @@ var Time float64
 
 var GameLoopStopped bool
 
-// Load loads files: sprite-sheet.png and custom-font.png from resources parameter.
+// Load loads files: sprite-sheet.png, custom-font.png and audio.sfx from resources parameter.
 //
 // Load looks for images with hard-coded names, eg for sprite-sheet it loads "sprite-sheet.png".
 // Your file name must be exactly the same. And it cannot be inside subdirectory.
@@ -124,6 +127,23 @@ func loadGameResources(resources fs.ReadFileFS) error {
 		return err
 	}
 
+	if err := loadAudio(resources); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func loadAudio(resources fs.ReadFileFS) error {
+	fileContents, err := resources.ReadFile("audio.sfx")
+	if errors.Is(err, fs.ErrNotExist) {
+		return nil
+	}
+
+	if err = audio.Load(fileContents); err != nil {
+		return fmt.Errorf("error loading audio.sfx: %w", err)
+	}
+
 	return nil
 }