From 319cc70b1f727fc292447e6e47175fde408d8966 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sat, 14 Jan 2023 10:17:44 +0100
Subject: [PATCH] Pausing the game will also pause the music

---
 src/sound.go  |  5 ++---
 src/system.go | 13 +------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/sound.go b/src/sound.go
index 62ee245b8..d78dbd8ab 100644
--- a/src/sound.go
+++ b/src/sound.go
@@ -215,13 +215,12 @@ func (bgm *Bgm) Open(filename string, loop, bgmVolume, bgmLoopStart, bgmLoopEnd,
 	speaker.Play(bgm.ctrl)
 }
 
-func (bgm *Bgm) Pause() {
-	// FIXME: there is no method to unpause!
+func (bgm *Bgm) SetPaused(paused bool) {
 	if bgm.ctrl == nil {
 		return
 	}
 	speaker.Lock()
-	bgm.ctrl.Paused = true
+	bgm.ctrl.Paused = paused
 	speaker.Unlock()
 }
 
diff --git a/src/system.go b/src/system.go
index 1ccf6c758..3d88ad527 100644
--- a/src/system.go
+++ b/src/system.go
@@ -555,18 +555,7 @@ func (s *System) tickSound() {
 		}
 	}
 
-	if !s.nomusic {
-		speaker.Lock()
-		if s.bgm.ctrl != nil && s.bgm.streamer != nil {
-			s.bgm.ctrl.Paused = false
-			// if s.bgm.bgmLoopEnd > 0 && s.bgm.streamer.Position() >= s.bgm.bgmLoopEnd {
-			// s.bgm.streamer.Seek(s.bgm.bgmLoopStart)
-			// }
-		}
-		speaker.Unlock()
-	} else {
-		s.bgm.Pause()
-	}
+	s.bgm.SetPaused(s.nomusic || s.paused)
 
 	//if s.FLAC_FrameWait >= 0 {
 	//	if s.FLAC_FrameWait == 0 {