From 4f5422e906b1d17720592d97bc0d5e82a71b1e5f Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Tue, 5 Dec 2023 11:36:34 +1100
Subject: Rewrite the track queue to work directly with database iterators

---
 src/audio/audio_fsm.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/audio/audio_fsm.cpp')

diff --git a/src/audio/audio_fsm.cpp b/src/audio/audio_fsm.cpp
index e33a2cab..ce610abb 100644
--- a/src/audio/audio_fsm.cpp
+++ b/src/audio/audio_fsm.cpp
@@ -143,7 +143,7 @@ void Standby::react(const internal::InputFileOpened& ev) {
 }
 
 void Standby::react(const QueueUpdate& ev) {
-  auto current_track = sServices->track_queue().GetCurrent();
+  auto current_track = sServices->track_queue().Current();
   if (!current_track || (sCurrentTrack && *sCurrentTrack == *current_track)) {
     return;
   }
@@ -187,7 +187,7 @@ void Playback::react(const QueueUpdate& ev) {
   if (!ev.current_changed) {
     return;
   }
-  auto current_track = sServices->track_queue().GetCurrent();
+  auto current_track = sServices->track_queue().Current();
   if (!current_track) {
     sFileSource->SetPath();
     sCurrentTrack.reset();
@@ -220,8 +220,9 @@ void Playback::react(const internal::InputFileClosed& ev) {}
 
 void Playback::react(const internal::InputFileFinished& ev) {
   ESP_LOGI(kTag, "finished playing file");
-  sServices->track_queue().Next();
-  if (!sServices->track_queue().GetCurrent()) {
+  auto editor = sServices->track_queue().Edit();
+  sServices->track_queue().Next(editor);
+  if (!sServices->track_queue().Current()) {
     transit<Standby>();
   }
 }
-- 
cgit v1.2.3