summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp
diff options
context:
space:
mode:
authoriwubcode <iwubcode@users.noreply.github.com>2024-05-31 23:13:25 -0500
committeriwubcode <iwubcode@users.noreply.github.com>2024-05-31 23:13:25 -0500
commit50b95bbea998f0e677edf0c10b3e1e535f510782 (patch)
treea54f1708fe712e61aae008404011657f95fd27c2 /Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp
parente92f59e2d4c79f2391d775be6fd735de153fbf3b (diff)
InputCommon / VideoCommon: update to use new JsonFromFile function
Diffstat (limited to 'Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp')
-rw-r--r--Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp14
1 files changed, 3 insertions, 11 deletions
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);