Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved thread safety for Settings.

Browse source 
Also moved some data from the global namespace to an anonymous namespace.
This commit is contained in:
Leon Styhre 2021-11-15 22:53:21 +01:00
parent 6bc4a09c9b
commit 81d6f0fd30
2 changed files with 43 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
es-core/src/Settings.cpp
View file

@ -19,46 +19,47 @@
#include <pugixml.hpp>
#include <vector>
Settings* Settings::sInstance = nullptr;
// These values are NOT saved to es_settings.xml since they're not set via
// the in-program settings menu. Most can be set using command-line arguments,
// but some are debug flags that are either hardcoded or set by internal debug
// functions.
std::vector<std::string> settingsSkipSaving
namespace
{
// clang-format off
// These options can be set using command-line arguments:
"WindowWidth", // Set via --resolution [width] [height]
"WindowHeight", // set via --resolution [width] [height]
"ParseGamelistOnly" // --gamelist-only
"IgnoreGamelist", // --ignore-gamelist
"SplashScreen", // --no-splash
"Debug", // --debug
#if !defined(_WIN64)
"Windowed", // --windowed
#endif
"VSync", // --vsync [1/on or 0/off]
"ForceFull", // --force-full
"ForceKiosk", // --force-kiosk
"ForceKid", // --force-kid
// These values are NOT saved to es_settings.xml since they're not set via
// the in-program settings menu. Most can be set using command-line arguments,
// but some are debug flags that are either hardcoded or set by internal debug
// functions.
std::vector<std::string> settingsSkipSaving
{
// clang-format off
// These options can be set using command-line arguments:
"WindowWidth", // Set via --resolution [width] [height]
"WindowHeight", // set via --resolution [width] [height]
"ParseGamelistOnly" // --gamelist-only
"IgnoreGamelist", // --ignore-gamelist
"SplashScreen", // --no-splash
"Debug", // --debug
#if !defined(_WIN64)
"Windowed", // --windowed
#endif
"VSync", // --vsync [1/on or 0/off]
"ForceFull", // --force-full
"ForceKiosk", // --force-kiosk
"ForceKid", // --force-kid
// These options are not shown in the --help text and are intended
// for debugging and testing purposes:
"ScreenWidth", // Set via --screensize [width] [height]
"ScreenHeight", // set via --screensize [width] [height]
"ScreenOffsetX", // Set via --screenoffset [X] [Y]
"ScreenOffsetY", // Set via --screenoffset [X] [Y]
"ScreenRotate", // --screenrotate [0-3]
// These options are not shown in the --help text and are intended
// for debugging and testing purposes:
"ScreenWidth", // Set via --screensize [width] [height]
"ScreenHeight", // set via --screensize [width] [height]
"ScreenOffsetX", // Set via --screenoffset [X] [Y]
"ScreenOffsetY", // Set via --screenoffset [X] [Y]
"ScreenRotate", // --screenrotate [0-3]
// These options are not configurable from the command-line:
"DebugGrid",
"DebugText",
"DebugImage",
"SplashScreenProgress",
"ScraperFilter"
// clang-format on
};
// These options are not configurable from the command-line:
"DebugGrid",
"DebugText",
"DebugImage",
"SplashScreenProgress",
"ScraperFilter"
// clang-format on
};
} // namespace
Settings::Settings()
{
@ -67,20 +68,10 @@ Settings::Settings()
loadFile();
}
Settings* Settings::getInstance()
std::shared_ptr<Settings> Settings::getInstance()
{
if (sInstance == nullptr)
sInstance = new Settings();
return sInstance;
}
void Settings::deinit()
{
if (sInstance) {
delete sInstance;
sInstance = nullptr;
}
static std::shared_ptr<Settings> instance{std::shared_ptr<Settings>(new Settings)};
return instance;
}
void Settings::setDefaults()

6
es-core/src/Settings.h
View file

@ -11,14 +11,14 @@
#define ES_CORE_SETTINGS_H
#include <map>
#include <memory>
#include <string>
// This is a singleton for storing settings.
class Settings
{
public:
static Settings* getInstance();
static void deinit();
static std::shared_ptr<Settings> getInstance();
void loadFile();
void saveFile();
@ -39,8 +39,6 @@ public:
bool setString(const std::string& name, const std::string& value);
private:
static Settings* sInstance;
Settings();
// Clear everything and load default values.