Add support for sound backends & some miniaudio changes (#4978)
Miniaudio now runs everything in a separate audio thread - this uses boost::asio's io_context. Our miniaudio implementation is now also much simplified - it does not use its own resource manager or device. This might end up being stupid if sounds don't work after changing output device or locking or w/e I've made the sound controller into an interface, meaning we can support multiple sound backends in Chatterino. I've added a Null sound backend that disables all sound. A QMediaPlayer or QSoundEffect or Qt backend could be added. Miniaudio might idle & disable the device now too, not sure I've added some unrelated changes in the form of a new setting type, and a new setting page helper function for it, which will hopefully make adding new enum settings easier in the future. This setting stores its value as a string instead of an int, and uses magic_enum to convert between that string value and its enum value.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <magic_enum.hpp>
|
||||
#include <pajlada/settings.hpp>
|
||||
#include <QString>
|
||||
|
||||
@@ -85,4 +86,58 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Setters in this class allow for bad values, it's only the enum-specific getters that are protected.
|
||||
* If you get a QString from this setting, it will be the raw value from the settings file.
|
||||
* Use the explicit Enum conversions or getEnum to get a typed check with a default
|
||||
**/
|
||||
template <typename Enum>
|
||||
class EnumStringSetting : public pajlada::Settings::Setting<QString>
|
||||
{
|
||||
public:
|
||||
EnumStringSetting(const std::string &path, const Enum &defaultValue_)
|
||||
: pajlada::Settings::Setting<QString>(path)
|
||||
, defaultValue(defaultValue_)
|
||||
{
|
||||
_registerSetting(this->getData());
|
||||
}
|
||||
|
||||
template <typename T2>
|
||||
EnumStringSetting<Enum> &operator=(Enum newValue)
|
||||
{
|
||||
std::string enumName(magic_enum::enum_name(newValue));
|
||||
auto qEnumName = QString::fromStdString(enumName);
|
||||
|
||||
this->setValue(qEnumName.toLower());
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
EnumStringSetting<Enum> &operator=(QString newValue)
|
||||
{
|
||||
this->setValue(newValue.toLower());
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
operator Enum()
|
||||
{
|
||||
return this->getEnum();
|
||||
}
|
||||
|
||||
Enum getEnum()
|
||||
{
|
||||
return magic_enum::enum_cast<Enum>(this->getValue().toStdString(),
|
||||
magic_enum::case_insensitive)
|
||||
.value_or(this->defaultValue);
|
||||
}
|
||||
|
||||
Enum defaultValue;
|
||||
|
||||
using pajlada::Settings::Setting<QString>::operator==;
|
||||
using pajlada::Settings::Setting<QString>::operator!=;
|
||||
|
||||
using pajlada::Settings::Setting<QString>::operator QString;
|
||||
};
|
||||
|
||||
} // namespace chatterino
|
||||
|
||||
Reference in New Issue
Block a user