diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2014-09-14 23:42:32 -0400 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2014-10-03 12:02:52 -0400 |
| commit | c41b31d3ffed348909c3dca9e71318558f1af803 (patch) | |
| tree | 88743a72c02191d27a9ef595b495ac30c063647e /Source/Core/DolphinWX/Frame.cpp | |
| parent | 0d768bd55e5bc26db94d0b5747b37f47fde34a93 (diff) | |
Add wiimote tas input.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index bd98c974ca..374e98e99b 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -398,12 +398,11 @@ CFrame::CFrame(wxFrame* parent, m_LogWindow->Hide(); m_LogWindow->Disable(); - g_TASInputDlg[0] = new TASInputDlg(this); - g_TASInputDlg[1] = new TASInputDlg(this); - g_TASInputDlg[2] = new TASInputDlg(this); - g_TASInputDlg[3] = new TASInputDlg(this); + for (int i = 0; i < 8; ++i) + g_TASInputDlg[i] = new TASInputDlg(this); - Movie::SetInputManip(TASManipFunction); + Movie::SetGCInputManip(GCTASManipFunction); + Movie::SetWiiInputManip(WiiTASManipFunction); State::SetOnAfterLoadCallback(OnAfterLoadCallback); Core::SetOnStoppedCallback(OnStoppedCallback); @@ -974,15 +973,21 @@ void OnStoppedCallback() } } -void TASManipFunction(GCPadStatus* PadStatus, int controllerID) +void GCTASManipFunction(GCPadStatus* PadStatus, int controllerID) { if (main_frame) - main_frame->g_TASInputDlg[controllerID]->GetValues(PadStatus, controllerID); + main_frame->g_TASInputDlg[controllerID]->GetValues(PadStatus); +} + +void WiiTASManipFunction(u8* data, WiimoteEmu::ReportFeatures rptf, int controllerID) +{ + if (main_frame) + main_frame->g_TASInputDlg[controllerID + 4]->GetValues(data, rptf); } bool TASInputHasFocus() { - for (int i = 0; i < 4; i++) + for (int i = 0; i < 8; ++i) { if (main_frame->g_TASInputDlg[i]->TASHasFocus()) return true; |