Shared Catalog

include/vamp_pico/input.hpp

@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <optional>
 
-#include <vamp_protocol/page_control.hpp>
+#include <vamp_protocol/gesture.hpp>
 
 
 namespace vamp_pico {
@@ -21,17 +21,6 @@ struct remote_request {
   vamp_protocol::page_command command{vamp_protocol::page_command::NEXT};
 };
 
-class gesture_state {
-public:
-  auto update(std::bool_t touching, std::uint64_t now_ms) -> std::optional<vamp_protocol::page_command>;
-private:
-  std::bool_t touching_{};
-  std::bool_t hold_sent_{};
-  std::bool_t pending_tap_{};
-  std::uint64_t down_ms_{};
-  std::uint64_t last_up_ms_{};
-};
-
 enum class enqueue_result {
   QUEUED,
   BUSY,

include/vamp_protocol/gesture.hpp

@@ -0,0 +1,24 @@
+#pragma once
+
+#include <cstdint>
+#include <optional>
+
+#include <vamp_protocol/page_control.hpp>
+
+
+namespace vamp_protocol {
+
+class gesture_state {
+public:
+  auto update(std::bool_t touching, std::uint64_t now_ms) -> std::optional<vamp_protocol::page_command>;
+  auto reset() -> void;
+  auto pending_deadline() const -> std::optional<std::uint64_t>;
+private:
+  std::bool_t touching_{};
+  std::bool_t hold_sent_{};
+  std::bool_t pending_tap_{};
+  std::uint64_t down_ms_{};
+  std::uint64_t last_up_ms_{};
+};
+
+}

include/vamp_zero/score.hpp

@@ -30,5 +30,6 @@ private:
 
 auto score_page_count(vamp_zero::score_document const &score) -> std::size_t;
 auto validated_page_path(vamp_zero::score_document const &score, std::size_t index) -> std::expected<std::string, modulus::error>;
+auto validate_score_page(vamp_zero::score_document const &score, std::size_t index) -> std::expected<void, modulus::error>;
 
 }

include/vamp_zero/touch_input.hpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+
+#include <boost/asio/any_io_executor.hpp>
+
+#include <luma.hpp>
+
+#include <vamp_protocol/page_control.hpp>
+
+
+namespace vamp_zero {
+
+class touch_input {
+public:
+  touch_input(boost::asio::any_io_executor executor, std::function<void(vamp_protocol::page_command)> handler);
+  ~touch_input();
+  touch_input(touch_input const &) = delete;
+  auto operator=(touch_input const &) -> touch_input & = delete;
+  auto handle(luma::touch_event const &event) -> std::bool_t;
+  auto stop() -> void;
+private:
+  struct state;
+  std::shared_ptr<state> state_;
+};
+
+}