daniel/playlist-queue (#83)

Reviewed-on: https://codeberg.org/cool-tech-zone/tangara-fw/pulls/83
Reviewed-by: cooljqln <cooljqln@noreply.codeberg.org>
Co-authored-by: ailurux <ailuruxx@gmail.com>
Co-committed-by: ailurux <ailuruxx@gmail.com>

1 files changed, 12 insertions, 8 deletions

diff --git a/src/tangara/audio/audio_fsm.cpp b/src/tangara/audio/audio_fsm.cpp
index fbc38f97..65261d75 100644
--- a/src/tangara/audio/audio_fsm.cpp
+++ b/src/tangara/audio/audio_fsm.cpp
@@ -96,9 +96,7 @@ void AudioState::react(const QueueUpdate& ev) {
   };
 
   auto current = sServices->track_queue().current();
-  if (current) {
-    cmd.new_track = *current;
-  }
+  cmd.new_track = current;
 
   switch (ev.reason) {
     case QueueUpdate::kExplicitUpdate:
@@ -176,18 +174,21 @@ void AudioState::react(const internal::DecodingFinished& ev) {
   sServices->bg_worker().Dispatch<void>([=]() {
     auto& queue = sServices->track_queue();
     auto current = queue.current();
-    if (!current) {
+    if (std::holds_alternative<std::monostate>(current)) {
       return;
     }
     auto db = sServices->database().lock();
     if (!db) {
       return;
     }
-    auto path = db->getTrackPath(*current);
-    if (!path) {
-      return;
+    std::string path;
+    if (std::holds_alternative<std::string>(current)) {
+      path = std::get<std::string>(current);
+    } else if (std::holds_alternative<database::TrackId>(current)) {
+      auto tid = std::get<database::TrackId>(current);
+      path = db->getTrackPath(tid).value_or("");
     }
-    if (*path == ev.track->uri) {
+    if (path == ev.track->uri) {
       queue.finish();
     }
   });
@@ -449,6 +450,9 @@ void Standby::react(const system_fsm::SdStateChanged& ev) {
       return;
     }
 
+    // Open the queue file
+    sServices->track_queue().open();
+
     // Restore the currently playing file before restoring the queue. This way,
     // we can fall back to restarting the queue's current track if there's any
     // issue restoring the current file.