Neaten up the various kinds of inputs, and move volumes to The New Way

1 files changed, 4 insertions, 6 deletions

diff --git a/src/audio/audio_fsm.cpp b/src/audio/audio_fsm.cpp
index 6ea4f60d..e470300f 100644
--- a/src/audio/audio_fsm.cpp
+++ b/src/audio/audio_fsm.cpp
@@ -50,16 +50,14 @@ std::shared_ptr<IAudioOutput> AudioState::sOutput;
 
 std::optional<database::TrackId> AudioState::sCurrentTrack;
 
-void AudioState::react(const system_fsm::KeyUpChanged& ev) {
-  if (ev.falling && sOutput->AdjustVolumeUp()) {
-    ESP_LOGI(kTag, "volume up!");
+void AudioState::react(const StepUpVolume& ev) {
+  if (sOutput->AdjustVolumeUp()) {
     events::Ui().Dispatch(VolumeChanged{});
   }
 }
 
-void AudioState::react(const system_fsm::KeyDownChanged& ev) {
-  if (ev.falling && sOutput->AdjustVolumeDown()) {
-    ESP_LOGI(kTag, "volume down!");
+void AudioState::react(const StepDownVolume& ev) {
+  if (sOutput->AdjustVolumeDown()) {
     events::Ui().Dispatch(VolumeChanged{});
   }
 }