core: Move metadata struct to device info

Author: StollD

src/apps/calibrate/calibrate.hpp

@@ -20,7 +20,6 @@
 #include <filesystem>
 #include <fstream>
 #include <iostream>
-#include <optional>
 #include <string>
 #include <vector>
 
@@ -44,10 +43,8 @@ class Calibrate : public core::Application {
 	f64 m_diagonal;
 
 public:
-	Calibrate(const core::Config &config,
-	          const core::DeviceInfo &info,
-	          const std::optional<const ipts::Metadata> &metadata)
-		: core::Application(config, info, metadata),
+	Calibrate(const core::Config &config, const core::DeviceInfo &info)
+		: core::Application(config, info),
 		  m_diagonal {std::hypot(config.width, config.height)} {};
 
 	void on_start() override

src/apps/daemon/daemon.hpp

@@ -14,7 +14,6 @@
 
 #include <spdlog/spdlog.h>
 
-#include <optional>
 #include <vector>
 
 namespace iptsd::apps::daemon {
@@ -28,10 +27,8 @@ class Daemon : public core::Application {
 	StylusDevice m_stylus;
 
 public:
-	Daemon(const core::Config &config,
-	       const core::DeviceInfo &info,
-	       const std::optional<const ipts::Metadata> &metadata)
-		: core::Application(config, info, metadata),
+	Daemon(const core::Config &config, const core::DeviceInfo &info)
+		: core::Application(config, info),
 		  m_touch {config, info},
 		  m_stylus {config, info} {};
 

src/apps/perf/perf.hpp

@@ -13,7 +13,6 @@
 #include <gsl/gsl>
 
 #include <algorithm>
-#include <optional>
 #include <utility>
 #include <vector>
 
@@ -35,10 +34,8 @@ class Perf : public core::Application {
 	bool m_had_heatmap {};
 
 public:
-	Perf(const core::Config &config,
-	     const core::DeviceInfo &info,
-	     const std::optional<const ipts::Metadata> &metadata)
-		: core::Application(config, info, metadata) {};
+	Perf(const core::Config &config, const core::DeviceInfo &info)
+		: core::Application(config, info) {};
 
 	void on_contacts(const std::vector<contacts::Contact<f64>> & /* unused */) override
 	{

src/apps/visualization/visualize-png.hpp

@@ -15,7 +15,6 @@
 
 #include <cmath>
 #include <filesystem>
-#include <optional>
 #include <utility>
 
 namespace iptsd::apps::visualization {
@@ -30,9 +29,8 @@ class VisualizePNG : public Visualize {
 public:
 	VisualizePNG(const core::Config &config,
 	             const core::DeviceInfo &info,
-	             const std::optional<const ipts::Metadata> &metadata,
 	             std::filesystem::path output)
-		: Visualize(config, info, metadata),
+		: Visualize(config, info),
 		  m_output {std::move(output)} {};
 
 	void on_start() override

src/apps/visualization/visualize-sdl.hpp

@@ -17,7 +17,6 @@
 #include <gsl/gsl>
 
 #include <cstring>
-#include <optional>
 
 namespace iptsd::apps::visualization {
 
@@ -35,10 +34,8 @@ class VisualizeSDL : public Visualize {
 	clock::time_point m_last_draw {};
 
 public:
-	VisualizeSDL(const core::Config &config,
-	             const core::DeviceInfo &info,
-	             const std::optional<const ipts::Metadata> &metadata)
-		: Visualize(config, info, metadata)
+	VisualizeSDL(const core::Config &config, const core::DeviceInfo &info)
+		: Visualize(config, info)
 	{
 		SDL_Init(SDL_INIT_VIDEO);
 	}

src/apps/visualization/visualize.hpp

@@ -39,10 +39,8 @@ class Visualize : public core::Application {
 	Cairo::RefPtr<Cairo::Context> m_cairo {};
 
 public:
-	Visualize(const core::Config &config,
-	          const core::DeviceInfo &info,
-	          const std::optional<const ipts::Metadata> &metadata)
-		: core::Application(config, info, metadata) {};
+	Visualize(const core::Config &config, const core::DeviceInfo &info)
+		: core::Application(config, info) {};
 
 	void on_contacts(const std::vector<contacts::Contact<f64>> & /* unused */) override
 	{

src/core/generic/application.hpp

@@ -51,13 +51,6 @@ class Application {
 	 */
 	DeviceInfo m_info;
 
-	/*
-	 * The IPTS device metadata. This does not exist on all devices.
-	 * This needs to be queried by the application runner
-	 * and passed to the application during construction.
-	 */
-	std::optional<const ipts::Metadata> m_metadata = std::nullopt;
-
 	/*
 	 * Parses incoming data and returns heatmap, stylus and DFT data.
 	 */
@@ -89,14 +82,11 @@ class Application {
 	DftStylus m_dft;
 
 public:
-	Application(const Config &config,
-	            const DeviceInfo &info,
-	            const std::optional<const ipts::Metadata> &metadata)
+	Application(const Config &config, const DeviceInfo &info)
 		: m_config {config},
 		  m_info {info},
-		  m_metadata {metadata},
 		  m_finder {config.contacts()},
-		  m_dft {config, metadata}
+		  m_dft {config, info}
 	{
 		if (m_config.width == 0 || m_config.height == 0)
 			throw common::Error<Error::InvalidScreenSize> {};

src/core/generic/device.hpp

@@ -4,8 +4,11 @@
 #define IPTSD_CORE_GENERIC_DEVICE_HPP
 
 #include <common/types.hpp>
+#include <ipts/data.hpp>
 #include <ipts/device.hpp>
 
+#include <optional>
+
 namespace iptsd::core {
 
 /*
@@ -16,6 +19,7 @@ struct DeviceInfo {
 	u16 vendor = 0;
 	u16 product = 0;
 	ipts::Device::Type type {};
+	std::optional<ipts::Metadata> meta = std::nullopt;
 };
 
 } // namespace iptsd::core

src/core/generic/dft.hpp

@@ -4,6 +4,7 @@
 #define IPTSD_CORE_GENERIC_DFT_HPP
 
 #include "config.hpp"
+#include "device.hpp"
 
 #include <common/casts.hpp>
 #include <ipts/data.hpp>
@@ -19,7 +20,7 @@ namespace iptsd::core {
 class DftStylus {
 private:
 	Config m_config;
-	std::optional<const ipts::Metadata> m_metadata;
+	DeviceInfo m_info;
 
 	// The current state of the DFT stylus.
 	ipts::StylusData m_stylus;
@@ -43,9 +44,9 @@ class DftStylus {
 	std::optional<bool> m_mppv2_in_contact = std::nullopt;
 
 public:
-	DftStylus(Config config, const std::optional<const ipts::Metadata> &metadata)
+	DftStylus(Config config, const DeviceInfo &info)
 		: m_config {std::move(config)},
-		  m_metadata {metadata} {};
+		  m_info {info} {};
 
 	/*!
 	 * Loads a DFT window and calculates stylus properties from it.
@@ -108,9 +109,9 @@ class DftStylus {
 		u8 width = dft.width;
 		u8 height = dft.height;
 
-		if ((width == 0 || height == 0) && m_metadata.has_value()) {
-			width = casts::to<u8>(m_metadata->dimensions.columns);
-			height = casts::to<u8>(m_metadata->dimensions.rows);
+		if ((width == 0 || height == 0) && m_info.meta.has_value()) {
+			width = casts::to<u8>(m_info.meta->dimensions.columns);
+			height = casts::to<u8>(m_info.meta->dimensions.rows);
 		}
 
 		m_group = dft.group;

src/core/linux/config-loader.hpp

@@ -32,14 +32,13 @@ class ConfigLoader {
 	bool m_loaded_config = false;
 
 public:
-	ConfigLoader(const DeviceInfo &info, const std::optional<const ipts::Metadata> &metadata)
-		: m_info {info}
+	ConfigLoader(const DeviceInfo &info) : m_info {info}
 	{
-		if (metadata.has_value()) {
-			m_config.width = casts::to<f64>(metadata->dimensions.width) / 1e3;
-			m_config.height = casts::to<f64>(metadata->dimensions.height) / 1e3;
-			m_config.invert_x = metadata->transform.xx < 0;
-			m_config.invert_y = metadata->transform.yy < 0;
+		if (m_info.meta.has_value()) {
+			m_config.width = casts::to<f64>(m_info.meta->dimensions.width) / 1e3;
+			m_config.height = casts::to<f64>(m_info.meta->dimensions.height) / 1e3;
+			m_config.invert_x = m_info.meta->transform.xx < 0;
+			m_config.invert_y = m_info.meta->transform.yy < 0;
 		}
 
 		this->load_dir(common::buildopts::PresetDir);

src/core/linux/runner.hpp

@@ -68,11 +68,10 @@ class Runner {
 		info.vendor = m_device->vendor();
 		info.product = m_device->product();
 		info.type = m_ipts.type();
+		info.meta = m_ipts.metadata();
 
-		const std::optional<const ipts::Metadata> meta = m_ipts.metadata();
-
-		const ConfigLoader loader {info, meta};
-		m_application.emplace(loader.config(), info, meta, args...);
+		const ConfigLoader loader {info};
+		m_application.emplace(loader.config(), info, args...);
 
 		m_buffer.resize(m_ipts.buffer_size());