mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-25 15:31:17 +01:00
f106a9637d
Core::PauseAndLock requires all calls to it to be balanced, like this:
const bool was_unpaused = Core::PauseAndLock(true);
// do stuff on the CPU thread
Core::PauseAndLock(false, was_unpaused);
Aside from being a bit cumbersome, it turns out all callers really
don't need to know about was_unpaused at all. They just need to do
something on the CPU thread safely, including locking/unlocking.
So this commit replaces Core::PauseAndLock with a function that
makes both the purpose and the scope of what is being run on the
CPU thread visually clear. This makes it harder to accidentally run
something on the wrong thread, or forget the second call to
PauseAndLock to unpause, or forget that it needs to be passed
was_unpaused at the end.
We also don't need comments to indicate code X is being run on the
CPU thread anymore, as the function name makes it obvious.
91 lines
2.8 KiB
C++
91 lines
2.8 KiB
C++
// Copyright 2010 Dolphin Emulator Project
|
|
// Licensed under GPLv2+
|
|
// Refer to the license.txt file included.
|
|
|
|
#include "DolphinWX/Config/GCAdapterConfigDiag.h"
|
|
|
|
#include <wx/checkbox.h>
|
|
#include <wx/sizer.h>
|
|
#include <wx/stattext.h>
|
|
|
|
#include "Common/CommonTypes.h"
|
|
#include "Core/ConfigManager.h"
|
|
#include "Core/Core.h"
|
|
#include "InputCommon/GCAdapter.h"
|
|
|
|
wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent);
|
|
|
|
GCAdapterConfigDiag::GCAdapterConfigDiag(wxWindow* const parent, const wxString& name,
|
|
const int tab_num)
|
|
: wxDialog(parent, wxID_ANY, name), m_pad_id(tab_num)
|
|
{
|
|
wxCheckBox* const gamecube_rumble = new wxCheckBox(this, wxID_ANY, _("Rumble"));
|
|
gamecube_rumble->SetValue(SConfig::GetInstance().m_AdapterRumble[m_pad_id]);
|
|
gamecube_rumble->Bind(wxEVT_CHECKBOX, &GCAdapterConfigDiag::OnAdapterRumble, this);
|
|
|
|
wxCheckBox* const gamecube_konga = new wxCheckBox(this, wxID_ANY, _("Simulate DK Bongos"));
|
|
gamecube_konga->SetValue(SConfig::GetInstance().m_AdapterKonga[m_pad_id]);
|
|
gamecube_konga->Bind(wxEVT_CHECKBOX, &GCAdapterConfigDiag::OnAdapterKonga, this);
|
|
|
|
m_adapter_status = new wxStaticText(this, wxID_ANY, _("Adapter Not Detected"));
|
|
|
|
if (!GCAdapter::IsDetected())
|
|
{
|
|
if (!GCAdapter::IsDriverDetected())
|
|
{
|
|
m_adapter_status->SetLabelText(_("Driver Not Detected"));
|
|
gamecube_rumble->Disable();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
m_adapter_status->SetLabelText(_("Adapter Detected"));
|
|
}
|
|
GCAdapter::SetAdapterCallback(std::bind(&GCAdapterConfigDiag::ScheduleAdapterUpdate, this));
|
|
|
|
const int space5 = FromDIP(5);
|
|
|
|
wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
|
|
szr->Add(m_adapter_status, 0, wxEXPAND);
|
|
szr->Add(gamecube_rumble, 0, wxEXPAND);
|
|
szr->Add(gamecube_konga, 0, wxEXPAND);
|
|
szr->AddSpacer(space5);
|
|
szr->Add(CreateButtonSizer(wxCLOSE | wxNO_DEFAULT), 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
|
|
szr->AddSpacer(space5);
|
|
|
|
SetSizerAndFit(szr);
|
|
Center();
|
|
|
|
Bind(wxEVT_ADAPTER_UPDATE, &GCAdapterConfigDiag::OnUpdateAdapter, this);
|
|
}
|
|
|
|
GCAdapterConfigDiag::~GCAdapterConfigDiag()
|
|
{
|
|
GCAdapter::SetAdapterCallback(nullptr);
|
|
}
|
|
|
|
void GCAdapterConfigDiag::ScheduleAdapterUpdate()
|
|
{
|
|
wxQueueEvent(this, new wxCommandEvent(wxEVT_ADAPTER_UPDATE));
|
|
}
|
|
|
|
void GCAdapterConfigDiag::OnUpdateAdapter(wxCommandEvent& WXUNUSED(event))
|
|
{
|
|
Core::RunAsCPUThread([this] {
|
|
if (GCAdapter::IsDetected())
|
|
m_adapter_status->SetLabelText(_("Adapter Detected"));
|
|
else
|
|
m_adapter_status->SetLabelText(_("Adapter Not Detected"));
|
|
});
|
|
}
|
|
|
|
void GCAdapterConfigDiag::OnAdapterRumble(wxCommandEvent& event)
|
|
{
|
|
SConfig::GetInstance().m_AdapterRumble[m_pad_id] = event.IsChecked();
|
|
}
|
|
|
|
void GCAdapterConfigDiag::OnAdapterKonga(wxCommandEvent& event)
|
|
{
|
|
SConfig::GetInstance().m_AdapterKonga[m_pad_id] = event.IsChecked();
|
|
}
|