mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-16 11:48:36 +12:00
SimpleIni removed
This commit is contained in:
O1L
parent
fd13a495de
commit
f34bd724e3
11 changed files with 0 additions and 4962 deletions
|
|
@ -142,7 +142,6 @@ GLOB_RECURSE
|
|||
RPCS3_SRC
|
||||
"${RPCS3_SRC_DIR}/rpcs3.cpp"
|
||||
"${RPCS3_SRC_DIR}/config.cpp"
|
||||
"${RPCS3_SRC_DIR}/Ini.cpp"
|
||||
"${RPCS3_SRC_DIR}/../Utilities/GNU.cpp"
|
||||
"${RPCS3_SRC_DIR}/Emu/*"
|
||||
"${RPCS3_SRC_DIR}/Gui/*"
|
||||
|
|
@ -151,8 +150,6 @@ RPCS3_SRC
|
|||
"${RPCS3_SRC_DIR}/../Utilities/*"
|
||||
)
|
||||
|
||||
list(REMOVE_ITEM RPCS3_SRC ${RPCS3_SRC_DIR}/../Utilities/simpleini/ConvertUTF.c)
|
||||
|
||||
add_executable(rpcs3 ${RPCS3_SRC})
|
||||
|
||||
if(NOT MSVC)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
#pragma once
|
||||
#include "rpcs3/Ini.h"
|
||||
#include "Emu/state.h"
|
||||
|
||||
class FrameBase : public wxFrame
|
||||
|
|
|
|||
182
rpcs3/Ini.cpp
182
rpcs3/Ini.cpp
|
|
@ -1,182 +0,0 @@
|
|||
#include "stdafx.h"
|
||||
#include "Utilities/rPlatform.h"
|
||||
#include "Utilities/simpleini/SimpleIni.h"
|
||||
|
||||
#include "Ini.h"
|
||||
#include <cctype>
|
||||
#include <regex>
|
||||
|
||||
#define DEF_CONFIG_NAME "./rpcs3.ini"
|
||||
|
||||
//TODO: make thread safe/remove static singleton
|
||||
CSimpleIniCaseA *getIniFile()
|
||||
{
|
||||
static bool inited = false;
|
||||
static CSimpleIniCaseA ini;
|
||||
if (inited == false)
|
||||
{
|
||||
ini.SetUnicode(true);
|
||||
ini.LoadFile(std::string(rPlatform::getConfigDir() + DEF_CONFIG_NAME).c_str());
|
||||
inited = true;
|
||||
}
|
||||
return &ini;
|
||||
}
|
||||
|
||||
void saveIniFile()
|
||||
{
|
||||
getIniFile()->SaveFile(std::string(rPlatform::getConfigDir() + DEF_CONFIG_NAME).c_str());
|
||||
}
|
||||
|
||||
Inis Ini;
|
||||
|
||||
static bool StringToBool(const std::string& str)
|
||||
{
|
||||
return std::regex_match(str.begin(), str.end(),
|
||||
std::regex("1|e|t|enable|true", std::regex_constants::icase));
|
||||
}
|
||||
|
||||
static inline std::string BoolToString(const bool b)
|
||||
{
|
||||
return b ? "true" : "false";
|
||||
}
|
||||
|
||||
//takes a string of format "[number]x[number]" and returns a pair of ints
|
||||
//example input would be "123x456" and the returned value would be {123,456}
|
||||
static std::pair<int, int> StringToSize(const std::string& str)
|
||||
{
|
||||
std::size_t start = 0, found;
|
||||
std::vector<int> vec;
|
||||
|
||||
for (int i = 0; i < 2 && (found = str.find_first_of('x', start)); i++)
|
||||
{
|
||||
try
|
||||
{
|
||||
vec.push_back(std::stoi(str.substr(start, found == std::string::npos ? found : found - start)));
|
||||
}
|
||||
catch (const std::invalid_argument& e)
|
||||
{
|
||||
return std::make_pair(-1, -1);
|
||||
}
|
||||
if (found == std::string::npos)
|
||||
break;
|
||||
start = found + 1;
|
||||
}
|
||||
|
||||
if (vec.size() < 2 || vec[0] < 0 || vec[1] < 0)
|
||||
{
|
||||
return std::make_pair(-1, -1);
|
||||
}
|
||||
|
||||
return std::make_pair(vec[0], vec[1]);
|
||||
}
|
||||
|
||||
static std::string SizeToString(const std::pair<int, int>& size)
|
||||
{
|
||||
return fmt::format("%dx%d", size.first, size.second);
|
||||
}
|
||||
|
||||
static WindowInfo StringToWindowInfo(const std::string& str)
|
||||
{
|
||||
std::size_t start = 0, found;
|
||||
std::vector<int> vec;
|
||||
for (int i = 0; i < 4 && (found = str.find_first_of("x:", start)); i++) {
|
||||
try {
|
||||
vec.push_back(std::stoi(str.substr(start, found == std::string::npos ? found : found - start)));
|
||||
}
|
||||
catch (const std::invalid_argument& e) {
|
||||
return WindowInfo();
|
||||
}
|
||||
if (found == std::string::npos)
|
||||
break;
|
||||
start = found + 1;
|
||||
}
|
||||
if (vec.size() < 4 || vec[0] <= 0 || vec[1] <= 0 || vec[2] < 0 || vec[3] < 0)
|
||||
return WindowInfo();
|
||||
|
||||
return WindowInfo(std::make_pair(vec[0], vec[1]), std::make_pair(vec[2], vec[3]));
|
||||
}
|
||||
|
||||
static std::string WindowInfoToString(const WindowInfo& wind)
|
||||
{
|
||||
const int px = wind.position.first < -wind.size.first ? -1 : wind.position.first;
|
||||
const int py = wind.position.second < -wind.size.second ? -1 : wind.position.second;
|
||||
return fmt::format("%dx%d:%dx%d", wind.size.first, wind.size.second, px, py);
|
||||
}
|
||||
|
||||
//Ini
|
||||
Ini::Ini()
|
||||
{
|
||||
m_config = getIniFile();
|
||||
}
|
||||
|
||||
Ini::~Ini()
|
||||
{
|
||||
saveIniFile();
|
||||
}
|
||||
|
||||
//TODO: saving the file after each change seems like overkill but that's how wx did it
|
||||
void Ini::Save(const std::string& section, const std::string& key, int value)
|
||||
{
|
||||
static_cast<CSimpleIniCaseA*>(m_config)->SetLongValue(section.c_str(), key.c_str(), value);
|
||||
saveIniFile();
|
||||
}
|
||||
|
||||
void Ini::Save(const std::string& section, const std::string& key, unsigned int value)
|
||||
{
|
||||
static_cast<CSimpleIniCaseA*>(m_config)->SetLongValue(section.c_str(), key.c_str(), value);
|
||||
saveIniFile();
|
||||
}
|
||||
|
||||
void Ini::Save(const std::string& section, const std::string& key, bool value)
|
||||
{
|
||||
static_cast<CSimpleIniCaseA*>(m_config)->SetBoolValue(section.c_str(), key.c_str(), value);
|
||||
saveIniFile();
|
||||
}
|
||||
|
||||
void Ini::Save(const std::string& section, const std::string& key, std::pair<int, int> value)
|
||||
{
|
||||
static_cast<CSimpleIniCaseA*>(m_config)->SetValue(section.c_str(), key.c_str(), SizeToString(value).c_str());
|
||||
saveIniFile();
|
||||
}
|
||||
|
||||
void Ini::Save(const std::string& section, const std::string& key, const std::string& value)
|
||||
{
|
||||
static_cast<CSimpleIniCaseA*>(m_config)->SetValue(section.c_str(), key.c_str(), value.c_str());
|
||||
saveIniFile();
|
||||
}
|
||||
|
||||
void Ini::Save(const std::string& section, const std::string& key, WindowInfo value)
|
||||
{
|
||||
static_cast<CSimpleIniCaseA*>(m_config)->SetValue(section.c_str(), key.c_str(), WindowInfoToString(value).c_str());
|
||||
saveIniFile();
|
||||
}
|
||||
|
||||
int Ini::Load(const std::string& section, const std::string& key, const int def_value)
|
||||
{
|
||||
return static_cast<CSimpleIniCaseA*>(m_config)->GetLongValue(section.c_str(), key.c_str(), def_value);
|
||||
}
|
||||
|
||||
unsigned int Ini::Load(const std::string& section, const std::string& key, const unsigned int def_value)
|
||||
{
|
||||
return static_cast<CSimpleIniCaseA*>(m_config)->GetLongValue(section.c_str(), key.c_str(), def_value);
|
||||
}
|
||||
|
||||
bool Ini::Load(const std::string& section, const std::string& key, const bool def_value)
|
||||
{
|
||||
return StringToBool(static_cast<CSimpleIniCaseA*>(m_config)->GetValue(section.c_str(), key.c_str(), BoolToString(def_value).c_str()));
|
||||
}
|
||||
|
||||
std::pair<int, int> Ini::Load(const std::string& section, const std::string& key, const std::pair<int, int> def_value)
|
||||
{
|
||||
return StringToSize(static_cast<CSimpleIniCaseA*>(m_config)->GetValue(section.c_str(), key.c_str(), SizeToString(def_value).c_str()));
|
||||
}
|
||||
|
||||
std::string Ini::Load(const std::string& section, const std::string& key, const std::string& def_value)
|
||||
{
|
||||
return std::string(static_cast<CSimpleIniCaseA*>(m_config)->GetValue(section.c_str(), key.c_str(), def_value.c_str()));
|
||||
}
|
||||
|
||||
WindowInfo Ini::Load(const std::string& section, const std::string& key, const WindowInfo& def_value)
|
||||
{
|
||||
return StringToWindowInfo(static_cast<CSimpleIniCaseA*>(m_config)->GetValue(section.c_str(), key.c_str(), WindowInfoToString(def_value).c_str()));
|
||||
}
|
||||
512
rpcs3/Ini.h
512
rpcs3/Ini.h
|
|
@ -1,512 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
//TODO: move this to the gui module
|
||||
struct WindowInfo
|
||||
{
|
||||
std::pair<int, int> size;
|
||||
std::pair<int, int> position;
|
||||
|
||||
//the (-1,-1) values are currently used because of wxWidgets using it gdicmn.h as default size and default postion
|
||||
WindowInfo(const std::pair<int, int> _size = { -1, -1 }, const std::pair<int, int> _position = { -1, -1 })
|
||||
: size(_size)
|
||||
, position(_position)
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
class Ini
|
||||
{
|
||||
public:
|
||||
virtual ~Ini();
|
||||
|
||||
protected:
|
||||
void* m_config;
|
||||
|
||||
Ini();
|
||||
|
||||
void Save(const std::string& section, const std::string& key, int value);
|
||||
void Save(const std::string& section, const std::string& key, unsigned int value);
|
||||
void Save(const std::string& section, const std::string& key, bool value);
|
||||
void Save(const std::string& section, const std::string& key, std::pair<int, int> value);
|
||||
void Save(const std::string& section, const std::string& key, const std::string& value);
|
||||
void Save(const std::string& section, const std::string& key, WindowInfo value);
|
||||
|
||||
int Load(const std::string& section, const std::string& key, const int def_value);
|
||||
unsigned int Load(const std::string& section, const std::string& key, const unsigned int def_value);
|
||||
bool Load(const std::string& section, const std::string& key, const bool def_value);
|
||||
std::pair<int, int> Load(const std::string& section, const std::string& key, const std::pair<int, int> def_value);
|
||||
std::string Load(const std::string& section, const std::string& key, const std::string& def_value);
|
||||
WindowInfo Load(const std::string& section, const std::string& key, const WindowInfo& def_value);
|
||||
};
|
||||
|
||||
template<typename T> struct IniEntry : public Ini
|
||||
{
|
||||
T m_value;
|
||||
std::string m_key;
|
||||
std::string m_section;
|
||||
|
||||
IniEntry() : Ini()
|
||||
{
|
||||
}
|
||||
|
||||
void Init(const std::string& key, const std::string& section)
|
||||
{
|
||||
m_key = key;
|
||||
m_section = section;
|
||||
}
|
||||
|
||||
void SetValue(const T& value)
|
||||
{
|
||||
m_value = value;
|
||||
}
|
||||
|
||||
T GetValue() const
|
||||
{
|
||||
return m_value;
|
||||
}
|
||||
|
||||
T LoadValue(const T& defvalue)
|
||||
{
|
||||
return Ini::Load(m_section, m_key, defvalue);
|
||||
}
|
||||
|
||||
void SaveValue(const T& value)
|
||||
{
|
||||
Ini::Save(m_section, m_key, value);
|
||||
}
|
||||
|
||||
void Save()
|
||||
{
|
||||
Ini::Save(m_section, m_key, m_value);
|
||||
}
|
||||
|
||||
T Load(const T& defvalue)
|
||||
{
|
||||
return (m_value = Ini::Load(m_section, m_key, defvalue));
|
||||
}
|
||||
};
|
||||
|
||||
class Inis
|
||||
{
|
||||
private:
|
||||
const std::string DefPath;
|
||||
|
||||
public:
|
||||
// Core
|
||||
IniEntry<u8> CPUDecoderMode;
|
||||
IniEntry<bool> LLVMExclusionRange;
|
||||
IniEntry<u32> LLVMMinId;
|
||||
IniEntry<u32> LLVMMaxId;
|
||||
IniEntry<u32> LLVMThreshold;
|
||||
IniEntry<u8> SPUDecoderMode;
|
||||
IniEntry<bool> HookStFunc;
|
||||
IniEntry<bool> LoadLibLv2;
|
||||
|
||||
// Graphics
|
||||
IniEntry<u8> GSRenderMode;
|
||||
IniEntry<u8> GSD3DAdaptater;
|
||||
IniEntry<u8> GSResolution;
|
||||
IniEntry<u8> GSAspectRatio;
|
||||
IniEntry<u8> GSFrameLimit;
|
||||
IniEntry<bool> GSLogPrograms;
|
||||
IniEntry<bool> GSVSyncEnable;
|
||||
IniEntry<bool> GS3DTV;
|
||||
IniEntry<bool> GSDebugOutputEnable;
|
||||
IniEntry<bool> GSOverlay;
|
||||
|
||||
// Audio
|
||||
IniEntry<u8> AudioOutMode;
|
||||
IniEntry<bool> AudioDumpToFile;
|
||||
IniEntry<bool> AudioConvertToU16;
|
||||
|
||||
// Camera
|
||||
IniEntry<u8> Camera;
|
||||
IniEntry<u8> CameraType;
|
||||
|
||||
// Input/Output
|
||||
IniEntry<u8> PadHandlerMode;
|
||||
IniEntry<u8> KeyboardHandlerMode;
|
||||
IniEntry<u8> MouseHandlerMode;
|
||||
IniEntry<int> PadHandlerLStickLeft;
|
||||
IniEntry<int> PadHandlerLStickDown;
|
||||
IniEntry<int> PadHandlerLStickRight;
|
||||
IniEntry<int> PadHandlerLStickUp;
|
||||
IniEntry<int> PadHandlerLeft;
|
||||
IniEntry<int> PadHandlerDown;
|
||||
IniEntry<int> PadHandlerRight;
|
||||
IniEntry<int> PadHandlerUp;
|
||||
IniEntry<int> PadHandlerStart;
|
||||
IniEntry<int> PadHandlerR3;
|
||||
IniEntry<int> PadHandlerL3;
|
||||
IniEntry<int> PadHandlerSelect;
|
||||
IniEntry<int> PadHandlerSquare;
|
||||
IniEntry<int> PadHandlerCross;
|
||||
IniEntry<int> PadHandlerCircle;
|
||||
IniEntry<int> PadHandlerTriangle;
|
||||
IniEntry<int> PadHandlerR1;
|
||||
IniEntry<int> PadHandlerL1;
|
||||
IniEntry<int> PadHandlerR2;
|
||||
IniEntry<int> PadHandlerL2;
|
||||
IniEntry<int> PadHandlerRStickLeft;
|
||||
IniEntry<int> PadHandlerRStickDown;
|
||||
IniEntry<int> PadHandlerRStickRight;
|
||||
IniEntry<int> PadHandlerRStickUp;
|
||||
|
||||
// HLE/Miscs
|
||||
IniEntry<u8> HLELogLvl;
|
||||
IniEntry<u8> NETStatus;
|
||||
IniEntry<u8> NETInterface;
|
||||
IniEntry<bool> HLELogging;
|
||||
IniEntry<bool> RSXLogging;
|
||||
IniEntry<bool> HLESaveTTY;
|
||||
IniEntry<bool> HLEExitOnStop;
|
||||
IniEntry<bool> HLEAlwaysStart;
|
||||
IniEntry<bool> UseDefaultIni;
|
||||
|
||||
// Auto Pause
|
||||
IniEntry<bool> DBGAutoPauseSystemCall;
|
||||
IniEntry<bool> DBGAutoPauseFunctionCall;
|
||||
|
||||
// Custom EmulationDir
|
||||
IniEntry<std::string> SysEmulationDirPath;
|
||||
IniEntry<bool> SysEmulationDirPathEnable;
|
||||
|
||||
// Language
|
||||
IniEntry<u8> SysLanguage;
|
||||
|
||||
public:
|
||||
Inis() : DefPath("EmuSettings")
|
||||
{
|
||||
std::string path;
|
||||
|
||||
path = DefPath;
|
||||
|
||||
// Core
|
||||
CPUDecoderMode.Init("CORE_DecoderMode", path);
|
||||
LLVMExclusionRange.Init("LLVM_Exclusion_Range", path);
|
||||
LLVMMinId.Init("LLVM_Min_ID", path);
|
||||
LLVMMaxId.Init("LLVM_Max_ID", path);
|
||||
LLVMThreshold.Init("LLVM_Threshold", path);
|
||||
SPUDecoderMode.Init("CORE_SPUDecoderMode", path);
|
||||
HookStFunc.Init("CORE_HookStFunc", path);
|
||||
LoadLibLv2.Init("CORE_LoadLibLv2", path);
|
||||
|
||||
// Graphics
|
||||
GSRenderMode.Init("GS_RenderMode", path);
|
||||
GSD3DAdaptater.Init("GS_D3DAdaptater", path);
|
||||
GSResolution.Init("GS_Resolution", path);
|
||||
GSAspectRatio.Init("GS_AspectRatio", path);
|
||||
GSFrameLimit.Init("GS_FrameLimit", path);
|
||||
GSLogPrograms.Init("GS_LogPrograms", path);
|
||||
GSVSyncEnable.Init("GS_VSyncEnable", path);
|
||||
GSDebugOutputEnable.Init("GS_DebugOutputEnable", path);
|
||||
GS3DTV.Init("GS_3DTV", path);
|
||||
GSOverlay.Init("GS_Overlay", path);
|
||||
|
||||
// Audio
|
||||
AudioOutMode.Init("Audio_OutMode", path);
|
||||
AudioDumpToFile.Init("Audio_DumpToFile", path);
|
||||
AudioConvertToU16.Init("Audio_ConvertToU16", path);
|
||||
|
||||
// Camera
|
||||
Camera.Init("Camera", path);
|
||||
CameraType.Init("Camera_Type", path);
|
||||
|
||||
// Input/Output
|
||||
PadHandlerMode.Init("IO_PadHandlerMode", path);
|
||||
KeyboardHandlerMode.Init("IO_KeyboardHandlerMode", path);
|
||||
MouseHandlerMode.Init("IO_MouseHandlerMode", path);
|
||||
PadHandlerLStickLeft.Init("ControlSetings_PadHandlerLStickLeft", path);
|
||||
PadHandlerLStickDown.Init("ControlSetings_PadHandlerLStickDown", path);
|
||||
PadHandlerLStickRight.Init("ControlSetings_PadHandlerLStickRight", path);
|
||||
PadHandlerLStickUp.Init("ControlSetings_PadHandlerLStickUp", path);
|
||||
PadHandlerLeft.Init("ControlSetings_PadHandlerLeft", path);
|
||||
PadHandlerDown.Init("ControlSetings_PadHandlerDown", path);
|
||||
PadHandlerRight.Init("ControlSetings_PadHandlerRight", path);
|
||||
PadHandlerUp.Init("ControlSetings_PadHandlerUp", path);
|
||||
PadHandlerStart.Init("ControlSetings_PadHandlerStart", path);
|
||||
PadHandlerR3.Init("ControlSetings_PadHandlerR3", path);
|
||||
PadHandlerL3.Init("ControlSetings_PadHandlerL3", path);
|
||||
PadHandlerSelect.Init("ControlSetings_PadHandlerSelect", path);
|
||||
PadHandlerSquare.Init("ControlSetings_PadHandlerSquare", path);
|
||||
PadHandlerCross.Init("ControlSetings_PadHandlerCross", path);
|
||||
PadHandlerCircle.Init("ControlSetings_PadHandlerCircle", path);
|
||||
PadHandlerTriangle.Init("ControlSetings_PadHandlerTriangle", path);
|
||||
PadHandlerR1.Init("ControlSetings_PadHandlerR1", path);
|
||||
PadHandlerL1.Init("ControlSetings_PadHandlerL1", path);
|
||||
PadHandlerR2.Init("ControlSetings_PadHandlerR2", path);
|
||||
PadHandlerL2.Init("ControlSetings_PadHandlerL2", path);
|
||||
PadHandlerRStickLeft.Init("ControlSetings_PadHandlerRStickLeft", path);
|
||||
PadHandlerRStickDown.Init("ControlSetings_PadHandlerRStickDown", path);
|
||||
PadHandlerRStickRight.Init("ControlSetings_PadHandlerRStickRight", path);
|
||||
PadHandlerRStickUp.Init("ControlSetings_PadHandlerRStickUp", path);
|
||||
|
||||
// Miscellaneous
|
||||
HLELogging.Init("HLE_HLELogging", path);
|
||||
RSXLogging.Init("RSX_Logging", path);
|
||||
NETStatus.Init("NET_Status", path);
|
||||
NETInterface.Init("NET_Interface", path);
|
||||
HLESaveTTY.Init("HLE_HLESaveTTY", path);
|
||||
HLEExitOnStop.Init("HLE_HLEExitOnStop", path);
|
||||
HLELogLvl.Init("HLE_HLELogLvl", path);
|
||||
HLEAlwaysStart.Init("HLE_HLEAlwaysStart", path);
|
||||
UseDefaultIni.Init("HLE_UseDefaultIni", path);
|
||||
|
||||
// Auto Pause
|
||||
DBGAutoPauseFunctionCall.Init("DBG_AutoPauseFunctionCall", path);
|
||||
DBGAutoPauseSystemCall.Init("DBG_AutoPauseSystemCall", path);
|
||||
|
||||
// Customed EmulationDir
|
||||
SysEmulationDirPath.Init("System_EmulationDir", path);
|
||||
SysEmulationDirPathEnable.Init("System_EmulationDirEnable", path);
|
||||
|
||||
// Language
|
||||
SysLanguage.Init("Sytem_SysLanguage", path);
|
||||
}
|
||||
|
||||
void Load()
|
||||
{
|
||||
// Core
|
||||
CPUDecoderMode.Load(0);
|
||||
LLVMExclusionRange.Load(false);
|
||||
LLVMMinId.Load(200);
|
||||
LLVMMaxId.Load(250);
|
||||
LLVMThreshold.Load(1000);
|
||||
SPUDecoderMode.Load(0);
|
||||
HookStFunc.Load(false);
|
||||
LoadLibLv2.Load(false);
|
||||
|
||||
// Graphics
|
||||
GSRenderMode.Load(1);
|
||||
GSD3DAdaptater.Load(1);
|
||||
GSResolution.Load(4);
|
||||
GSAspectRatio.Load(2);
|
||||
GSFrameLimit.Load(0);
|
||||
GSLogPrograms.Load(false);
|
||||
GSVSyncEnable.Load(false);
|
||||
GSDebugOutputEnable.Load(false);
|
||||
GS3DTV.Load(false);
|
||||
GSOverlay.Load(false);
|
||||
|
||||
// Audio
|
||||
AudioOutMode.Load(1);
|
||||
AudioDumpToFile.Load(false);
|
||||
AudioConvertToU16.Load(false);
|
||||
|
||||
// Camera
|
||||
Camera.Load(1);
|
||||
CameraType.Load(2);
|
||||
|
||||
// Input/Ouput
|
||||
PadHandlerMode.Load(1);
|
||||
KeyboardHandlerMode.Load(0);
|
||||
MouseHandlerMode.Load(0);
|
||||
PadHandlerLStickLeft.Load(314); //WXK_LEFT
|
||||
PadHandlerLStickDown.Load(317); //WXK_DOWN
|
||||
PadHandlerLStickRight.Load(316); //WXK_RIGHT
|
||||
PadHandlerLStickUp.Load(315); //WXK_UP
|
||||
PadHandlerLeft.Load(static_cast<int>('A'));
|
||||
PadHandlerDown.Load(static_cast<int>('S'));
|
||||
PadHandlerRight.Load(static_cast<int>('D'));
|
||||
PadHandlerUp.Load(static_cast<int>('W'));
|
||||
PadHandlerStart.Load(13); //WXK_RETURN
|
||||
PadHandlerR3.Load(static_cast<int>('C'));
|
||||
PadHandlerL3.Load(static_cast<int>('Z'));
|
||||
PadHandlerSelect.Load(32); //WXK_SPACE
|
||||
PadHandlerSquare.Load(static_cast<int>('J'));
|
||||
PadHandlerCross.Load(static_cast<int>('K'));
|
||||
PadHandlerCircle.Load(static_cast<int>('L'));
|
||||
PadHandlerTriangle.Load(static_cast<int>('I'));
|
||||
PadHandlerR1.Load(static_cast<int>('3'));
|
||||
PadHandlerL1.Load(static_cast<int>('1'));
|
||||
PadHandlerR2.Load(static_cast<int>('E'));
|
||||
PadHandlerL2.Load(static_cast<int>('Q'));
|
||||
PadHandlerRStickLeft.Load(313); //WXK_HOME
|
||||
PadHandlerRStickDown.Load(367); //WXK_PAGEDOWN
|
||||
PadHandlerRStickRight.Load(312); //WXK_END
|
||||
PadHandlerRStickUp.Load(366); //WXK_PAGEUP
|
||||
|
||||
// Miscellaneous
|
||||
HLELogging.Load(false);
|
||||
RSXLogging.Load(false);
|
||||
NETStatus.Load(0);
|
||||
NETInterface.Load(0);
|
||||
HLESaveTTY.Load(false);
|
||||
HLEExitOnStop.Load(false);
|
||||
HLELogLvl.Load(3);
|
||||
HLEAlwaysStart.Load(true);
|
||||
UseDefaultIni.Load(false);
|
||||
|
||||
//Auto Pause
|
||||
DBGAutoPauseFunctionCall.Load(false);
|
||||
DBGAutoPauseSystemCall.Load(false);
|
||||
|
||||
// Language
|
||||
SysLanguage.Load(1);
|
||||
|
||||
// Customed EmulationDir
|
||||
SysEmulationDirPath.Load("");
|
||||
SysEmulationDirPathEnable.Load(false);
|
||||
}
|
||||
|
||||
void Save()
|
||||
{
|
||||
// Core
|
||||
CPUDecoderMode.Save();
|
||||
LLVMExclusionRange.Save();
|
||||
LLVMMinId.Save();
|
||||
LLVMMaxId.Save();
|
||||
LLVMThreshold.Save();
|
||||
SPUDecoderMode.Save();
|
||||
HookStFunc.Save();
|
||||
LoadLibLv2.Save();
|
||||
|
||||
// Graphics
|
||||
GSRenderMode.Save();
|
||||
GSD3DAdaptater.Save();
|
||||
GSResolution.Save();
|
||||
GSAspectRatio.Save();
|
||||
GSFrameLimit.Save();
|
||||
GSLogPrograms.Save();
|
||||
GSVSyncEnable.Save();
|
||||
GSDebugOutputEnable.Save();
|
||||
GS3DTV.Save();
|
||||
GSOverlay.Save();
|
||||
|
||||
// Audio
|
||||
AudioOutMode.Save();
|
||||
AudioDumpToFile.Save();
|
||||
AudioConvertToU16.Save();
|
||||
|
||||
// Camera
|
||||
Camera.Save();
|
||||
CameraType.Save();
|
||||
|
||||
// Input/Output
|
||||
PadHandlerMode.Save();
|
||||
KeyboardHandlerMode.Save();
|
||||
MouseHandlerMode.Save();
|
||||
PadHandlerLStickLeft.Save();
|
||||
PadHandlerLStickDown.Save();
|
||||
PadHandlerLStickRight.Save();
|
||||
PadHandlerLStickUp.Save();
|
||||
PadHandlerLeft.Save();
|
||||
PadHandlerDown.Save();
|
||||
PadHandlerRight.Save();
|
||||
PadHandlerUp.Save();
|
||||
PadHandlerStart.Save();
|
||||
PadHandlerR3.Save();
|
||||
PadHandlerL3.Save();
|
||||
PadHandlerSelect.Save();
|
||||
PadHandlerSquare.Save();
|
||||
PadHandlerCross.Save();
|
||||
PadHandlerCircle.Save();
|
||||
PadHandlerTriangle.Save();
|
||||
PadHandlerR1.Save();
|
||||
PadHandlerL1.Save();
|
||||
PadHandlerR2.Save();
|
||||
PadHandlerL2.Save();
|
||||
PadHandlerRStickLeft.Save();
|
||||
PadHandlerRStickDown.Save();
|
||||
PadHandlerRStickRight.Save();
|
||||
PadHandlerRStickUp.Save();
|
||||
|
||||
// Miscellaneous
|
||||
HLELogging.Save();
|
||||
RSXLogging.Save();
|
||||
NETStatus.Save();
|
||||
NETInterface.Save();
|
||||
HLESaveTTY.Save();
|
||||
HLEExitOnStop.Save();
|
||||
HLELogLvl.Save();
|
||||
HLEAlwaysStart.Save();
|
||||
UseDefaultIni.Save();
|
||||
|
||||
//Auto Pause
|
||||
DBGAutoPauseFunctionCall.Save();
|
||||
DBGAutoPauseSystemCall.Save();
|
||||
|
||||
// Language
|
||||
SysLanguage.Save();
|
||||
|
||||
// Customed EmulationDir
|
||||
SysEmulationDirPath.Save();
|
||||
SysEmulationDirPathEnable.Save();
|
||||
}
|
||||
|
||||
// For getting strings for certain options to display settings in the log.
|
||||
inline static const char* CPUIdToString(u8 code)
|
||||
{
|
||||
switch (code)
|
||||
{
|
||||
case 0: return "PPU Interpreter";
|
||||
case 1: return "PPU Interpreter 2";
|
||||
case 2: return "PPU JIT (LLVM)";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
inline static const char* SPUIdToString(u8 code)
|
||||
{
|
||||
switch (code)
|
||||
{
|
||||
case 0: return "SPU Interpreter (precise)";
|
||||
case 1: return "SPU Interpreter (fast)";
|
||||
case 2: return "SPU Recompiler (ASMJIT)";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
inline static const char* RendererIdToString(u8 code)
|
||||
{
|
||||
switch (code)
|
||||
{
|
||||
case 0: return "Null";
|
||||
case 1: return "OpenGL";
|
||||
case 2: return "DirectX 12";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
inline static const char* AdapterIdToString(u8 code)
|
||||
{
|
||||
switch (code)
|
||||
{
|
||||
case 0: return "WARP";
|
||||
case 1: return "Default";
|
||||
case 2: return "Renderer 0";
|
||||
case 3: return "Renderer 1";
|
||||
case 4: return "Renderer 2";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
inline static const char* AudioOutIdToString(u8 code)
|
||||
{
|
||||
switch (code)
|
||||
{
|
||||
case 0: return "Null";
|
||||
case 1: return "OpenAL";
|
||||
case 2: return "XAudio2";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
inline static const char* ResolutionIdToString(u32 id)
|
||||
{
|
||||
switch (id)
|
||||
{
|
||||
case 1: return "1920x1080";
|
||||
case 2: return "1280x720";
|
||||
case 4: return "720x480";
|
||||
case 5: return "720x576";
|
||||
case 10: return "1600x1080";
|
||||
case 11: return "1440x1080";
|
||||
case 12: return "1280x1080";
|
||||
case 13: return "960x1080";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
extern Inis Ini;
|
||||
|
|
@ -321,7 +321,6 @@
|
|||
<ClCompile Include="Emu\SysCalls\Modules\sys_spu_.cpp" />
|
||||
<ClCompile Include="Emu\SysCalls\SysCalls.cpp" />
|
||||
<ClCompile Include="Emu\System.cpp" />
|
||||
<ClCompile Include="Ini.cpp" />
|
||||
<ClCompile Include="Loader\ELF32.cpp" />
|
||||
<ClCompile Include="Loader\ELF64.cpp" />
|
||||
<ClCompile Include="Loader\Loader.cpp" />
|
||||
|
|
@ -359,8 +358,6 @@
|
|||
<ClInclude Include="..\Utilities\rXml.h" />
|
||||
<ClInclude Include="..\Utilities\Semaphore.h" />
|
||||
<ClInclude Include="..\Utilities\SharedMutex.h" />
|
||||
<ClInclude Include="..\Utilities\simpleini\ConvertUTF.h" />
|
||||
<ClInclude Include="..\Utilities\simpleini\SimpleIni.h" />
|
||||
<ClInclude Include="..\Utilities\SleepQueue.h" />
|
||||
<ClInclude Include="..\Utilities\StrFmt.h" />
|
||||
<ClInclude Include="..\Utilities\Thread.h" />
|
||||
|
|
@ -630,7 +627,6 @@
|
|||
<ClInclude Include="Emu\SysCalls\SC_FUNC.h" />
|
||||
<ClInclude Include="Emu\SysCalls\SysCalls.h" />
|
||||
<ClInclude Include="Emu\System.h" />
|
||||
<ClInclude Include="Ini.h" />
|
||||
<ClInclude Include="Loader\ELF32.h" />
|
||||
<ClInclude Include="Loader\ELF64.h" />
|
||||
<ClInclude Include="Loader\Loader.h" />
|
||||
|
|
|
|||
|
|
@ -51,9 +51,6 @@
|
|||
<Filter Include="Utilities">
|
||||
<UniqueIdentifier>{be701b55-2a3d-4692-a3bf-347681ab1c7e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Utilities\SimpleIni">
|
||||
<UniqueIdentifier>{84c34dd1-4c49-4ecf-8ee2-4165c14f24be}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Emu\Io\Null">
|
||||
<UniqueIdentifier>{fcac6852-b45f-4cf2-afee-cf56bcea14e5}</UniqueIdentifier>
|
||||
</Filter>
|
||||
|
|
@ -512,9 +509,6 @@
|
|||
<ClCompile Include="Emu\SysCalls\LogBase.cpp">
|
||||
<Filter>Emu\SysCalls</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Ini.cpp">
|
||||
<Filter>Utilities</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Utilities\rMsgBox.cpp">
|
||||
<Filter>Utilities</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -1334,12 +1328,6 @@
|
|||
<ClInclude Include="Emu\SysCalls\ModuleManager.h">
|
||||
<Filter>Emu\SysCalls</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Utilities\simpleini\ConvertUTF.h">
|
||||
<Filter>Utilities\SimpleIni</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Utilities\simpleini\SimpleIni.h">
|
||||
<Filter>Utilities\SimpleIni</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Emu\DbgCommand.h">
|
||||
<Filter>Emu</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1472,9 +1460,6 @@
|
|||
<ClInclude Include="Emu\IdManager.h">
|
||||
<Filter>Emu</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Ini.h">
|
||||
<Filter>Utilities</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Emu\Io\Null\NullPadHandler.h">
|
||||
<Filter>Emu\Io\Null</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue