cmd/tins2021/app.go

@@ -73,10 +73,10 @@ func (a *app) Init(ctx ui.Context) error {
 	); err != nil {
 		log.Printf("failed to load samples; %v\n", err)
 	}
-	if err := a.context.Audio.LoadSampleVolume(-.5, "menu_interaction.mp3"); err != nil {
+	if err := a.context.Audio.LoadSampleVolume(-1, "menu_interaction.mp3"); err != nil {
 		log.Printf("failed to load samples; %v\n", err)
 	}
-	if err := a.context.Audio.LoadSampleVolume(-1,
+	if err := a.context.Audio.LoadSampleVolume(-2,
 		"monster_jump.mp3",
 		"player_move.mp3",
 	); err != nil {

cmd/tins2021/appcontext.go

@@ -13,7 +13,6 @@ type appContext struct {
 
 	Settings *tins2021.Settings
 	Score    *tins2021.ScoreState
-	Virtual  *VirtualControls
 	Debug    bool
 
 	StarTexture          tins2021.AnimatedTexture
@@ -193,7 +192,7 @@ func (app *appContext) switchToMenuMusic(ctx ui.Context) {
 	if app.MenuMusic != nil {
 		return
 	}
-	app.MenuMusic, _ = app.Audio.PlayMusic("song_menu.mp3", func(m *Music) { m.AutoRepeat = true })
+	app.MenuMusic, _ = app.Audio.PlayMusic("song_menu.mp3", func(m *Music) {})
 	gameMusic := app.GameMusic
 	app.GameMusic = nil
 	if gameMusic != nil {

cmd/tins2021/audio.go

@@ -80,12 +80,11 @@ func (p *AudioPlayer) PlaySample(name string) error {
 	if err != nil {
 		return err
 	}
-	volume := p.SampleVolume + sample.Volume
 	speaker.Play(&effects.Volume{
 		Streamer: p.resample(sample.Stream(), sample.SampleRate),
 		Base:     2,
-		Volume:   volume,
-		Silent:   volume <= minVolume,
+		Volume:   p.SampleVolume - sample.Volume,
+		Silent:   p.SampleVolume == minVolume,
 	})
 	return nil
 }
@@ -108,7 +107,7 @@ func (p *AudioPlayer) PlayMusic(name string, init func(*Music)) (*Music, error)
 			Streamer: p.resample(closer, format.SampleRate),
 			Base:     2,
 			Volume:   p.MusicVolume,
-			Silent:   p.MusicVolume <= minVolume,
+			Silent:   p.MusicVolume == minVolume,
 		},
 	}
 	if init != nil {