history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-21 04:05:40 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

SettingsInterface: Add SmallString overloads

Browse Source
This commit is contained in:
Stenzek
2024-04-07 20:41:24 +10:00
parent 6b7cf6a432
commit 631fca3042
9 changed files with 124 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/layered_settings_interface.cpp
View File

@ -103,6 +103,20 @@ bool LayeredSettingsInterface::GetStringValue(const char* section, const char* k
return false;
}
bool LayeredSettingsInterface::GetStringValue(const char* section, const char* key, SmallStringBase* value) const
{
for (u32 layer = FIRST_LAYER; layer <= LAST_LAYER; layer++)
{
if (SettingsInterface* sif = m_layers[layer]; sif != nullptr)
{
if (sif->GetStringValue(section, key, value))
return true;
}
}
return false;
}
void LayeredSettingsInterface::SetIntValue(const char* section, const char* key, int value)
{
Panic("Attempt to call SetIntValue() on layered settings interface");

1
src/common/layered_settings_interface.h
View File

@ -33,6 +33,7 @@ public:
bool GetDoubleValue(const char* section, const char* key, double* value) const override;
bool GetBoolValue(const char* section, const char* key, bool* value) const override;
bool GetStringValue(const char* section, const char* key, std::string* value) const override;
bool GetStringValue(const char* section, const char* key, SmallStringBase* value) const override;
void SetIntValue(const char* section, const char* key, s32 value) override;
void SetUIntValue(const char* section, const char* key, u32 value) override;

14
src/common/memory_settings_interface.cpp
View File

@ -126,6 +126,20 @@ bool MemorySettingsInterface::GetStringValue(const char* section, const char* ke
return true;
}
bool MemorySettingsInterface::GetStringValue(const char* section, const char* key, SmallStringBase* value) const
{
const auto sit = m_sections.find(section);
if (sit == m_sections.end())
return false;
const auto iter = sit->second.find(key);
if (iter == sit->second.end())
return false;
value->assign(iter->second);
return true;
}
void MemorySettingsInterface::SetIntValue(const char* section, const char* key, s32 value)
{
SetValue(section, key, std::to_string(value));

1
src/common/memory_settings_interface.h
View File

@ -22,6 +22,7 @@ public:
bool GetDoubleValue(const char* section, const char* key, double* value) const override;
bool GetBoolValue(const char* section, const char* key, bool* value) const override;
bool GetStringValue(const char* section, const char* key, std::string* value) const override;
bool GetStringValue(const char* section, const char* key, SmallStringBase* value) const override;
void SetIntValue(const char* section, const char* key, s32 value) override;
void SetUIntValue(const char* section, const char* key, u32 value) override;

48
src/common/settings_interface.h
View File

@ -3,7 +3,9 @@
#pragma once
#include "small_string.h"
#include "types.h"
#include <optional>
#include <string>
#include <vector>
@ -24,6 +26,7 @@ public:
virtual bool GetDoubleValue(const char* section, const char* key, double* value) const = 0;
virtual bool GetBoolValue(const char* section, const char* key, bool* value) const = 0;
virtual bool GetStringValue(const char* section, const char* key, std::string* value) const = 0;
virtual bool GetStringValue(const char* section, const char* key, SmallStringBase* value) const = 0;
virtual void SetIntValue(const char* section, const char* key, s32 value) = 0;
virtual void SetUIntValue(const char* section, const char* key, u32 value) = 0;
@ -82,6 +85,24 @@ public:
return value;
}
ALWAYS_INLINE SmallString GetSmallStringValue(const char* section, const char* key,
const char* default_value = "") const
{
SmallString value;
if (!GetStringValue(section, key, &value))
value.assign(default_value);
return value;
}
ALWAYS_INLINE SmallString GetTinyStringValue(const char* section, const char* key,
const char* default_value = "") const
{
TinyString value;
if (!GetStringValue(section, key, &value))
value.assign(default_value);
return value;
}
ALWAYS_INLINE std::optional<s32> GetOptionalIntValue(const char* section, const char* key,
std::optional<s32> default_value = std::nullopt)
{
@ -122,7 +143,32 @@ public:
std::optional<const char*> default_value = std::nullopt) const
{
std::string ret;
return GetStringValue(section, key, &ret) ? std::optional<std::string>(ret) : default_value;
return GetStringValue(section, key, &ret) ?
std::optional<std::string>(ret) :
(default_value.has_value() ? std::optional<std::string>(default_value.value()) :
std::optional<std::string>());
}
ALWAYS_INLINE std::optional<SmallString>
GetOptionalSmallStringValue(const char* section, const char* key,
std::optional<const char*> default_value = std::nullopt) const
{
SmallString ret;
return GetStringValue(section, key, &ret) ?
std::optional<SmallString>(ret) :
(default_value.has_value() ? std::optional<SmallString>(default_value.value()) :
std::optional<SmallString>());
}
ALWAYS_INLINE std::optional<TinyString>
GetOptionalTinyStringValue(const char* section, const char* key,
std::optional<const char*> default_value = std::nullopt) const
{
TinyString ret;
return GetStringValue(section, key, &ret) ?
std::optional<TinyString>(ret) :
(default_value.has_value() ? std::optional<TinyString>(default_value.value()) :
std::optional<TinyString>());
}
ALWAYS_INLINE void SetOptionalIntValue(const char* section, const char* key, const std::optional<s32>& value)