diff options
| author | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-10-16 01:15:15 +0000 |
|---|---|---|
| committer | Sonicadvance1 <sonicadvance1@gmail.com> | 2008-10-16 01:15:15 +0000 |
| commit | dfd332e149b5b3b0338fa862c77b71f89867788c (patch) | |
| tree | d5f6aab03c1efd3db0ec346dca92eca499db9513 /Source/Plugins | |
| parent | b5b0a4efcbd87edf1c234335cc38893531106006 (diff) | |
Some more Work done with Microphone, added a Semi-decent way of checking for Mic Button
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@888 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins')
| -rw-r--r-- | Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp | 7 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_PadSimple/Src/PadSimple.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index 665bd51761..2557057f6e 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -459,6 +459,10 @@ void X11_Read(int _numPAD, SPADStatus* _pPADStatus) } if (KeyStatus[CTL_START]){_pPADStatus->button |= PAD_BUTTON_START;} + if (KeyStatus[CTL_MIC]) + _pPADStatus->MicButton = true; + else + _pPADStatus->MicButton = false; } @@ -630,7 +634,8 @@ void LoadConfig() XK_g, XK_f, XK_h, - XK_Shift_L //halfpress + XK_Shift_L, //halfpress + XK_p }; #endif IniFile file; diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h index 3d5a061bcf..8282302a69 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h @@ -42,6 +42,7 @@ enum CTL_DPADLEFT, CTL_DPADRIGHT, CTL_HALFPRESS, + CTL_MIC, NUMCONTROLS }; @@ -69,6 +70,7 @@ static const char* controlNames[] = "D-Pad_left", "D-Pad_right", "half_press_toggle", + "Mic-button", }; struct SPads { |