diff --git a/internal/middleware/bgm.go b/internal/middleware/bgm.go index 57376a2..f6f1b0f 100644 --- a/internal/middleware/bgm.go +++ b/internal/middleware/bgm.go @@ -5,9 +5,10 @@ import ( "game-driver/leaf" "game-driver/pkg/audio" "game-driver/pkg/utils" + "sync" + "github.com/gopxl/beep/v2/speaker" "go.uber.org/zap" - "sync" ) // PlayBgm 播放背景音乐 @@ -44,15 +45,11 @@ func PlayBgm() leaf.HandlerFunc { return } - select { - case <-a: - { - speaker.Lock() - ctrl.Streamer = nil - speaker.Unlock() - return - } - } + <-a + + speaker.Lock() + ctrl.Streamer = nil + speaker.Unlock() }() } else { zap.S().Infoln("未解析到背景音乐") diff --git a/internal/server.go b/internal/server.go index 3dce7b4..b02e586 100644 --- a/internal/server.go +++ b/internal/server.go @@ -143,9 +143,9 @@ func Run() { middleware.DeviceLock(device), middleware.PauseWait(common.PassCtrl), middleware.EmergencyStop(common.GlobalStopper), + middleware.TimeoutOver(config.C.MaxTimeout), middleware.SoundStart(), middleware.RelayMaster(r), - middleware.TimeoutOver(config.C.MaxTimeout), middleware.TickerAction(), middleware.PlayBgm(), routes.PlayRouter(ctx, config.C.Location, config.C.Point),