CCF_100/suyu-mirror
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2025-09-05 10:56:31 -05:00
Code Issues Releases Wiki Activity

Revert "Merge branch 'master' into 'dev'"

Browse Source 
This reverts merge request !17
This commit is contained in:
Crimson Hawk
2024-03-06 05:26:38 +00:00
parent fdadc50fff
commit cdbdf63ebe
2887 changed files with 18295 additions and 18366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend_common/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2023 suyu Emulator Project
# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
add_library(frontend_common STATIC

40
src/frontend_common/config.cpp
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 suyu Emulator Project
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <algorithm>
@@ -25,7 +25,7 @@ Config::Config(const ConfigType config_type)
: type(config_type), global{config_type == ConfigType::GlobalConfig} {}
void Config::Initialize(const std::string& config_name) {
const std::filesystem::path fs_config_loc = FS::GetsuyuPath(FS::suyuPath::ConfigDir);
const std::filesystem::path fs_config_loc = FS::GetYuzuPath(FS::YuzuPath::ConfigDir);
const auto config_file = fmt::format("{}.ini", config_name);
switch (type) {
@@ -51,7 +51,7 @@ void Config::Initialize(const std::string& config_name) {
void Config::Initialize(const std::optional<std::string> config_path) {
const std::filesystem::path default_sdl_config_path =
FS::GetsuyuPath(FS::suyuPath::ConfigDir) / "sdl2-config.ini";
FS::GetYuzuPath(FS::YuzuPath::ConfigDir) / "sdl2-config.ini";
config_loc = config_path.value_or(FS::PathToUTF8String(default_sdl_config_path));
void(FS::CreateParentDir(config_loc));
SetUpIni();
@@ -275,11 +275,11 @@ void Config::ReadCoreValues() {
void Config::ReadDataStorageValues() {
BeginGroup(Settings::TranslateCategory(Settings::Category::DataStorage));
FS::SetsuyuPath(FS::suyuPath::NANDDir, ReadStringSetting(std::string("nand_directory")));
FS::SetsuyuPath(FS::suyuPath::SDMCDir, ReadStringSetting(std::string("sdmc_directory")));
FS::SetsuyuPath(FS::suyuPath::LoadDir, ReadStringSetting(std::string("load_directory")));
FS::SetsuyuPath(FS::suyuPath::DumpDir, ReadStringSetting(std::string("dump_directory")));
FS::SetsuyuPath(FS::suyuPath::TASDir, ReadStringSetting(std::string("tas_directory")));
FS::SetYuzuPath(FS::YuzuPath::NANDDir, ReadStringSetting(std::string("nand_directory")));
FS::SetYuzuPath(FS::YuzuPath::SDMCDir, ReadStringSetting(std::string("sdmc_directory")));
FS::SetYuzuPath(FS::YuzuPath::LoadDir, ReadStringSetting(std::string("load_directory")));
FS::SetYuzuPath(FS::YuzuPath::DumpDir, ReadStringSetting(std::string("dump_directory")));
FS::SetYuzuPath(FS::YuzuPath::TASDir, ReadStringSetting(std::string("tas_directory")));
ReadCategory(Settings::Category::DataStorage);
@@ -371,7 +371,7 @@ void Config::ReadScreenshotValues() {
BeginGroup(Settings::TranslateCategory(Settings::Category::Screenshots));
ReadCategory(Settings::Category::Screenshots);
FS::SetsuyuPath(FS::suyuPath::ScreenshotsDir,
FS::SetYuzuPath(FS::YuzuPath::ScreenshotsDir,
ReadStringSetting(std::string("screenshot_path")));
EndGroup();
@@ -577,16 +577,16 @@ void Config::SaveCoreValues() {
void Config::SaveDataStorageValues() {
BeginGroup(Settings::TranslateCategory(Settings::Category::DataStorage));
WriteStringSetting(std::string("nand_directory"), FS::GetsuyuPathString(FS::suyuPath::NANDDir),
std::make_optional(FS::GetsuyuPathString(FS::suyuPath::NANDDir)));
WriteStringSetting(std::string("sdmc_directory"), FS::GetsuyuPathString(FS::suyuPath::SDMCDir),
std::make_optional(FS::GetsuyuPathString(FS::suyuPath::SDMCDir)));
WriteStringSetting(std::string("load_directory"), FS::GetsuyuPathString(FS::suyuPath::LoadDir),
std::make_optional(FS::GetsuyuPathString(FS::suyuPath::LoadDir)));
WriteStringSetting(std::string("dump_directory"), FS::GetsuyuPathString(FS::suyuPath::DumpDir),
std::make_optional(FS::GetsuyuPathString(FS::suyuPath::DumpDir)));
WriteStringSetting(std::string("tas_directory"), FS::GetsuyuPathString(FS::suyuPath::TASDir),
std::make_optional(FS::GetsuyuPathString(FS::suyuPath::TASDir)));
WriteStringSetting(std::string("nand_directory"), FS::GetYuzuPathString(FS::YuzuPath::NANDDir),
std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::NANDDir)));
WriteStringSetting(std::string("sdmc_directory"), FS::GetYuzuPathString(FS::YuzuPath::SDMCDir),
std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::SDMCDir)));
WriteStringSetting(std::string("load_directory"), FS::GetYuzuPathString(FS::YuzuPath::LoadDir),
std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::LoadDir)));
WriteStringSetting(std::string("dump_directory"), FS::GetYuzuPathString(FS::YuzuPath::DumpDir),
std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::DumpDir)));
WriteStringSetting(std::string("tas_directory"), FS::GetYuzuPathString(FS::YuzuPath::TASDir),
std::make_optional(FS::GetYuzuPathString(FS::YuzuPath::TASDir)));
WriteCategory(Settings::Category::DataStorage);
@@ -679,7 +679,7 @@ void Config::SaveScreenshotValues() {
BeginGroup(Settings::TranslateCategory(Settings::Category::Screenshots));
WriteStringSetting(std::string("screenshot_path"),
FS::GetsuyuPathString(FS::suyuPath::ScreenshotsDir));
FS::GetYuzuPathString(FS::YuzuPath::ScreenshotsDir));
WriteCategory(Settings::Category::Screenshots);
EndGroup();

2
src/frontend_common/config.h
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 suyu Emulator Project
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once

2
src/frontend_common/content_manager.h
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 suyu Emulator Project
// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once