优化全局zap的打印,修复待机任务出现多个的情况
This commit is contained in:
@@ -8,16 +8,16 @@ import (
|
||||
"io"
|
||||
)
|
||||
|
||||
func PlayBgmMP3(r io.ReadCloser, opts ...beep.LoopOption) (*beep.Ctrl, func() error) {
|
||||
func PlayBgmMP3(r io.ReadCloser, opts ...beep.LoopOption) (*beep.Ctrl, func() error, error) {
|
||||
streamer, format, err := mp3.Decode(r)
|
||||
if err != nil {
|
||||
return nil, func() error { return nil }
|
||||
return nil, func() error { return nil }, err
|
||||
}
|
||||
|
||||
loop2, err := beep.Loop2(streamer, opts...)
|
||||
if err != nil {
|
||||
logger.Infoln("循环播放异常: ", err)
|
||||
return nil, streamer.Close
|
||||
return nil, streamer.Close, err
|
||||
}
|
||||
|
||||
s := beep.Resample(4, format.SampleRate, DefaultSampleRate, loop2)
|
||||
@@ -27,5 +27,5 @@ func PlayBgmMP3(r io.ReadCloser, opts ...beep.LoopOption) (*beep.Ctrl, func() er
|
||||
streamer.Close()
|
||||
})))
|
||||
|
||||
return ctrl, streamer.Close
|
||||
return ctrl, streamer.Close, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user