注释掉beep代码

This commit is contained in:
2024-11-22 14:50:24 +08:00
parent 4df77f15d9
commit 9b9d479caf
4 changed files with 47 additions and 53 deletions

View File

@@ -4,12 +4,10 @@ import (
"game-driver/internal/middleware"
"game-driver/internal/schema"
"game-driver/leaf"
"game-driver/pkg/audio"
"game-driver/pkg/relay"
"game-driver/pkg/tts"
"game-driver/pkg/utils"
"game-driver/pkg/video"
"github.com/gopxl/beep/v2/speaker"
"go.uber.org/zap"
"sync"
"time"
@@ -98,7 +96,7 @@ func audioAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
defer cancel()
}
data, err := utils.LinkAudio(item.Data)
_, err := utils.LinkAudio(item.Data)
if err != nil {
zap.S().Errorln("音频数据获取异常: ", err)
return
@@ -111,21 +109,21 @@ func audioAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeMod
zap.S().Infoln("播放待机音乐")
defer zap.S().Infoln("结束待机音乐")
ctrl, closer, e := audio.PlayBgmMP3(data)
defer closer()
if e != nil {
zap.S().Errorln("播放待机音乐异常", e)
return
}
select {
case <-c.Done():
{
speaker.Lock()
ctrl.Streamer = nil
speaker.Unlock()
}
}
//ctrl, closer, e := audio.PlayBgmMP3(data)
//defer closer()
//if e != nil {
// zap.S().Errorln("播放待机音乐异常", e)
// return
//}
//
//select {
//case <-c.Done():
// {
// speaker.Lock()
// ctrl.Streamer = nil
// speaker.Unlock()
// }
//}
}
}
}
@@ -141,7 +139,7 @@ func ttsAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel
defer cancel()
}
reader, err := tts.DefaultTTS.Get(item.Data)
_, err := tts.DefaultTTS.Get(item.Data)
if err != nil {
zap.S().Errorln("语音合成异常: ", err)
return
@@ -155,7 +153,7 @@ func ttsAction(c *leaf.Context, item schema.WaitItemModel, root schema.TimeModel
defer zap.S().Infoln("结束待机 TTS 语音")
for {
audio.PlayWav(c, reader)
//audio.PlayWav(c, reader)
select {
case <-c.Done():
return