song -> track

6 files changed, 19 insertions, 19 deletions

diff --git a/src/audio/audio_fsm.cpp b/src/audio/audio_fsm.cpp
index 6c974905..0be28250 100644
--- a/src/audio/audio_fsm.cpp
+++ b/src/audio/audio_fsm.cpp
@@ -28,7 +28,7 @@ std::unique_ptr<FatfsAudioInput> AudioState::sFileSource;
 std::unique_ptr<I2SAudioOutput> AudioState::sI2SOutput;
 std::vector<std::unique_ptr<IAudioElement>> AudioState::sPipeline;
 
-std::deque<AudioState::EnqueuedItem> AudioState::sSongQueue;
+std::deque<AudioState::EnqueuedItem> AudioState::sTrackQueue;
 
 auto AudioState::Init(drivers::GpioExpander* gpio_expander,
                       std::weak_ptr<database::Database> database) -> bool {
@@ -83,11 +83,11 @@ void Playback::exit() {
 
 void Playback::react(const InputFileFinished& ev) {
   ESP_LOGI(kTag, "finished file");
-  if (sSongQueue.empty()) {
+  if (sTrackQueue.empty()) {
     return;
   }
-  EnqueuedItem next_item = sSongQueue.front();
-  sSongQueue.pop_front();
+  EnqueuedItem next_item = sTrackQueue.front();
+  sTrackQueue.pop_front();
 
   if (std::holds_alternative<std::string>(next_item)) {
     sFileSource->OpenFile(std::get<std::string>(next_item));
diff --git a/src/audio/audio_task.cpp b/src/audio/audio_task.cpp
index eea84e45..394a55b6 100644
--- a/src/audio/audio_task.cpp
+++ b/src/audio/audio_task.cpp
@@ -45,7 +45,7 @@ namespace task {
 static const char* kTag = "task";
 
 // The default amount of time to wait between pipeline iterations for a single
-// song.
+// track.
 static constexpr uint_fast16_t kDefaultDelayTicks = pdMS_TO_TICKS(5);
 static constexpr uint_fast16_t kMaxDelayTicks = pdMS_TO_TICKS(10);
 static constexpr uint_fast16_t kMinDelayTicks = pdMS_TO_TICKS(1);
@@ -54,7 +54,7 @@ void AudioTaskMain(std::unique_ptr<Pipeline> pipeline, IAudioSink* sink) {
   // The stream format for bytes currently in the sink buffer.
   std::optional<StreamInfo::Format> output_format;
 
-  // How long to wait between pipeline iterations. This is reset for each song,
+  // How long to wait between pipeline iterations. This is reset for each track,
   // and readjusted on the fly to maintain a reasonable amount playback buffer.
   // Buffering too much will mean we process samples inefficiently, wasting CPU
   // time, whilst buffering too little will affect the quality of the output.
diff --git a/src/audio/fatfs_audio_input.cpp b/src/audio/fatfs_audio_input.cpp
index eaa62ee3..c26ff0ad 100644
--- a/src/audio/fatfs_audio_input.cpp
+++ b/src/audio/fatfs_audio_input.cpp
@@ -24,12 +24,12 @@
 
 #include "audio_element.hpp"
 #include "chunk.hpp"
-#include "song.hpp"
 #include "stream_buffer.hpp"
 #include "stream_event.hpp"
 #include "stream_info.hpp"
 #include "stream_message.hpp"
 #include "tag_parser.hpp"
+#include "track.hpp"
 #include "types.hpp"
 
 static const char* kTag = "SRC";
@@ -53,7 +53,7 @@ auto FatfsAudioInput::OpenFile(const std::string& path) -> bool {
   ESP_LOGI(kTag, "opening file %s", path.c_str());
 
   database::TagParserImpl tag_parser;
-  database::SongTags tags;
+  database::TrackTags tags;
   if (!tag_parser.ReadAndParseTags(path, &tags)) {
     ESP_LOGE(kTag, "failed to read tags");
     tags.encoding = database::Encoding::kFlac;
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"