jprdonnelly/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-05-07 06:00:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use structs for config callback IDs

Browse Source 
This way you can't mix up regular config callback IDs and CPU thread
config callback IDs. (It would be rather bad if you did!)
This commit is contained in:
JosJuice
2023-08-16 21:37:12 +02:00
parent 1104b93ee4
commit 7197e3abd0
17 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/CPUThreadConfigCallback.cpp
View File

@@ -13,7 +13,10 @@ namespace
{
std::atomic<bool> s_should_run_callbacks = false;
static std::vector<std::pair<size_t, Config::ConfigChangedCallback>> s_callbacks;
static std::vector<
std::pair<CPUThreadConfigCallback::ConfigChangedCallbackID, Config::ConfigChangedCallback>>
s_callbacks;
static size_t s_next_callback_id = 0;
void RunCallbacks()
@@ -39,19 +42,19 @@ void OnConfigChanged()
namespace CPUThreadConfigCallback
{
size_t AddConfigChangedCallback(Config::ConfigChangedCallback func)
ConfigChangedCallbackID AddConfigChangedCallback(Config::ConfigChangedCallback func)
{
DEBUG_ASSERT(Core::IsCPUThread());
static size_t s_config_changed_callback_id = Config::AddConfigChangedCallback(&OnConfigChanged);
static auto s_config_changed_callback_id = Config::AddConfigChangedCallback(&OnConfigChanged);
const size_t callback_id = s_next_callback_id;
const ConfigChangedCallbackID callback_id{s_next_callback_id};
++s_next_callback_id;
s_callbacks.emplace_back(std::make_pair(callback_id, std::move(func)));
return callback_id;
}
void RemoveConfigChangedCallback(size_t callback_id)
void RemoveConfigChangedCallback(ConfigChangedCallbackID callback_id)
{
DEBUG_ASSERT(Core::IsCPUThread());