archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 15:31:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

move config structs to own files and clean up some headers

Browse source
This commit is contained in:
Megamouse 2020-02-15 23:36:20 +01:00 • committed by Ivan
parent 5e6b1003ec
commit fe75311be2
213 changed files with 919 additions and 997 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Emu/System.cpp
View file

@ -1,4 +1,5 @@
#include "stdafx.h"
#include "VFS.h"
#include "Utilities/bin_patch.h"
#include "Emu/Memory/vm.h"
#include "Emu/System.h"
@ -53,8 +54,6 @@ LOG_CHANNEL(sys_log, "SYS");
stx::manual_fixed_typemap<void> g_fixed_typemap;
cfg_root g_cfg;
bool g_use_rtm;
std::string g_cfg_defaults;
@ -226,7 +225,7 @@ void fmt_class_string<audio_renderer>::format(std::string& out, u64 arg)
}
template <>
inline void fmt_class_string<detail_level>::format(std::string& out, u64 arg)
void fmt_class_string<detail_level>::format(std::string& out, u64 arg)
{
format_enum(out, arg, [](detail_level value)
{
@ -243,7 +242,7 @@ inline void fmt_class_string<detail_level>::format(std::string& out, u64 arg)
}
template <>
inline void fmt_class_string<screen_quadrant>::format(std::string& out, u64 arg)
void fmt_class_string<screen_quadrant>::format(std::string& out, u64 arg)
{
format_enum(out, arg, [](screen_quadrant value)
{
@ -1878,20 +1877,6 @@ std::string Emulator::GetFormattedTitle(double fps) const
return rpcs3::get_formatted_title(title_data);
}
std::string cfg_root::node_vfs::get(const cfg::string& _cfg, const char* _def) const
{
auto [spath, sshared] = _cfg.get();
if (spath.empty())
{
return fs::get_config_dir() + _def;
}
auto [semudir, sshared2] = emulator_dir.get();
return fmt::replace_all(spath, "$(EmulatorDir)", semudir.empty() ? fs::get_config_dir() : semudir);
}
s32 error_code::error_report(const fmt_type_info* sup, u64 arg, const fmt_type_info* sup2, u64 arg2)
{
static thread_local std::unordered_map<std::string, std::size_t> g_tls_error_stats;