diff --git a/src/core/settings.cpp b/src/core/settings.cpp index b0c7e98e..923d1380 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -3,6 +3,7 @@ #include "common/string_util.h" #include "host_display.h" #include "host_interface.h" +#include "libretro/libretro_settings_interface.h" #include #include #include @@ -10,8 +11,6 @@ Settings g_settings; -SettingsInterface::~SettingsInterface() = default; - const char* SettingInfo::StringDefaultValue() const { return default_value ? default_value : ""; @@ -132,7 +131,7 @@ void Settings::UpdateOverclockActive() cpu_overclock_active = (cpu_overclock_enable && (cpu_overclock_numerator != 1 || cpu_overclock_denominator != 1)); } -void Settings::Load(SettingsInterface& si) +void Settings::Load(LibretroSettingsInterface& si) { region = ParseConsoleRegionName( diff --git a/src/core/settings.h b/src/core/settings.h index b6a89f57..5e6ef86e 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -7,18 +7,7 @@ #include #include -class SettingsInterface -{ -public: - virtual ~SettingsInterface(); - - virtual int GetIntValue(const char* section, const char* key, int default_value = 0) = 0; - virtual float GetFloatValue(const char* section, const char* key, float default_value = 0.0f) = 0; - virtual bool GetBoolValue(const char* section, const char* key, bool default_value = false) = 0; - virtual std::string GetStringValue(const char* section, const char* key, const char* default_value = "") = 0; - - virtual std::vector GetStringList(const char* section, const char* key) = 0; -}; +class LibretroSettingsInterface; struct SettingInfo { @@ -205,7 +194,7 @@ struct Settings DEFAULT_GPU_MAX_RUN_AHEAD = 128, DEFAULT_VRAM_WRITE_DUMP_WIDTH_THRESHOLD = 128, DEFAULT_VRAM_WRITE_DUMP_HEIGHT_THRESHOLD = 128; - void Load(SettingsInterface& si); + void Load(LibretroSettingsInterface& si); static std::optional ParseLogLevelName(const char* str); static const char* GetLogLevelName(LogLevel level); diff --git a/src/libretro/libretro_settings_interface.h b/src/libretro/libretro_settings_interface.h index 8dce87e9..b1fccea4 100644 --- a/src/libretro/libretro_settings_interface.h +++ b/src/libretro/libretro_settings_interface.h @@ -1,13 +1,15 @@ #pragma once -#include "core/settings.h" +#include "core/types.h" +#include +#include -class LibretroSettingsInterface : public SettingsInterface +class LibretroSettingsInterface { public: - int GetIntValue(const char* section, const char* key, int default_value = 0) override; - float GetFloatValue(const char* section, const char* key, float default_value = 0.0f) override; - bool GetBoolValue(const char* section, const char* key, bool default_value = false) override; - std::string GetStringValue(const char* section, const char* key, const char* default_value = "") override; + int GetIntValue(const char* section, const char* key, int default_value = 0); + float GetFloatValue(const char* section, const char* key, float default_value = 0.0f); + bool GetBoolValue(const char* section, const char* key, bool default_value = false); + std::string GetStringValue(const char* section, const char* key, const char* default_value = ""); - std::vector GetStringList(const char* section, const char* key) override; + std::vector GetStringList(const char* section, const char* key); };