Begin migration of remaining screens to Lua

2 files changed, 22 insertions, 3 deletions

diff --git a/src/audio/include/audio_events.hpp b/src/audio/include/audio_events.hpp
index 3c5ab723..0e4d0bc9 100644
--- a/src/audio/include/audio_events.hpp
+++ b/src/audio/include/audio_events.hpp
@@ -47,12 +47,27 @@ struct PlayFile : tinyfsm::Event {
 
 struct StepUpVolume : tinyfsm::Event {};
 struct StepDownVolume : tinyfsm::Event {};
+struct SetVolume : tinyfsm::Event {
+  std::optional<uint_fast8_t> percent;
+  std::optional<int32_t> db;
+};
+struct SetVolumeBalance : tinyfsm::Event {
+  int left_bias;
+};
+
 struct VolumeChanged : tinyfsm::Event {
   uint_fast8_t percent;
   int db;
 };
-struct ChangeMaxVolume : tinyfsm::Event {
-  uint16_t new_max;
+struct VolumeBalanceChanged : tinyfsm::Event {
+  int left_bias;
+};
+struct VolumeLimitChanged : tinyfsm::Event {
+  uint16_t new_limit;
+};
+
+struct SetVolumeLimit : tinyfsm::Event {
+  uint16_t new_limit;
 };
 
 struct TogglePlayPause : tinyfsm::Event {};
diff --git a/src/audio/include/audio_fsm.hpp b/src/audio/include/audio_fsm.hpp
index 590c6463..b8c505b0 100644
--- a/src/audio/include/audio_fsm.hpp
+++ b/src/audio/include/audio_fsm.hpp
@@ -44,7 +44,11 @@ class AudioState : public tinyfsm::Fsm<AudioState> {
   void react(const StepUpVolume&);
   void react(const StepDownVolume&);
   virtual void react(const system_fsm::HasPhonesChanged&);
-  void react(const ChangeMaxVolume&);
+
+  void react(const SetVolume&);
+  void react(const SetVolumeLimit&);
+  void react(const SetVolumeBalance&);
+
   void react(const OutputModeChanged&);
 
   virtual void react(const system_fsm::BootComplete&) {}