From 2bdecb90cf3b0538d04e508f4193b57942888f37 Mon Sep 17 00:00:00 2001 From: WeebDataHoarder <57538841+WeebDataHoarder@users.noreply.github.com> Date: Sun, 31 Jul 2022 22:44:58 +0200 Subject: [PATCH] bump Kirika, fix harmless data race on QueueEntry.ReadSamples --- go.mod | 2 +- go.sum | 4 ++-- queue.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d65dea7..c2dbdc6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.gammaspectra.live/S.O.N.G/MeteorLight go 1.18 require ( - git.gammaspectra.live/S.O.N.G/Kirika v0.0.0-20220728135206-2da6d5922082 + git.gammaspectra.live/S.O.N.G/Kirika v0.0.0-20220731204218-a7d06f5eeaac github.com/BurntSushi/toml v1.2.0 github.com/dhowden/tag v0.0.0-20220618230019-adf36e896086 github.com/enriquebris/goconcurrentqueue v0.6.3 diff --git a/go.sum b/go.sum index fb86aea..2594982 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -git.gammaspectra.live/S.O.N.G/Kirika v0.0.0-20220728135206-2da6d5922082 h1:W54Hb12yRwXQnF0kdR/fUEkXkRJxag7n8nlcFMZKg6k= -git.gammaspectra.live/S.O.N.G/Kirika v0.0.0-20220728135206-2da6d5922082/go.mod h1:M4hLHeQyam39BCxp/0FDYIH8yaYfiRbG6xWhvvwlVn0= +git.gammaspectra.live/S.O.N.G/Kirika v0.0.0-20220731204218-a7d06f5eeaac h1:X8OlCPkEaaN6j0EhVLYheeV8iKYOWZhX8jS552wDJdE= +git.gammaspectra.live/S.O.N.G/Kirika v0.0.0-20220731204218-a7d06f5eeaac/go.mod h1:M4hLHeQyam39BCxp/0FDYIH8yaYfiRbG6xWhvvwlVn0= git.gammaspectra.live/S.O.N.G/flacgo v0.0.0-20220726151057-28f458bc5391 h1:us3yKKsnMe0FZVHRSFZCw113ddiNrZgKf5M5PNr3SQ4= git.gammaspectra.live/S.O.N.G/flacgo v0.0.0-20220726151057-28f458bc5391/go.mod h1:ZVHB/7Vrs9xxK1j98+SJ5TRYBc7Q9dIUaNJHEmysZcI= git.gammaspectra.live/S.O.N.G/go-alac v0.0.0-20220421115623-d0b3bfe57e0f h1:CxN7zlk5FdAieyRKQSbwBGBsvQ2cDF8JVCODZpzcRkA= diff --git a/queue.go b/queue.go index 5d861c1..36379c3 100644 --- a/queue.go +++ b/queue.go @@ -269,7 +269,7 @@ func (q *Queue) AddTrack(entry *QueueTrackEntry, tail bool) error { removeCallback := func(queue *queue.Queue, entry *queue.QueueEntry) { //TODO: carry sample rate error - atomic.AddInt64((*int64)(&q.Duration), int64((time.Second*time.Duration(entry.ReadSamples))/time.Duration(entry.Source.GetSampleRate()))) + atomic.AddInt64((*int64)(&q.Duration), int64((time.Second*time.Duration(atomic.LoadUint64(&entry.ReadSamples)))/time.Duration(entry.Source.GetSampleRate()))) q.Remove(entry.Identifier) q.HandleQueue()