From d785718551624cfd3dc7b3f971ebdcd7c598a8a6 Mon Sep 17 00:00:00 2001
From: WeebDataHoarder <57538841+WeebDataHoarder@users.noreply.github.com>
Date: Tue, 2 Aug 2022 20:44:16 +0200
Subject: [PATCH] Update QueueEntry.ReadSamples to use atomic.Uint64

---
 audio/queue/queue.go      | 11 +++++------
 audio/queue/queue_test.go |  3 +--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/audio/queue/queue.go b/audio/queue/queue.go
index bfe9749..7afa0c8 100644
--- a/audio/queue/queue.go
+++ b/audio/queue/queue.go
@@ -11,10 +11,9 @@ import (
 type QueueIdentifier int
 
 type QueueEntry struct {
-	Identifier QueueIdentifier
-	Source     audio.Source
-	//TODO: convert ReadSamples to atomic.Uint64 once 1.19 releases
-	ReadSamples    uint64
+	Identifier     QueueIdentifier
+	Source         audio.Source
+	ReadSamples    atomic.Uint64
 	cancel         chan bool
 	StartCallback  func(q *Queue, entry *QueueEntry)
 	EndCallback    func(q *Queue, entry *QueueEntry)
@@ -147,10 +146,10 @@ func queueLoopStart[T audio.AllowedSourceTypes](q *Queue) {
 						q.Remove(current.Identifier)
 						break F1
 					} else {
-						if current.StartCallback != nil && atomic.LoadUint64(&current.ReadSamples) == 0 && len(block) > 0 {
+						if current.StartCallback != nil && current.ReadSamples.Load() == 0 && len(block) > 0 {
 							current.StartCallback(q, current)
 						}
-						atomic.AddUint64(&current.ReadSamples, uint64(len(block)/current.Source.GetChannels()))
+						current.ReadSamples.Add(uint64(len(block) / current.Source.GetChannels()))
 						q.output.(audio.TypedSource[T]).IngestNative(block, current.Source.GetBitDepth())
 					}
 				}
diff --git a/audio/queue/queue_test.go b/audio/queue/queue_test.go
index e590412..b5438e9 100644
--- a/audio/queue/queue_test.go
+++ b/audio/queue/queue_test.go
@@ -6,7 +6,6 @@ import (
 	"git.gammaspectra.live/S.O.N.G/Kirika/test"
 	"os"
 	"path"
-	"sync/atomic"
 	"testing"
 )
 
@@ -43,7 +42,7 @@ func TestQueue(t *testing.T) {
 				q.AddTail(source, func(q *Queue, entry *QueueEntry) {
 					t.Logf("Started playback of %d %s\n", entry.Identifier, fullPath)
 				}, func(q *Queue, entry *QueueEntry) {
-					t.Logf("Finished playback of %d %s: output %d samples\n", entry.Identifier, fullPath, atomic.LoadUint64(&entry.ReadSamples))
+					t.Logf("Finished playback of %d %s: output %d samples\n", entry.Identifier, fullPath, entry.ReadSamples.Load())
 				}, func(q *Queue, entry *QueueEntry) {
 					fp.Close()
 					if q.GetQueueSize() == 0 {