From 50b95bbea998f0e677edf0c10b3e1e535f510782 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Fri, 31 May 2024 23:13:25 -0500 Subject: InputCommon / VideoCommon: update to use new JsonFromFile function --- .../InputCommon/DynamicInputTextures/DITConfiguration.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp') diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp index 89aa00c8d3..870dbf9bba 100644 --- a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp +++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp @@ -12,6 +12,7 @@ #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" +#include "Common/JsonUtil.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" @@ -23,18 +24,9 @@ namespace InputCommon::DynamicInputTextures { Configuration::Configuration(const std::string& json_path) { - std::string json_data; - if (!File::ReadFileToString(json_path, json_data)) - { - ERROR_LOG_FMT(VIDEO, "Failed to load dynamic input json file '{}'", json_path); - m_valid = false; - return; - } - picojson::value root; - const auto error = picojson::parse(root, json_data); - - if (!error.empty()) + std::string error; + if (!JsonFromFile(json_path, &root, &error)) { ERROR_LOG_FMT(VIDEO, "Failed to load dynamic input json file '{}' due to parse error: {}", json_path, error); -- cgit v1.2.3