remove audio.System.GetSfx and GetMusic

All sound effects and music patterns are available in global variables: audio.Sfx and audio.Pat

Author: elgopher

audio/audio.go

@@ -254,16 +254,10 @@ type System interface {
 	// SoundEffect parameters are clamped when out of range.
 	// For example, sfx note volume equal 8 will be silently clamped to 7.
 	SetSfx(sfxNo int, e SoundEffect)
-	// GetSfx returns sfx with given number. sfxNo is 0-63. Trying to get
-	// sfx number higher than 63 will result in returning empty SoundEffect (zero-value).
-	GetSfx(sfxNo int) SoundEffect
 	// SetMusic updates the music pattern. patternNo is 0-63. Updating pattern number which
 	// is higher than 63 does not do anything.
 	//
 	// Pattern parameters are clamped when out of range.
 	// For example, pattern sfx number equal 64 will be silently clamped to 63.
 	SetMusic(patternNo int, _ Pattern)
-	// GetMusic returns music pattern with given number. patterNo is 0-63. Trying to get
-	// pattern number higher than 63 will result in returning empty Pattern (zero-value).
-	GetMusic(patterNo int) Pattern
 }

ebitengine/audio.go

@@ -216,23 +216,9 @@ func (e *ebitenPlayerSource) SetSfx(sfxNo int, effect audio.SoundEffect) {
 	e.audioSystem.SetSfx(sfxNo, effect)
 }
 
-func (e *ebitenPlayerSource) GetSfx(sfxNo int) audio.SoundEffect {
-	e.mutex.Lock()
-	defer e.mutex.Unlock()
-
-	return e.audioSystem.GetSfx(sfxNo)
-}
-
 func (e *ebitenPlayerSource) SetMusic(patterNo int, pattern audio.Pattern) {
 	e.mutex.Lock()
 	defer e.mutex.Unlock()
 
 	e.audioSystem.SetMusic(patterNo, pattern)
 }
-
-func (e *ebitenPlayerSource) GetMusic(patterNo int) audio.Pattern {
-	e.mutex.Lock()
-	defer e.mutex.Unlock()
-
-	return e.audioSystem.GetMusic(patterNo)
-}

ebitengine/audio_test.go

@@ -174,9 +174,7 @@ func TestEbitenPlayerSource_ThreadSafety(t *testing.T) {
 				reader.Music(0, 0, 0)
 				reader.Stat()
 				reader.SetSfx(0, audio.SoundEffect{})
-				reader.GetSfx(0)
 				reader.SetMusic(0, audio.Pattern{})
-				reader.GetMusic(0)
 			}()
 		}