Cleanup

include/vamp_pico/http_client.hpp

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdint>
+#include <string_view>
+
 #include <vamp_protocol/page_control.hpp>
 #include <modulus/types.hpp>
 
@@ -14,6 +17,7 @@ struct remote_display_state {
   std::uint32_t pages{};
 };
 
+auto parse_remote_display_body(std::string_view body, vamp_pico::remote_display_state& state) -> std::bool_t;
 auto post_remote_command(vamp_protocol::page_command command, vamp_pico::remote_display_state& state) -> std::bool_t;
 auto heartbeat() -> std::bool_t;
 auto fetch_remote_display(vamp_pico::remote_display_state& state) -> std::bool_t;

include/vamp_zero/navigation.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <cstddef>
+#include <optional>
+#include <string>
+#include <string_view>
+
+#include <modulus/types.hpp>
+
+#include <vamp_zero/types.hpp>
+
+namespace vamp_zero {
+
+auto selected_group(vamp_zero::app_state const& state) -> vamp_zero::song_group const*;
+auto selected_part(vamp_zero::app_state const& state) -> vamp_zero::library_part const*;
+auto active_part(vamp_zero::app_state const& state) -> vamp_zero::library_part const*;
+auto selected_practice_type(vamp_zero::app_state const& state) -> vamp_zero::practice_type_group const*;
+auto selected_practice_lesson(vamp_zero::app_state const& state) -> vamp_zero::practice_lesson_group const*;
+auto selected_practice_exercise(vamp_zero::app_state const& state) -> vamp_zero::practice_exercise const*;
+auto active_practice(vamp_zero::app_state const& state) -> vamp_zero::practice_exercise const*;
+auto supports_key_selection(vamp_zero::practice_exercise const& exercise) -> std::bool_t;
+auto selected_practice_variant(vamp_zero::app_state const& state, vamp_zero::practice_exercise const& exercise) -> vamp_zero::practice_exercise::score_variant const*;
+auto selected_practice_key(vamp_zero::app_state const& state, vamp_zero::practice_exercise const& exercise) -> std::optional<std::string_view>;
+auto practice_key_row_count(vamp_zero::app_state const& state) -> std::size_t;
+auto effective_practice_key(vamp_zero::app_state const& state, vamp_zero::practice_exercise const& exercise) -> std::string;
+auto active_pages(vamp_zero::app_state const& state) -> std::size_t;
+auto practice_fallback_menu(vamp_zero::app_state const& state) -> vamp_zero::app_mode;
+
+}

include/vamp_zero/score.hpp

@@ -83,11 +83,17 @@ struct score_page_layout {
   std::vector<vamp_zero::score_layout_item> items{};
 };
 
+struct score_system_range {
+  std::size_t first_measure{};
+  std::size_t measure_count{};
+};
+
 constexpr auto score_measures_per_system = std::size_t{4};
 constexpr auto score_systems_per_page = std::size_t{3};
-constexpr auto score_measures_per_page = score_measures_per_system * score_systems_per_page;
 
 auto notated_accidentals_for_measure(vamp_zero::score_measure const& measure, std::string_view inherited_key_signature) -> std::vector<vamp_zero::score_accidental_mark>;
+auto score_system_ranges(vamp_zero::score_document const& score) -> std::vector<vamp_zero::score_system_range>;
+auto score_page_count(vamp_zero::score_document const& score) -> std::size_t;
 auto layout_score_page(luma::rect bounds, vamp_zero::score_document const& score, std::size_t page_index) -> vamp_zero::score_page_layout;
 auto draw_score_page(luma::draw_context& context, luma::rect bounds, vamp_zero::score_document const& score, std::size_t page_index) -> void;
 

include/vamp_zero/ui.hpp

@@ -21,6 +21,8 @@
 
 namespace vamp_zero {
 
+struct score_draw_cache;
+
 struct ui_state {
   vamp_zero::app_state app{};
   std::string ap_ssid{};
@@ -47,6 +49,7 @@ private:
   boost::asio::steady_timer tap_timer_;
   luma::application application_;
   command_handler command_handler_{};
+  std::shared_ptr<vamp_zero::score_draw_cache> score_cache_{};
   mutable std::mutex mutex_{};
   vamp_zero::ui_state state_{};
   mutable std::mutex touch_mutex_{};