Merge pull request #4836 from lioncash/enum

DSPCore: Convert the DSPCoreState enum into an enum class
This commit is contained in:
Matthew Parlane
2017-02-07 09:14:22 +13:00
committed by GitHub
5 changed files with 29 additions and 29 deletions

View File

@ -115,22 +115,22 @@ DSPDebuggerLLE::~DSPDebuggerLLE()
void DSPDebuggerLLE::OnChangeState(wxCommandEvent& event)
{
const DSP::DSPCoreState dsp_state = DSP::DSPCore_GetState();
const DSP::State dsp_state = DSP::DSPCore_GetState();
if (dsp_state == DSP::DSPCORE_STOP)
if (dsp_state == DSP::State::Stopped)
return;
switch (event.GetId())
{
case ID_RUNTOOL:
if (dsp_state == DSP::DSPCORE_RUNNING)
DSP::DSPCore_SetState(DSP::DSPCORE_STEPPING);
if (dsp_state == DSP::State::Running)
DSP::DSPCore_SetState(DSP::State::Stepping);
else
DSP::DSPCore_SetState(DSP::DSPCORE_RUNNING);
DSP::DSPCore_SetState(DSP::State::Running);
break;
case ID_STEPTOOL:
if (dsp_state == DSP::DSPCORE_STEPPING)
if (dsp_state == DSP::State::Stepping)
{
DSP::DSPCore_Step();
Repopulate();
@ -175,7 +175,7 @@ void DSPDebuggerLLE::FocusOnPC()
void DSPDebuggerLLE::UpdateState()
{
if (DSP::DSPCore_GetState() == DSP::DSPCORE_RUNNING)
if (DSP::DSPCore_GetState() == DSP::State::Running)
{
m_Toolbar->SetToolLabel(ID_RUNTOOL, _("Pause"));
m_Toolbar->SetToolBitmap(