Wiimote: Fixed the dual mode bug I mentioned in the last commit, now the Nunchuck should not get stuck when switching between the real and emulated Nunchuck. The only important problem left is disconnect problem that occurs about one in five times you switch to the real wiimote.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2130 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-02-07 04:19:52 +00:00
parent fcdd2a8e17
commit 382b4af74b
6 changed files with 88 additions and 51 deletions

View File

@ -60,15 +60,15 @@ class ConfigDialog : public wxDialog
void DoRecordMovement(u8 _x, u8 _y, u8 _z, const u8 *_IR, int IRBytes);
void DoRecordA(bool Pressed);
void ConvertToString();
wxTimer *m_TimeoutTimer, *m_ShutDownTimer, *m_TimeoutATimer;
wxTimer *m_TimeoutTimer, *m_ShutDownTimer, *m_TimeoutOnce;
void Update(wxTimerEvent& WXUNUSED(event));
void ShutDown(wxTimerEvent& WXUNUSED(event));
void UpdateA(wxTimerEvent& WXUNUSED(event));
void UpdateOnce(wxTimerEvent& event);
private:
DECLARE_EVENT_TABLE();
bool ControlsCreated; int Page, BoxW, BoxH;
bool ControlsCreated, m_bEnableUseRealWiimote; int Page, BoxW, BoxH;
wxNotebook *m_Notebook;
wxPanel *m_Controller[4], *m_PageRecording;
@ -131,7 +131,7 @@ class ConfigDialog : public wxDialog
ID_CLOSE = 1000,
ID_APPLY,
ID_ABOUTOGL,
IDTM_EXIT, IDTM_UPDATE, IDTM_SHUTDOWN, IDTM_UPDATEA, // Timer
IDTM_EXIT, IDTM_UPDATE, IDTM_SHUTDOWN, IDTM_UPDATE_ONCE, // Timer
ID_NOTEBOOK, ID_CONTROLLERPAGE1, ID_CONTROLLERPAGE2, ID_CONTROLLERPAGE3, ID_CONTROLLERPAGE4, ID_PAGE_RECORDING,