bump Kirika, fix harmless data race on QueueEntry.ReadSamples
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
6b4b100719
commit
2bdecb90cf
2
go.mod
2
go.mod
|
@ -3,7 +3,7 @@ module git.gammaspectra.live/S.O.N.G/MeteorLight
|
||||||
go 1.18
|
go 1.18
|
||||||
|
|
||||||
require (
|
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/BurntSushi/toml v1.2.0
|
||||||
github.com/dhowden/tag v0.0.0-20220618230019-adf36e896086
|
github.com/dhowden/tag v0.0.0-20220618230019-adf36e896086
|
||||||
github.com/enriquebris/goconcurrentqueue v0.6.3
|
github.com/enriquebris/goconcurrentqueue v0.6.3
|
||||||
|
|
4
go.sum
4
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-20220731204218-a7d06f5eeaac h1:X8OlCPkEaaN6j0EhVLYheeV8iKYOWZhX8jS552wDJdE=
|
||||||
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/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 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/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=
|
git.gammaspectra.live/S.O.N.G/go-alac v0.0.0-20220421115623-d0b3bfe57e0f h1:CxN7zlk5FdAieyRKQSbwBGBsvQ2cDF8JVCODZpzcRkA=
|
||||||
|
|
2
queue.go
2
queue.go
|
@ -269,7 +269,7 @@ func (q *Queue) AddTrack(entry *QueueTrackEntry, tail bool) error {
|
||||||
|
|
||||||
removeCallback := func(queue *queue.Queue, entry *queue.QueueEntry) {
|
removeCallback := func(queue *queue.Queue, entry *queue.QueueEntry) {
|
||||||
//TODO: carry sample rate error
|
//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.Remove(entry.Identifier)
|
||||||
q.HandleQueue()
|
q.HandleQueue()
|
||||||
|
|
Loading…
Reference in a new issue