ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Movie/Frame: Amend variable naming 

Amends variable naming related to translation unit locals and TAS input
dialogs that were modified in the previous commit.
This commit is contained in:
Lioncash 2017-04-02 02:34:38 -04:00
parent 7f0203a5b0
commit 678905764a
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/Movie.cpp
View File

@ -93,8 +93,8 @@ static bool s_bPolled = false;
static std::mutex s_input_display_lock; static std::mutex s_input_display_lock;
static std::string s_InputDisplay[8]; static std::string s_InputDisplay[8];
static GCManipFunction gcmfunc; static GCManipFunction s_gc_manip_func;
static WiiManipFunction wiimfunc; static WiiManipFunction s_wii_manip_func;
// NOTE: Host / CPU Thread // NOTE: Host / CPU Thread
static void EnsureTmpInputSize(size_t bound) static void EnsureTmpInputSize(size_t bound)
@ -1442,25 +1442,25 @@ void SaveRecording(const std::string& filename)
void SetGCInputManip(GCManipFunction func) void SetGCInputManip(GCManipFunction func)
{ {
gcmfunc = std::move(func); s_gc_manip_func = std::move(func);
} }
void SetWiiInputManip(WiiManipFunction func) void SetWiiInputManip(WiiManipFunction func)
{ {
wiimfunc = std::move(func); s_wii_manip_func = std::move(func);
} }
// NOTE: CPU Thread // NOTE: CPU Thread
void CallGCInputManip(GCPadStatus* PadStatus, int controllerID) void CallGCInputManip(GCPadStatus* PadStatus, int controllerID)
{ {
if (gcmfunc) if (s_gc_manip_func)
gcmfunc(PadStatus, controllerID); s_gc_manip_func(PadStatus, controllerID);
} }
// NOTE: CPU Thread // NOTE: CPU Thread
void CallWiiInputManip(u8* data, WiimoteEmu::ReportFeatures rptf, int controllerID, int ext, void CallWiiInputManip(u8* data, WiimoteEmu::ReportFeatures rptf, int controllerID, int ext,
const wiimote_key key) const wiimote_key key)
{ {
if (wiimfunc) if (s_wii_manip_func)
wiimfunc(data, rptf, controllerID, ext, key); s_wii_manip_func(data, rptf, controllerID, ext, key);
} }
// NOTE: GPU Thread // NOTE: GPU Thread

6
Source/Core/DolphinWX/Frame.cpp
View File

@ -502,15 +502,15 @@ void CFrame::BindEvents()
void CFrame::InitializeTASDialogs() void CFrame::InitializeTASDialogs()
{ {
for (int i = 0; i < 8; ++i) for (int i = 0; i < 8; ++i)
g_TASInputDlg[i] = new TASInputDlg(this); m_tas_input_dialogs[i] = new TASInputDlg(this);
Movie::SetGCInputManip([this](GCPadStatus* pad_status, int controller_id) { Movie::SetGCInputManip([this](GCPadStatus* pad_status, int controller_id) {
g_TASInputDlg[controller_id]->GetValues(pad_status); m_tas_input_dialogs[controller_id]->GetValues(pad_status);
}); });
Movie::SetWiiInputManip([this](u8* data, WiimoteEmu::ReportFeatures rptf, int controller_id, Movie::SetWiiInputManip([this](u8* data, WiimoteEmu::ReportFeatures rptf, int controller_id,
int ext, wiimote_key key) { int ext, wiimote_key key) {
g_TASInputDlg[controller_id + 4]->GetValues(data, rptf, ext, key); m_tas_input_dialogs[controller_id + 4]->GetValues(data, rptf, ext, key);
}); });
} }

2
Source/Core/DolphinWX/Frame.h
View File

@ -137,7 +137,7 @@ private:
CLogWindow* m_LogWindow = nullptr; CLogWindow* m_LogWindow = nullptr;
LogConfigWindow* m_LogConfigWindow = nullptr; LogConfigWindow* m_LogConfigWindow = nullptr;
FifoPlayerDlg* m_FifoPlayerDlg = nullptr; FifoPlayerDlg* m_FifoPlayerDlg = nullptr;
TASInputDlg* g_TASInputDlg[8]; TASInputDlg* m_tas_input_dialogs[8];
bool UseDebugger = false; bool UseDebugger = false;
bool m_bBatchMode = false; bool m_bBatchMode = false;
bool m_bEdit = false; bool m_bEdit = false;

13
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -369,17 +369,18 @@ void CFrame::OnTASInput(wxCommandEvent& event)
if (SConfig::GetInstance().m_SIDevice[i] != SerialInterface::SIDEVICE_NONE && if (SConfig::GetInstance().m_SIDevice[i] != SerialInterface::SIDEVICE_NONE &&
SConfig::GetInstance().m_SIDevice[i] != SerialInterface::SIDEVICE_GC_GBA) SConfig::GetInstance().m_SIDevice[i] != SerialInterface::SIDEVICE_GC_GBA)
{ {
g_TASInputDlg[i]->CreateGCLayout(); m_tas_input_dialogs[i]->CreateGCLayout();
g_TASInputDlg[i]->Show(); m_tas_input_dialogs[i]->Show();
g_TASInputDlg[i]->SetTitle(wxString::Format(_("TAS Input - GameCube Controller %d"), i + 1)); m_tas_input_dialogs[i]->SetTitle(
wxString::Format(_("TAS Input - GameCube Controller %d"), i + 1));
} }
if (g_wiimote_sources[i] == WIIMOTE_SRC_EMU && if (g_wiimote_sources[i] == WIIMOTE_SRC_EMU &&
!(Core::IsRunning() && !SConfig::GetInstance().bWii)) !(Core::IsRunning() && !SConfig::GetInstance().bWii))
{ {
g_TASInputDlg[i + 4]->CreateWiiLayout(i); m_tas_input_dialogs[i + 4]->CreateWiiLayout(i);
g_TASInputDlg[i + 4]->Show(); m_tas_input_dialogs[i + 4]->Show();
g_TASInputDlg[i + 4]->SetTitle(wxString::Format(_("TAS Input - Wii Remote %d"), i + 1)); m_tas_input_dialogs[i + 4]->SetTitle(wxString::Format(_("TAS Input - Wii Remote %d"), i + 1));
} }
} }
} }