Fix 依赖问题

diff --git a/Reply/stream.go b/Reply/stream.go
index 453db77ccf43ab061e709a1e7ff3345be4d79c24..2e58aefaf308e45e04cba88c82e7e562c311bb65 100644 (file)
--- a/Reply/stream.go
+++ b/Reply/stream.go
@@ -1205,10 +1205,14 @@ func (t *M4SStream) Start() bool {
                // 设置事件
                // 当录制停止时，取消全部录制
                mainCtx, mainCancel := context.WithCancel(context.Background())
-               mainCtx, done := pctx.WithWait(mainCtx, time.Minute)
+               mainCtx, done := pctx.WithWait(mainCtx, 0, time.Minute)
                defer func() {
-                       if done() != nil {
+                       switch done() {
+                       case pctx.ErrWaitTo:
                                t.log.L(`E: `, `结束超时`)
+                       case pctx.ErrNothingWait:
+                               fallthrough
+                       default:
                        }
                }()
 

diff --git a/go.mod b/go.mod
index 60ed124eae3e9c73d2c55dae9da906159831dd38..d7eb131cfbe4feadd8c5c2850013fa536b012d8e 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
        github.com/gotk3/gotk3 v0.6.2
        github.com/mdp/qrterminal/v3 v3.1.1
-       github.com/qydysky/part v0.28.1-0.20231006190746-c6a051a5a646
+       github.com/qydysky/part v0.28.1-0.20231007011104-2630289351bd
        github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
        github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
        golang.org/x/text v0.13.0

diff --git a/go.sum b/go.sum
index 290028f7395c4c679a21ab4250f3570d8443abcb..af7ff9fe59a64897d533f775d2fe97268d5c229f 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -35,8 +35,8 @@ github.com/miekg/dns v1.1.56 h1:5imZaSeoRNvpM9SzWNhEcP9QliKiz20/dA2QabIGVnE=
 github.com/miekg/dns v1.1.56/go.mod h1:cRm6Oo2C8TY9ZS/TqsSrseAcncm74lfK5G+ikN2SWWY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/qydysky/part v0.28.1-0.20231006190746-c6a051a5a646 h1:Ny56vzyBPU0KRmw5NwGj0p51qqMFS1smxjJYMRu9TRs=
-github.com/qydysky/part v0.28.1-0.20231006190746-c6a051a5a646/go.mod h1:8mG30/qHGHugQSQ6XmgGeGJHH0q9WjFPdn/xwPSXwqY=
+github.com/qydysky/part v0.28.1-0.20231007011104-2630289351bd h1:rs/+rnOKhFjwcbz8y8FzsK0soHnOi8YAyViu9MOvtok=
+github.com/qydysky/part v0.28.1-0.20231007011104-2630289351bd/go.mod h1:8mG30/qHGHugQSQ6XmgGeGJHH0q9WjFPdn/xwPSXwqY=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=