diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 7312c82e1c..7ff88da540 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -83,7 +83,6 @@ void SConfig::SaveSettings() SaveNetworkSettings(ini); SaveBluetoothPassthroughSettings(ini); SaveUSBPassthroughSettings(ini); - SaveSysconfSettings(ini); ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX)); } @@ -365,19 +364,6 @@ void SConfig::SaveUSBPassthroughSettings(IniFile& ini) 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() { SysConf sysconf{Common::FromWhichRoot::FROM_CONFIGURED_ROOT}; @@ -423,7 +409,6 @@ void SConfig::LoadSettings() LoadAnalyticsSettings(ini); LoadBluetoothPassthroughSettings(ini); LoadUSBPassthroughSettings(ini); - LoadSysconfSettings(ini); } void SConfig::LoadGeneralSettings(IniFile& ini) @@ -709,19 +694,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() { SysConf sysconf{Common::FromWhichRoot::FROM_CONFIGURED_ROOT}; diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index c9271ef729..53a9923f71 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -368,7 +368,6 @@ private: void SaveAnalyticsSettings(IniFile& ini); void SaveBluetoothPassthroughSettings(IniFile& ini); void SaveUSBPassthroughSettings(IniFile& ini); - void SaveSysconfSettings(IniFile& ini); void LoadGeneralSettings(IniFile& ini); void LoadInterfaceSettings(IniFile& ini); @@ -383,7 +382,6 @@ private: void LoadAnalyticsSettings(IniFile& ini); void LoadBluetoothPassthroughSettings(IniFile& ini); void LoadUSBPassthroughSettings(IniFile& ini); - void LoadSysconfSettings(IniFile& ini); void SetRunningGameMetadata(const std::string& game_id, u64 title_id, u16 revision); bool SetRegion(DiscIO::Region region, std::string* directory_name);