Update

include/vamp_zero/audio.hpp

@@ -39,7 +39,7 @@ private:
   std::future<std::expected<sonus::prepared_sequence, modulus::error>> preparation_{};
   std::uint64_t preparing_session_{};
   std::optional<std::uint64_t> attempted_session_{};
-  std::shared_ptr<vamp_zero::catalogue const> catalog_{};
+  std::shared_ptr<vamp_zero::catalog const> catalog_{};
   sonus::playback_session playback_{};
   std::bool_t reported_{true};
 };

include/vamp_zero/config.hpp

@@ -24,7 +24,7 @@ struct runtime_config {
 };
 
 struct database_config {
-  std::string path{"/usr/share/product-vamp/catalogue.db"};
+  std::string path{"/usr/share/product-vamp/catalog.db"};
 };
 
 struct control_config {

include/vamp_zero/portal.hpp

@@ -24,7 +24,7 @@ public:
   auto heartbeat() -> vamp_zero::app_state;
   auto refresh_connection() -> std::optional<vamp_zero::app_state>;
   auto set_observer(std::function<void(vamp_zero::app_state)> observer) -> void;
-  auto finish_playback(std::uint64_t session, std::string error = {}, std::shared_ptr<vamp_zero::catalogue const> catalog = {}) -> void;
+  auto finish_playback(std::uint64_t session, std::string error = {}, std::shared_ptr<vamp_zero::catalog const> catalog = {}) -> void;
 private:
   auto pico_connected_locked() const -> std::bool_t;
   auto snapshot_locked() const -> vamp_zero::app_state;

include/vamp_zero/score_loader.hpp

@@ -28,7 +28,7 @@ public:
   ~score_loader();
   score_loader(score_loader const &) = delete;
   auto operator=(score_loader const &) -> score_loader & = delete;
-  auto select(std::shared_ptr<vamp_zero::catalogue const> catalog, std::optional<vamp_zero::score_reference> reference) -> void;
+  auto select(std::shared_ptr<vamp_zero::catalog const> catalog, std::optional<vamp_zero::score_reference> reference) -> void;
   auto snapshot() const -> vamp_zero::score_load_state;
   auto stop() -> void;
 private:

include/vamp_zero/types.hpp

@@ -64,12 +64,12 @@ struct practice_library {
   std::vector<vamp_zero::practice_exercise> exercises{};
 };
 
-struct catalogue {
+struct catalog {
   vamp_zero::library_state performance{};
   vamp_zero::practice_library practice{};
 };
 
-auto empty_catalogue() -> std::shared_ptr<vamp_zero::catalogue const> const &;
+auto empty_catalog() -> std::shared_ptr<vamp_zero::catalog const> const &;
 
 enum class score_category {
   PERFORMANCE,
@@ -104,7 +104,7 @@ struct audio_state {
 };
 
 struct app_state {
-  std::shared_ptr<vamp_zero::catalogue const> catalog{vamp_zero::empty_catalogue()};
+  std::shared_ptr<vamp_zero::catalog const> catalog{vamp_zero::empty_catalog()};
   vamp_zero::app_mode mode{vamp_zero::app_mode::MAIN_MENU};
   vamp_zero::audio_state audio{};
   std::size_t selected_main_menu_index{};