piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-28 08:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

New GCPad/Wiimote: Hopefully fixed lock up issues with DirectInput devices. Wiimote tilt should work with keyboard keys/gamepad buttons now as well as IR Forward/Backward(which was added). Made input detection buttons display "[ waiting ]" while waiting for input. minor fixes/cleanups.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5651 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-06-12 02:08:01 +00:00
parent d937b73d9c
commit ff5081942a
9 changed files with 121 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Plugins/InputPluginCommon/Src/ConfigDiag.cpp
View File

@ -384,29 +384,41 @@ void GamepadPage::ClearControl( wxCommandEvent& event )
void ControlDialog::DetectControl( wxCommandEvent& event )
{
wxButton* const btn = (wxButton*)event.GetEventObject();
// some hacks
wxChar num = ((wxButton*)event.GetEventObject())->GetLabel()[0];
if ( num > '9' )
const wxString lbl = btn->GetLabel();
wxChar num = lbl[0];
if (num > '9')
{
num = 1;
btn->SetLabel(wxT("[ waiting ]"));
}
else
{
num -= 0x30;
btn->SetLabel(wxT("w"));
}
g_plugin->controls_crit.Enter(); // enter
if ( control_reference->Detect( DETECT_WAIT_TIME, num ) ) // if we got input, update gui
if ( control_reference->Detect( DETECT_WAIT_TIME + (num - 1) * 500, num ) ) // if we got input, update gui
control_chooser->UpdateListSelection();
g_plugin->controls_crit.Leave(); // leave
btn->SetLabel(lbl);
}
void GamepadPage::DetectControl( wxCommandEvent& event )
{
ControlButton* btn = (ControlButton*)event.GetEventObject();
btn->SetLabel(wxT("[ waiting ]"));
g_plugin->controls_crit.Enter(); // enter
btn->control_reference->Detect( DETECT_WAIT_TIME );
btn->SetLabel( wxString::FromAscii( btn->control_reference->control_qualifier.name.c_str() ) );
g_plugin->controls_crit.Leave(); // leave
btn->SetLabel(wxString::FromAscii(btn->control_reference->control_qualifier.name.c_str()));
}
void ControlDialog::SelectControl( wxCommandEvent& event )