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 --- .../VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp | 13 +++---------- .../GraphicsModSystem/Config/GraphicsModGroup.cpp | 13 +++---------- 2 files changed, 6 insertions(+), 20 deletions(-) (limited to 'Source/Core/VideoCommon/GraphicsModSystem') diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp index 62586202b5..76d1ad6af6 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp @@ -7,6 +7,7 @@ #include "Common/CommonPaths.h" #include "Common/FileUtil.h" +#include "Common/JsonUtil.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" @@ -15,17 +16,9 @@ std::optional GraphicsModConfig::Create(const std::string& file_path, Source source) { - std::string json_data; - if (!File::ReadFileToString(file_path, json_data)) - { - ERROR_LOG_FMT(VIDEO, "Failed to load graphics mod json file '{}'", file_path); - return std::nullopt; - } - picojson::value root; - const auto error = picojson::parse(root, json_data); - - if (!error.empty()) + std::string error; + if (!JsonFromFile(file_path, &root, &error)) { ERROR_LOG_FMT(VIDEO, "Failed to load graphics mod json file '{}' due to parse error: {}", file_path, error); diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp index 0873c09e91..5fa2c011b6 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp @@ -12,6 +12,7 @@ #include "Common/CommonPaths.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" +#include "Common/JsonUtil.h" #include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" @@ -42,17 +43,9 @@ void GraphicsModGroupConfig::Load() std::set known_paths; if (File::Exists(file_path)) { - std::string json_data; - if (!File::ReadFileToString(file_path, json_data)) - { - ERROR_LOG_FMT(VIDEO, "Failed to load graphics mod group json file '{}'", file_path); - return; - } - picojson::value root; - const auto error = picojson::parse(root, json_data); - - if (!error.empty()) + std::string error; + if (!JsonFromFile(file_path, &root, &error)) { ERROR_LOG_FMT(VIDEO, "Failed to load graphics mod group json file '{}' due to parse error: {}", -- cgit v1.2.3