From 5a50ae5f8c89be2d602647bce19f1e8d9e3ebab5 Mon Sep 17 00:00:00 2001
From: Peter Repukat <orly.alia5@gmail.com>
Date: Sat, 5 Mar 2022 16:47:07 +0100
Subject: [PATCH] GlosSITarget: parse new settings

---
 GlosSITarget/Settings.h | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/GlosSITarget/Settings.h b/GlosSITarget/Settings.h
index 1e72cf7..b374e1a 100644
--- a/GlosSITarget/Settings.h
+++ b/GlosSITarget/Settings.h
@@ -23,7 +23,6 @@ limitations under the License.
 
 namespace Settings {
 
-
 inline struct Launch {
     bool launch = false;
     std::wstring launchPath;
@@ -41,8 +40,13 @@ inline struct Window {
     bool windowMode = false;
     int maxFps = 0;
     float scale = 0.f;
+    bool disableOverlay = false;
 } window;
 
+inline struct Controller {
+    int maxControllers = 4;
+} controller;
+
 inline bool checkIsUwp(const std::wstring& launch_path)
 {
     std::wsmatch m;
@@ -60,9 +64,9 @@ inline void Parse(std::string arg1)
     std::filesystem::path path(arg1);
     if (path.has_extension() && !std::filesystem::exists(path)) {
         path = std::filesystem::temp_directory_path()
-                        .parent_path()
-                        .parent_path()
-                        .parent_path();
+                   .parent_path()
+                   .parent_path()
+                   .parent_path();
 
         path /= "Roaming";
         path /= "GlosSI";
@@ -88,7 +92,8 @@ inline void Parse(std::string arg1)
                 return;
             }
             value = object[key];
-        } catch (const nlohmann::json::exception& e) {
+        }
+        catch (const nlohmann::json::exception& e) {
             spdlog::error("Err parsing \"{}\"; {}", key, e.what());
         }
     };
@@ -120,6 +125,11 @@ inline void Parse(std::string arg1)
         safeParseValue(winconf, "windowMode", window.windowMode);
         safeParseValue(winconf, "maxFps", window.maxFps);
         safeParseValue(winconf, "scale", window.scale);
+        safeParseValue(winconf, "disableOverlay", window.disableOverlay);
+    }
+
+    if (auto controllerConf = json["controller"]; controllerConf.is_object()) {
+        safeParseValue(controllerConf, "maxControllers", controller.maxControllers);
     }
 
     json_file.close();
@@ -129,7 +139,6 @@ inline void Parse(std::string arg1)
     if (launch.launch) {
         launch.isUWP = checkIsUwp(launch.launchPath);
     }
-
 }
 
 } // namespace Settings