From 684ff50ef4931aeb8cfb15c5a2d62e55520f04a5 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 21 Mar 2024 10:50:23 +1100
Subject: Add support for screens declaring that they can't be popped

Needed as prep for usb msc support; you really shouldn't leave the MSC
settings screen until you've disabled usb msc.
---
 src/ui/ui_fsm.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/ui/ui_fsm.cpp')

diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp
index 0ed012a0..c11f66a7 100644
--- a/src/ui/ui_fsm.cpp
+++ b/src/ui/ui_fsm.cpp
@@ -610,6 +610,9 @@ auto Lua::QueuePrevious(lua_State*) -> int {
 }
 
 auto Lua::PopLuaScreen(lua_State* s) -> int {
+  if (!sCurrentScreen->canPop()) {
+    return 0;
+  }
   PopScreen();
   luavgl_set_root(s, sCurrentScreen->content());
   lv_group_set_default(sCurrentScreen->group());
-- 
cgit v1.2.3


From dadac304dd930ddf4c5aebcc069c5d9f881b2b60 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 21 Mar 2024 11:51:48 +1100
Subject: Add very basic usb msc ui

---
 src/ui/ui_fsm.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/ui/ui_fsm.cpp')

diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp
index c11f66a7..a913a339 100644
--- a/src/ui/ui_fsm.cpp
+++ b/src/ui/ui_fsm.cpp
@@ -285,6 +285,17 @@ lua::Property UiState::sLockSwitch{false};
 
 lua::Property UiState::sDatabaseUpdating{false};
 
+lua::Property UiState::sUsbMassStorageEnabled{
+    false, [](const lua::LuaValue& val) {
+      if (!std::holds_alternative<bool>(val)) {
+        return false;
+      }
+      bool enable = std::get<bool>(val);
+      // FIXME: Check for system busy.
+      events::System().Dispatch(system_fsm::SamdUsbMscChanged{.en = enable});
+      return true;
+    }};
+
 auto UiState::InitBootSplash(drivers::IGpios& gpios, drivers::NvsStorage& nvs)
     -> bool {
   // Init LVGL first, since the display driver registers itself with LVGL.
@@ -553,6 +564,10 @@ void Lua::entry() {
     registry.AddPropertyModule("database", {
                                                {"updating", &sDatabaseUpdating},
                                            });
+    registry.AddPropertyModule("usb",
+                               {
+                                   {"msc_enabled", &sUsbMassStorageEnabled},
+                               });
 
     auto bt = sServices->bluetooth();
     sBluetoothEnabled.Update(bt.IsEnabled());
-- 
cgit v1.2.3


From 175bfc4e3e9f7aa39e084d3f1625347f1d5711ec Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Mon, 25 Mar 2024 17:34:41 +1100
Subject: WIP rewrie audio pipeline+fsm guts for more reliability

---
 src/ui/ui_fsm.cpp | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

(limited to 'src/ui/ui_fsm.cpp')

diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp
index a913a339..42c6a99c 100644
--- a/src/ui/ui_fsm.cpp
+++ b/src/ui/ui_fsm.cpp
@@ -114,14 +114,11 @@ lua::Property UiState::sBluetoothDevices{
 
 lua::Property UiState::sPlaybackPlaying{
     false, [](const lua::LuaValue& val) {
-      bool current_val = std::get<bool>(sPlaybackPlaying.Get());
       if (!std::holds_alternative<bool>(val)) {
         return false;
       }
       bool new_val = std::get<bool>(val);
-      if (current_val != new_val) {
-        events::Audio().Dispatch(audio::TogglePlayPause{});
-      }
+      events::Audio().Dispatch(audio::TogglePlayPause{.set_to = new_val});
       return true;
     }};
 
@@ -135,12 +132,13 @@ lua::Property UiState::sPlaybackPosition{
       int new_val = std::get<int>(val);
       if (current_val != new_val) {
         auto track = sPlaybackTrack.Get();
-        if (!std::holds_alternative<audio::Track>(track)) {
+        if (!std::holds_alternative<audio::TrackInfo>(track)) {
           return false;
         }
-        events::Audio().Dispatch(audio::SeekFile{
-            .offset = (uint32_t)new_val,
-            .filename = std::get<audio::Track>(track).filepath});
+        events::Audio().Dispatch(audio::SetTrack{
+            .new_track = std::get<audio::TrackInfo>(track).uri,
+            .seek_to_second = (uint32_t)new_val,
+        });
       }
       return true;
     }};
@@ -393,17 +391,10 @@ void UiState::react(const audio::QueueUpdate&) {
   sQueueReplay.Update(queue.replay());
 }
 
-void UiState::react(const audio::PlaybackStarted& ev) {
-  sPlaybackPlaying.Update(true);
-}
-
 void UiState::react(const audio::PlaybackUpdate& ev) {
-  sPlaybackTrack.Update(*ev.track);
-  sPlaybackPosition.Update(static_cast<int>(ev.seconds_elapsed));
-}
-
-void UiState::react(const audio::PlaybackStopped&) {
-  sPlaybackPlaying.Update(false);
+  sPlaybackTrack.Update(*ev.current_track);
+  sPlaybackPlaying.Update(!ev.paused);
+  sPlaybackPosition.Update(static_cast<int>(ev.track_position.value_or(0)));
 }
 
 void UiState::react(const audio::VolumeChanged& ev) {
-- 
cgit v1.2.3


From 078b77d0f796be3c787f62b9b830512e38d3b076 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Tue, 26 Mar 2024 12:12:42 +1100
Subject: pass stream start/update/end events through the whole pipeline

---
 src/ui/ui_fsm.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/ui/ui_fsm.cpp')

diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp
index 42c6a99c..acc1bf10 100644
--- a/src/ui/ui_fsm.cpp
+++ b/src/ui/ui_fsm.cpp
@@ -392,7 +392,11 @@ void UiState::react(const audio::QueueUpdate&) {
 }
 
 void UiState::react(const audio::PlaybackUpdate& ev) {
-  sPlaybackTrack.Update(*ev.current_track);
+  if (ev.current_track) {
+    sPlaybackTrack.Update(*ev.current_track);
+  } else {
+    sPlaybackTrack.Update(std::monostate{});
+  }
   sPlaybackPlaying.Update(!ev.paused);
   sPlaybackPosition.Update(static_cast<int>(ev.track_position.value_or(0)));
 }
-- 
cgit v1.2.3