注释掉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

@@ -3,9 +3,7 @@ package middleware
import ( import (
"game-driver/internal/schema" "game-driver/internal/schema"
"game-driver/leaf" "game-driver/leaf"
"game-driver/pkg/audio"
"game-driver/pkg/utils" "game-driver/pkg/utils"
"github.com/gopxl/beep/v2/speaker"
"go.uber.org/zap" "go.uber.org/zap"
"sync" "sync"
) )
@@ -30,30 +28,30 @@ func PlayBgm() leaf.HandlerFunc {
// 发送结束信号 // 发送结束信号
defer close(a) defer close(a)
wait.Add(1) //wait.Add(1)
go func() { //go func() {
defer wait.Done() // defer wait.Done()
//
zap.S().Infoln("开始播放背景音乐") // zap.S().Infoln("开始播放背景音乐")
defer zap.S().Infoln("结束背景音乐播放") // defer zap.S().Infoln("结束背景音乐播放")
//
ctrl, closer, e := audio.PlayBgmMP3(bgm) // ctrl, closer, e := audio.PlayBgmMP3(bgm)
defer closer() // defer closer()
if e != nil { // if e != nil {
zap.S().Errorln("播放背景音乐异常:", e) // zap.S().Errorln("播放背景音乐异常:", e)
return // return
} // }
//
select { // select {
case <-a: // case <-a:
{ // {
speaker.Lock() // speaker.Lock()
ctrl.Streamer = nil // ctrl.Streamer = nil
speaker.Unlock() // speaker.Unlock()
return // return
} // }
} // }
}() //}()
} else { } else {
zap.S().Errorln("背景音乐解析为空") zap.S().Errorln("背景音乐解析为空")
} }

View File

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

View File

@@ -8,16 +8,15 @@ import (
"github.com/gopxl/beep/v2/wav" "github.com/gopxl/beep/v2/wav"
"go.uber.org/zap" "go.uber.org/zap"
"io" "io"
"time"
) )
var DefaultSampleRate = beep.SampleRate(44100) var DefaultSampleRate = beep.SampleRate(44100)
func init() { func init() {
err := speaker.Init(DefaultSampleRate, DefaultSampleRate.N(time.Second/10)) //err := speaker.Init(DefaultSampleRate, DefaultSampleRate.N(time.Second/10))
if err != nil { //if err != nil {
panic("扬声器初始化异常: " + err.Error()) // panic("扬声器初始化异常: " + err.Error())
} //}
zap.S().Infoln("扬声器初始化完成") zap.S().Infoln("扬声器初始化完成")
} }

View File

@@ -6,7 +6,6 @@ import (
"fmt" "fmt"
"game-driver/config" "game-driver/config"
"game-driver/leaf" "game-driver/leaf"
"game-driver/pkg/audio"
"game-driver/pkg/errorsx" "game-driver/pkg/errorsx"
"go.uber.org/zap" "go.uber.org/zap"
"io" "io"
@@ -47,7 +46,7 @@ func (tts *AliTTS) Sound(text string) {
} }
buf, err := tts.Get(text) buf, err := tts.Get(text)
if err == nil && buf != nil { if err == nil && buf != nil {
audio.PlayWav(tts.ctx, buf) //audio.PlayWav(tts.ctx, buf)
} else { } else {
zap.S().Errorln("AliTTS 请求异常: ", err) zap.S().Errorln("AliTTS 请求异常: ", err)
} }