diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-02-08 18:25:25 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-02-08 18:25:25 +0000 |
| commit | c3dbbb1f238e46562971bfc4ef28c1defa9aaeaf (patch) | |
| tree | 4c6c304c9d0d8792f294c7e86f5fbb40b9fc3645 /Source/Plugins | |
| parent | 175abfef0ae730c34fd01305ad9605fa39bca8c4 (diff) | |
Mic device WIP. define USE_PORTAUDIO and link with portaudio to test it.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2153 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins')
| -rw-r--r-- | Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj | 1 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj b/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj index 8e3e8453ef..3bf74a252b 100644 --- a/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj +++ b/Source/Plugins/Plugin_PadSimple/Plugin_PadSimple.vcproj @@ -590,6 +590,7 @@ LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="false"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index ffdbb23ad3..c54c62260b 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -334,6 +334,8 @@ void DInput_Read(int _numPAD, SPADStatus* _pPADStatus) if (dinput.diks[pad[_numPAD].keyForControl[CTL_DPADLEFT]] & 0xFF){_pPADStatus->button |= PAD_BUTTON_LEFT;} if (dinput.diks[pad[_numPAD].keyForControl[CTL_DPADRIGHT]]& 0xFF){_pPADStatus->button |= PAD_BUTTON_RIGHT;} if (dinput.diks[pad[_numPAD].keyForControl[CTL_START]] & 0xFF){_pPADStatus->button |= PAD_BUTTON_START;} + + _pPADStatus->MicButton = (dinput.diks[pad[_numPAD].keyForControl[CTL_MIC]] & 0xFF) ? true : false; } bool XInput_Read(int XPadPlayer, SPADStatus* _pPADStatus) @@ -381,6 +383,8 @@ bool XInput_Read(int XPadPlayer, SPADStatus* _pPADStatus) if (xpad.wButtons & XINPUT_GAMEPAD_DPAD_UP) {_pPADStatus->button |= PAD_BUTTON_UP;} if (xpad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN) {_pPADStatus->button |= PAD_BUTTON_DOWN;} + //_pPADStatus->MicButton = (xpad.wButtons & XINPUT_GAMEPAD_LEFT_SHOULDER) ? true : false; + return true; } else @@ -742,7 +746,8 @@ void LoadConfig() DIK_G, DIK_F, DIK_H, - DIK_LSHIFT + DIK_LSHIFT, //halfpress + DIK_M //Mic }; #elif defined(HAVE_X11) && HAVE_X11 const int defaultKeyForControl[NUMCONTROLS] = @@ -768,7 +773,7 @@ void LoadConfig() XK_f, XK_h, XK_Shift_L, //halfpress - XK_p + XK_p //Mic }; #elif defined(HAVE_COCOA) && HAVE_COCOA const int defaultKeyForControl[NUMCONTROLS] = @@ -794,7 +799,7 @@ void LoadConfig() 3, 4, 56, //halfpress - 35 + 35 //Mic }; #endif IniFile file; |