kernel: rename (G|S)etStorageLocation to (G|S)etDataLocation

This commit is contained in:
RadWolfie 2021-06-30 14:37:01 -05:00
parent e1a8391170
commit 0fb2e6208d
5 changed files with 8 additions and 8 deletions

View File

@ -809,7 +809,7 @@ void Settings::SyncToEmulator()
g_EmuShared->SetHackSettings(&m_hacks);
// register data location setting
g_EmuShared->SetStorageLocation(GetDataLocation().c_str());
g_EmuShared->SetDataLocation(GetDataLocation().c_str());
// reset title mount path
g_EmuShared->SetTitleMountPath("");

View File

@ -246,10 +246,10 @@ class EmuShared : public Mutex
void SetLogPopupTestCase(const bool value) { Lock(); m_core.bLogPopupTestCase = value; Unlock(); }
// ******************************************************************
// * File storage location
// * Data location path
// ******************************************************************
void GetStorageLocation(char *path) { Lock(); strncpy(path, m_core.szStorageLocation, xbox::max_path); Unlock(); }
void SetStorageLocation(const char *path) { Lock(); strncpy(m_core.szStorageLocation, path, xbox::max_path); Unlock(); }
void GetDataLocation(char *path) { Lock(); strncpy(path, m_core.szStorageLocation, xbox::max_path); Unlock(); }
void SetDataLocation(const char *path) { Lock(); strncpy(m_core.szStorageLocation, path, xbox::max_path); Unlock(); }
// ******************************************************************
// * ClipCursor flag Accessors

View File

@ -27,7 +27,7 @@ bool ImGuiUI::Initialize()
ImGuiIO& io = ImGui::GetIO();
#if 0 // TODO: Currently most voted for memory, so this block of code is disabled. And may will add an option between file vs memory.
// May be best ideal to do manual update call than ImGui's internal auto update.
g_EmuShared->GetStorageLocation(m_file_path);
g_EmuShared->GetDataLocation(m_file_path);
if (m_file_path[0] == '\0') {
return false;
}

View File

@ -1420,7 +1420,7 @@ __declspec(noreturn) void CxbxKrnlInit
// Initialize devices :
{
char cxbxr_data_path[sizeof(szFilePath_Xbe)];
g_EmuShared->GetStorageLocation(cxbxr_data_path);
g_EmuShared->GetDataLocation(cxbxr_data_path);
g_DiskBasePath = std::string(cxbxr_data_path) + "\\EmuDisk";
g_MuBasePath = std::string(cxbxr_data_path) + "\\EmuMu";
@ -1741,7 +1741,7 @@ void CxbxInitFilePaths()
std::strncpy(szFolder_CxbxReloadedData, dataLoc.c_str(), dataLoc.length() + 1);
}
else {
g_EmuShared->GetStorageLocation(szFolder_CxbxReloadedData);
g_EmuShared->GetDataLocation(szFolder_CxbxReloadedData);
}
// Make sure our data folder exists :

View File

@ -215,7 +215,7 @@ WndMain::WndMain(HINSTANCE x_hInstance) :
g_Settings->Verify();
// NOTE: This is a requirement for pre-verification from GUI. Used in CxbxInitFilePaths function.
g_EmuShared->SetStorageLocation(g_Settings->GetDataLocation().c_str());
g_EmuShared->SetDataLocation(g_Settings->GetDataLocation().c_str());
unsigned int i = 0;
do {