From 28a911ae6b3f609003132f67e3398a1b990723d9 Mon Sep 17 00:00:00 2001
From: iwubcode <iwubcode@users.noreply.github.com>
Date: Sun, 14 Feb 2021 20:47:00 -0600
Subject: InputCommon: Move DynamicInputTextureConfiguration to
 DynamicInputTextures::Configuration

---
 .../DynamicInputTextures/DITConfiguration.h        | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h

(limited to 'Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h')

diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h
new file mode 100644
index 0000000000..5bf16168fa
--- /dev/null
+++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h
@@ -0,0 +1,46 @@
+// Copyright 2019 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include "Common/CommonTypes.h"
+#include "Common/IniFile.h"
+#include "InputCommon/ImageOperations.h"
+
+namespace InputCommon::DynamicInputTextures
+{
+class Configuration
+{
+public:
+  explicit Configuration(const std::string& json_file);
+  ~Configuration();
+  bool GenerateTextures(const IniFile::Section* sec, const std::string& controller_name) const;
+
+private:
+  struct DynamicInputTextureData
+  {
+    std::string m_image_name;
+    std::string m_hires_texture_name;
+    std::string m_generated_folder_name;
+
+    using EmulatedKeyToRegionsMap = std::unordered_map<std::string, std::vector<Rect>>;
+    std::unordered_map<std::string, EmulatedKeyToRegionsMap> m_emulated_controllers;
+
+    using HostKeyToImagePath = std::unordered_map<std::string, std::string>;
+    std::unordered_map<std::string, HostKeyToImagePath> m_host_devices;
+    bool m_preserve_aspect_ratio = true;
+  };
+
+  bool GenerateTexture(const IniFile::Section* sec, const std::string& controller_name,
+                       const DynamicInputTextureData& texture_data) const;
+
+  std::vector<DynamicInputTextureData> m_dynamic_input_textures;
+  std::string m_base_path;
+  bool m_valid = true;
+};
+}  // namespace InputCommon::DynamicInputTextures
-- 
cgit v1.2.3


From 10127a045159fac34f3985db29a5ed715190cb15 Mon Sep 17 00:00:00 2001
From: iwubcode <iwubcode@users.noreply.github.com>
Date: Sun, 14 Feb 2021 21:20:47 -0600
Subject: InputCommon: Move DynamicInputTextureData to
 DynamicInputTextures::Data

---
 .../DynamicInputTextures/DITConfiguration.h          | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h')

diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h
index 5bf16168fa..49e3a350f9 100644
--- a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h
+++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h
@@ -10,7 +10,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/IniFile.h"
-#include "InputCommon/ImageOperations.h"
+#include "InputCommon/DynamicInputTextures/DITData.h"
 
 namespace InputCommon::DynamicInputTextures
 {
@@ -22,24 +22,10 @@ public:
   bool GenerateTextures(const IniFile::Section* sec, const std::string& controller_name) const;
 
 private:
-  struct DynamicInputTextureData
-  {
-    std::string m_image_name;
-    std::string m_hires_texture_name;
-    std::string m_generated_folder_name;
-
-    using EmulatedKeyToRegionsMap = std::unordered_map<std::string, std::vector<Rect>>;
-    std::unordered_map<std::string, EmulatedKeyToRegionsMap> m_emulated_controllers;
-
-    using HostKeyToImagePath = std::unordered_map<std::string, std::string>;
-    std::unordered_map<std::string, HostKeyToImagePath> m_host_devices;
-    bool m_preserve_aspect_ratio = true;
-  };
-
   bool GenerateTexture(const IniFile::Section* sec, const std::string& controller_name,
-                       const DynamicInputTextureData& texture_data) const;
+                       const Data& texture_data) const;
 
-  std::vector<DynamicInputTextureData> m_dynamic_input_textures;
+  std::vector<Data> m_dynamic_input_textures;
   std::string m_base_path;
   bool m_valid = true;
 };
-- 
cgit v1.2.3