ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ConfigManager: Remove load/save code to INI for SYSCONF settings 

These settings are already loaded and saved to the SYSCONF. The INI
load/saves are redundant and do not work anyway because they are
overwritten by SYSCONF.
This commit is contained in:
MerryMage 2017-05-14 15:13:45 +01:00
parent 643b218c1d
commit df2fc3c32f
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/Core/ConfigManager.cpp
View File

@ -84,7 +84,6 @@ void SConfig::SaveSettings()
SaveNetworkSettings(ini); SaveNetworkSettings(ini);
SaveBluetoothPassthroughSettings(ini); SaveBluetoothPassthroughSettings(ini);
SaveUSBPassthroughSettings(ini); SaveUSBPassthroughSettings(ini);
SaveSysconfSettings(ini);
ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX)); ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
} }
@ -366,19 +365,6 @@ void SConfig::SaveUSBPassthroughSettings(IniFile& ini)
section->Set("Devices", devices_string); section->Set("Devices", devices_string);
} }
void SConfig::SaveSysconfSettings(IniFile& ini)
{
IniFile::Section* section = ini.GetOrCreateSection("Sysconf");
section->Set("SensorBarPosition", m_sensor_bar_position);
section->Set("SensorBarSensitivity", m_sensor_bar_sensitivity);
section->Set("SpeakerVolume", m_speaker_volume);
section->Set("WiimoteMotor", m_wiimote_motor);
section->Set("WiiLanguage", m_wii_language);
section->Set("AspectRatio", m_wii_aspect_ratio);
section->Set("Screensaver", m_wii_screensaver);
}
void SConfig::SaveSettingsToSysconf() void SConfig::SaveSettingsToSysconf()
{ {
SysConf sysconf{Common::FromWhichRoot::FROM_CONFIGURED_ROOT}; SysConf sysconf{Common::FromWhichRoot::FROM_CONFIGURED_ROOT};
@ -424,7 +410,6 @@ void SConfig::LoadSettings()
LoadAnalyticsSettings(ini); LoadAnalyticsSettings(ini);
LoadBluetoothPassthroughSettings(ini); LoadBluetoothPassthroughSettings(ini);
LoadUSBPassthroughSettings(ini); LoadUSBPassthroughSettings(ini);
LoadSysconfSettings(ini);
} }
void SConfig::LoadGeneralSettings(IniFile& ini) void SConfig::LoadGeneralSettings(IniFile& ini)
@ -712,19 +697,6 @@ void SConfig::LoadUSBPassthroughSettings(IniFile& ini)
} }
} }
void SConfig::LoadSysconfSettings(IniFile& ini)
{
IniFile::Section* section = ini.GetOrCreateSection("Sysconf");
section->Get("SensorBarPosition", &m_sensor_bar_position, m_sensor_bar_position);
section->Get("SensorBarSensitivity", &m_sensor_bar_sensitivity, m_sensor_bar_sensitivity);
section->Get("SpeakerVolume", &m_speaker_volume, m_speaker_volume);
section->Get("WiimoteMotor", &m_wiimote_motor, m_wiimote_motor);
section->Get("WiiLanguage", &m_wii_language, m_wii_language);
section->Get("AspectRatio", &m_wii_aspect_ratio, m_wii_aspect_ratio);
section->Get("Screensaver", &m_wii_screensaver, m_wii_screensaver);
}
void SConfig::LoadSettingsFromSysconf() void SConfig::LoadSettingsFromSysconf()
{ {
SysConf sysconf{Common::FromWhichRoot::FROM_CONFIGURED_ROOT}; SysConf sysconf{Common::FromWhichRoot::FROM_CONFIGURED_ROOT};

2
Source/Core/Core/ConfigManager.h
View File

@ -371,7 +371,6 @@ private:
void SaveAnalyticsSettings(IniFile& ini); void SaveAnalyticsSettings(IniFile& ini);
void SaveBluetoothPassthroughSettings(IniFile& ini); void SaveBluetoothPassthroughSettings(IniFile& ini);
void SaveUSBPassthroughSettings(IniFile& ini); void SaveUSBPassthroughSettings(IniFile& ini);
void SaveSysconfSettings(IniFile& ini);
void LoadGeneralSettings(IniFile& ini); void LoadGeneralSettings(IniFile& ini);
void LoadInterfaceSettings(IniFile& ini); void LoadInterfaceSettings(IniFile& ini);
@ -386,7 +385,6 @@ private:
void LoadAnalyticsSettings(IniFile& ini); void LoadAnalyticsSettings(IniFile& ini);
void LoadBluetoothPassthroughSettings(IniFile& ini); void LoadBluetoothPassthroughSettings(IniFile& ini);
void LoadUSBPassthroughSettings(IniFile& ini); void LoadUSBPassthroughSettings(IniFile& ini);
void LoadSysconfSettings(IniFile& ini);
void SetRunningGameMetadata(const std::string& game_id, u64 title_id, u16 revision); void SetRunningGameMetadata(const std::string& game_id, u64 title_id, u16 revision);
bool SetRegion(DiscIO::Region region, std::string* directory_name); bool SetRegion(DiscIO::Region region, std::string* directory_name);