From 8ff93f5467b0eef54d18b35d742de05c8a63da9a Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Mon, 28 Aug 2023 10:18:02 +1000
Subject: Make idle state more robust + check playback state

---
 src/audio/audio_fsm.cpp            | 2 ++
 src/audio/include/audio_events.hpp | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src/audio')

diff --git a/src/audio/audio_fsm.cpp b/src/audio/audio_fsm.cpp
index e68eedaf..cd36b398 100644
--- a/src/audio/audio_fsm.cpp
+++ b/src/audio/audio_fsm.cpp
@@ -144,6 +144,8 @@ void Playback::exit() {
   // to drain.
   vTaskDelay(pdMS_TO_TICKS(250));
   sOutput->SetInUse(false);
+
+  events::System().Dispatch(PlaybackFinished{});
 }
 
 void Playback::react(const QueueUpdate& ev) {
diff --git a/src/audio/include/audio_events.hpp b/src/audio/include/audio_events.hpp
index 28e29863..1d3690a4 100644
--- a/src/audio/include/audio_events.hpp
+++ b/src/audio/include/audio_events.hpp
@@ -25,6 +25,8 @@ struct PlaybackUpdate : tinyfsm::Event {
   uint32_t seconds_total;
 };
 
+struct PlaybackFinished : tinyfsm::Event {};
+
 struct QueueUpdate : tinyfsm::Event {
   bool current_changed;
 };
-- 
cgit v1.2.3


From a1327763ab70dbf4996e032dd227de368f78f4ad Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Mon, 28 Aug 2023 10:36:18 +1000
Subject: Support play/pause toggling

---
 src/audio/audio_fsm.cpp            | 12 +++++++++++-
 src/audio/include/audio_events.hpp |  2 ++
 src/audio/include/audio_fsm.hpp    |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/audio')

diff --git a/src/audio/audio_fsm.cpp b/src/audio/audio_fsm.cpp
index cd36b398..6cca8211 100644
--- a/src/audio/audio_fsm.cpp
+++ b/src/audio/audio_fsm.cpp
@@ -133,6 +133,12 @@ void Standby::react(const QueueUpdate& ev) {
   sFileSource->SetPath(db->GetTrackPath(*current_track));
 }
 
+void Standby::react(const TogglePlayPause& ev) {
+  if (sCurrentTrack) {
+    transit<Playback>();
+  }
+}
+
 void Playback::entry() {
   ESP_LOGI(kTag, "beginning playback");
   sOutput->SetInUse(true);
@@ -142,7 +148,7 @@ void Playback::exit() {
   ESP_LOGI(kTag, "finishing playback");
   // TODO(jacqueline): Second case where it's useful to wait for the i2s buffer
   // to drain.
-  vTaskDelay(pdMS_TO_TICKS(250));
+  vTaskDelay(pdMS_TO_TICKS(10));
   sOutput->SetInUse(false);
 
   events::System().Dispatch(PlaybackFinished{});
@@ -170,6 +176,10 @@ void Playback::react(const QueueUpdate& ev) {
   sFileSource->SetPath(db->GetTrackPath(*current_track));
 }
 
+void Playback::react(const TogglePlayPause& ev) {
+  transit<Standby>();
+}
+
 void Playback::react(const PlaybackUpdate& ev) {
   ESP_LOGI(kTag, "elapsed: %lu, total: %lu", ev.seconds_elapsed,
            ev.seconds_total);
diff --git a/src/audio/include/audio_events.hpp b/src/audio/include/audio_events.hpp
index 1d3690a4..8ee8b057 100644
--- a/src/audio/include/audio_events.hpp
+++ b/src/audio/include/audio_events.hpp
@@ -37,6 +37,8 @@ struct PlayFile : tinyfsm::Event {
 
 struct VolumeChanged : tinyfsm::Event {};
 
+struct TogglePlayPause : tinyfsm::Event {};
+
 namespace internal {
 
 struct InputFileOpened : tinyfsm::Event {};
diff --git a/src/audio/include/audio_fsm.hpp b/src/audio/include/audio_fsm.hpp
index 430bc298..cfa65551 100644
--- a/src/audio/include/audio_fsm.hpp
+++ b/src/audio/include/audio_fsm.hpp
@@ -57,6 +57,7 @@ class AudioState : public tinyfsm::Fsm<AudioState> {
   virtual void react(const PlayFile&) {}
   virtual void react(const QueueUpdate&) {}
   virtual void react(const PlaybackUpdate&) {}
+  virtual void react(const TogglePlayPause&) {}
 
   virtual void react(const internal::InputFileOpened&) {}
   virtual void react(const internal::InputFileClosed&) {}
@@ -90,6 +91,7 @@ class Standby : public AudioState {
   void react(const PlayFile&) override;
   void react(const internal::InputFileOpened&) override;
   void react(const QueueUpdate&) override;
+  void react(const TogglePlayPause&) override;
 
   using AudioState::react;
 };
@@ -102,6 +104,7 @@ class Playback : public AudioState {
   void react(const PlayFile&) override;
   void react(const QueueUpdate&) override;
   void react(const PlaybackUpdate&) override;
+  void react(const TogglePlayPause&) override;
 
   void react(const internal::InputFileOpened&) override;
   void react(const internal::InputFileClosed&) override;
-- 
cgit v1.2.3