RMG-Core: move Settings.{cpp,hpp} and include SettingsID.hpp

Source/RMG-Core/CMakeLists.txt

@@ -31,7 +31,6 @@ set(RMG_CORE_SOURCES
     m64p/PluginApi.cpp
     CachedRomHeaderAndSettings.cpp
     ConvertStringEncoding.cpp
-    Settings/Settings.cpp
     SpeedLimiter.cpp
     SpeedFactor.cpp
     RomSettings.cpp
@@ -43,6 +42,7 @@ set(RMG_CORE_SOURCES
     Emulation.cpp
     SaveState.cpp
     Callback.cpp
+    Settings.cpp
     Plugins.cpp
     Version.cpp
     Cheats.cpp

Source/RMG-Core/Cheats.cpp

@@ -15,7 +15,7 @@
 #include "m64p/Api.hpp"
 #include "osal/osal_files.hpp"
 #include "Error.hpp"
-#include "Settings/Settings.hpp"
+#include "Settings.hpp"
 
 #ifdef USE_LIBFMT
 #include "../3rdParty/fmt/include/fmt/core.h"

Source/RMG-Core/Core.hpp

@@ -11,7 +11,6 @@
 #define CORE_HPP
 
 #include "CachedRomHeaderAndSettings.hpp"
-#include "Settings/Settings.hpp"
 #include "SpeedLimiter.hpp"
 #include "SpeedFactor.hpp"
 #include "RomSettings.hpp"
@@ -22,6 +21,7 @@
 #include "SaveState.hpp"
 #include "RomHeader.hpp"
 #include "Callback.hpp"
+#include "Settings.hpp"
 #include "Netplay.hpp"
 #include "Plugins.hpp"
 #include "Version.hpp"

Source/RMG-Core/DiscordRpc.cpp

@@ -7,7 +7,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-#include "Settings/Settings.hpp"
+#include "Settings.hpp"
 #include "DiscordRpc.hpp"
 #include "RomSettings.hpp"
 #include "RomHeader.hpp"

Source/RMG-Core/Emulation.cpp

@@ -8,7 +8,7 @@
  *  along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 #define CORE_INTERNAL
-#include "Settings/Settings.hpp"
+#include "Settings.hpp"
 #include "MediaLoader.hpp"
 #include "RomSettings.hpp"
 #include "Utils/File.hpp"

Source/RMG-Core/MediaLoader.cpp

@@ -7,7 +7,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-#include "Settings/Settings.hpp"
+#include "Settings.hpp"
 #include "MediaLoader.hpp"
 #include "Error.hpp"
 

Source/RMG-Core/Plugins.cpp

@@ -14,7 +14,7 @@
 #include "Error.hpp"
 #include "Emulation.hpp"
 #include "RomSettings.hpp"
-#include "Settings/Settings.hpp"
+#include "Settings.hpp"
 
 #include "osal/osal_dynlib.hpp"
 #include "osal/osal_files.hpp"

Source/RMG-Core/RomSettings.cpp

@@ -15,7 +15,7 @@
 #include "Error.hpp"
 #include "Rom.hpp"
 
-#include "Settings/Settings.hpp"
+#include "Settings.hpp"
 #include "ConvertStringEncoding.hpp"
 
 //

Source/RMG-Core/SaveState.cpp

@@ -13,7 +13,7 @@
 #include "RomHeader.hpp"
 #include "Error.hpp"
 
-#include "Settings/Settings.hpp"
+#include "Settings.hpp"
 #include "m64p/Api.hpp"
 
 #include <algorithm>

Source/RMG-Core/Settings/SettingsID.hpp → Source/RMG-Core/Settings.hpp

@@ -1,5 +1,17 @@
-#ifndef CORE_SETTINGSID_HPP
-#define CORE_SETTINGSID_HPP
+/*
+ * Rosalie's Mupen GUI - https://github.com/Rosalie241/RMG
+ *  Copyright (C) 2020 Rosalie Wanders <[email protected]>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+#ifndef CORE_SETTINGS_HPP
+#define CORE_SETTINGS_HPP
+
+#include <string>
+#include <vector>
 
 enum class SettingsID
 {
@@ -446,4 +458,120 @@ enum class SettingsID
     Invalid
 };
 
-#endif // CORE_SETTINGSID_HPP
+// saves settings to file
+bool CoreSettingsSave(void);
+
+// upgrades existing settings to new version
+bool CoreSettingsUpgrade(void);
+
+// setup default settings
+bool CoreSettingsSetupDefaults(void);
+
+// returns whether a section exists
+bool CoreSettingsSectionExists(std::string section);
+
+// reverts section to the one from the settings
+bool CoreSettingsRevertSection(std::string section);
+
+// deletes given section
+bool CoreSettingsDeleteSection(std::string section);
+
+// returns whether a key in the given section exists
+bool CoreSettingsKeyExists(std::string section, std::string key);
+
+// sets setting as int value
+bool CoreSettingsSetValue(SettingsID settingId, int value);
+// sets setting as bool value
+bool CoreSettingsSetValue(SettingsID settingId, bool value);
+// sets setting as float value
+bool CoreSettingsSetValue(SettingsID settingId, float value);
+// sets setting as string value
+bool CoreSettingsSetValue(SettingsID settingId, std::string value);
+// sets setting as int list value
+bool CoreSettingsSetValue(SettingsID settingId, std::vector<int> value);
+// sets setting as string list value
+bool CoreSettingsSetValue(SettingsID settingId, std::vector<std::string> value);
+
+// sets setting in section as int value
+bool CoreSettingsSetValue(SettingsID settingId, std::string section, int value);
+// sets setting in section as bool value
+bool CoreSettingsSetValue(SettingsID settingId, std::string section, bool value);
+// sets setting in section as float value
+bool CoreSettingsSetValue(SettingsID settingId, std::string section, float value);
+// sets setting in section as string value
+bool CoreSettingsSetValue(SettingsID settingId, std::string section, std::string value);
+// sets setting in section as int list value
+bool CoreSettingsSetValue(SettingsID settingId, std::string section, std::vector<int> value);
+// sets setting as section as string list value
+bool CoreSettingsSetValue(SettingsID settingId, std::string section, std::vector<std::string> value);
+
+#ifdef CORE_INTERNAL
+// sets key in section as int value
+bool CoreSettingsSetValue(std::string section, std::string key, int value);
+// sets key in section as bool value
+bool CoreSettingsSetValue(std::string section, std::string key, bool value);
+// sets key in section as float value
+bool CoreSettingsSetValue(std::string section, std::string key, float value);
+// sets key in section as string value
+bool CoreSettingsSetValue(std::string section, std::string key, std::string value);
+// sets key in section as int list value
+bool CoreSettingsSetValue(std::string section, std::string key, std::vector<int> value);
+// sets key in section as string list value
+bool CoreSettingsSetValue(std::string section, std::string key, std::vector<std::string> value);
+#endif // CORE_INTERNAL
+
+// retrieves default setting as int
+int CoreSettingsGetDefaultIntValue(SettingsID settingId);
+// retrieves default setting as bool
+bool CoreSettingsGetDefaultBoolValue(SettingsID settingId);
+// retrieves default setting as float
+float CoreSettingsGetDefaultFloatValue(SettingsID settingId);
+// retrieves default setting as string
+std::string CoreSettingsGetDefaultStringValue(SettingsID settingId);
+// retrieves default setting as int list
+std::vector<int> CoreSettingsGetDefaultIntListValue(SettingsID settingId);
+// retrieves default setting as string list
+std::vector<std::string> CoreSettingsGetDefaultStringListValue(SettingsID settingId);
+
+// retrieves setting as int
+int CoreSettingsGetIntValue(SettingsID settingId);
+// retrieves setting as bool
+bool CoreSettingsGetBoolValue(SettingsID settingId);
+// retrieves setting as float
+float CoreSettingsGetFloatValue(SettingsID settingId);
+// retrieves setting as string
+std::string CoreSettingsGetStringValue(SettingsID settingId);
+// retrieves setting as int list
+std::vector<int> CoreSettingsGetIntListValue(SettingsID settingId);
+// retrieves setting as string list
+std::vector<std::string> CoreSettingsGetStringListValue(SettingsID settingId);
+
+// retrieves setting in section as int
+int CoreSettingsGetIntValue(SettingsID settingId, std::string section);
+// retrieves setting in section as bool
+bool CoreSettingsGetBoolValue(SettingsID settingId, std::string section);
+// retrieves setting in section as float
+float CoreSettingsGetFloatValue(SettingsID settingId, std::string section);
+// retrieves setting in section as string
+std::string CoreSettingsGetStringValue(SettingsID settingId, std::string section);
+// retrieves setting in section as int list
+std::vector<int> CoreSettingsGetIntListValue(SettingsID settingId, std::string section);
+// retrieves setting in section as string list
+std::vector<std::string> CoreSettingsGetStringListValue(SettingsID settingId, std::string section);
+
+#ifdef CORE_INTERNAL
+// retrieves key in section as int
+int CoreSettingsGetIntValue(std::string section, std::string key, int defaultValue);
+// retrieves key in section as bool
+bool CoreSettingsGetBoolValue(std::string section, std::string key, bool defaultValue);
+// retrieves key in section as float
+float CoreSettingsGetFloatValue(std::string section, std::string key, float defaultValue);
+// retrieves key in section as string
+std::string CoreSettingsGetStringValue(std::string section, std::string key);
+// retrieves key in section as int list
+std::vector<int> CoreSettingsGetIntListValue(std::string section, std::string key);
+// retrieves key in section as string list
+std::vector<std::string> CoreSettingsGetStringListValue(std::string section, std::string key);
+#endif // CORE_INTERNAL
+
+#endif // CORE_SETTINGS_HPP