3 files changed, 11 insertions, 11 deletions
diff --git a/src/audio/include/audio_events.hpp b/src/audio/include/audio_events.hpp
index 920b134e..eebf5efe 100644
--- a/src/audio/include/audio_events.hpp
+++ b/src/audio/include/audio_events.hpp
@@ -10,7 +10,7 @@
 
 #include "tinyfsm.hpp"
 
-#include "song.hpp"
+#include "track.hpp"
 
 namespace audio {
 
@@ -18,10 +18,10 @@ struct PlayFile : tinyfsm::Event {
   std::string filename;
 };
 
-struct PlaySong : tinyfsm::Event {
-  database::SongId id;
-  std::optional<database::SongData> data;
-  std::optional<database::SongTags> tags;
+struct PlayTrack : tinyfsm::Event {
+  database::TrackId id;
+  std::optional<database::TrackData> data;
+  std::optional<database::TrackTags> tags;
 };
 
 struct InputFileFinished : tinyfsm::Event {};
diff --git a/src/audio/include/audio_fsm.hpp b/src/audio/include/audio_fsm.hpp
index 5dad87c0..72654ab5 100644
--- a/src/audio/include/audio_fsm.hpp
+++ b/src/audio/include/audio_fsm.hpp
@@ -17,9 +17,9 @@
 #include "gpio_expander.hpp"
 #include "i2s_audio_output.hpp"
 #include "i2s_dac.hpp"
-#include "song.hpp"
 #include "storage.hpp"
 #include "tinyfsm.hpp"
+#include "track.hpp"
 
 #include "system_events.hpp"
 
@@ -39,7 +39,7 @@ class AudioState : public tinyfsm::Fsm<AudioState> {
   void react(const tinyfsm::Event& ev) {}
 
   virtual void react(const system_fsm::BootComplete&) {}
-  virtual void react(const PlaySong&) {}
+  virtual void react(const PlayTrack&) {}
   virtual void react(const PlayFile&) {}
 
   virtual void react(const InputFileFinished&) {}
@@ -55,8 +55,8 @@ class AudioState : public tinyfsm::Fsm<AudioState> {
   static std::unique_ptr<I2SAudioOutput> sI2SOutput;
   static std::vector<std::unique_ptr<IAudioElement>> sPipeline;
 
-  typedef std::variant<database::SongId, std::string> EnqueuedItem;
-  static std::deque<EnqueuedItem> sSongQueue;
+  typedef std::variant<database::TrackId, std::string> EnqueuedItem;
+  static std::deque<EnqueuedItem> sTrackQueue;
 };
 
 namespace states {
@@ -69,7 +69,7 @@ class Uninitialised : public AudioState {
 
 class Standby : public AudioState {
  public:
-  void react(const PlaySong&) override {}
+  void react(const PlayTrack&) override {}
   void react(const PlayFile&) override;
   using AudioState::react;
 };
diff --git a/src/audio/include/fatfs_audio_input.hpp b/src/audio/include/fatfs_audio_input.hpp
index 1f9f36a1..f5a65d0d 100644
--- a/src/audio/include/fatfs_audio_input.hpp
+++ b/src/audio/include/fatfs_audio_input.hpp
@@ -18,8 +18,8 @@
 #include "ff.h"
 #include "freertos/message_buffer.h"
 #include "freertos/queue.h"
-#include "song.hpp"
 #include "span.hpp"
+#include "track.hpp"
 
 #include "audio_element.hpp"
 #include "stream_buffer.hpp"