diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-04-13 05:15:38 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-04-13 05:15:38 +0000 |
| commit | d8906d2a0ca92b636b2e228da6431621e0cc9479 (patch) | |
| tree | bc07102268a7af7d6ab987045a0da8db5b861fa4 /Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp | |
| parent | 9592da1a9ba32d5574e210df93c36a5913ee0427 (diff) | |
Commited my new wiimote plugin work so far. Some code was copied from the current wiimote plugin. I have cleaned up most of the functions, but there are still a bunch of unused structs and stuff that I need to clean up.
Moved ControllerInterface to InputCommon. Moved GCPadNew GUI/Config code to a new project, InputPluginCommon. It is used by both GCPadNew and WiimoteNew. I hope that I included everyone's fixes to GCPadNew and ControllerInterface.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5355 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp new file mode 100644 index 0000000000..2334db121c --- /dev/null +++ b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp @@ -0,0 +1,35 @@ +#include "../ControllerInterface.h" + +#ifdef CIFACE_USE_DIRECTINPUT + +#include "DirectInput.h" + +#pragma comment(lib, "Dinput8.lib") +#pragma comment(lib, "dxguid.lib") + +namespace ciface +{ +namespace DirectInput +{ + +void Init( std::vector<ControllerInterface::Device*>& devices/*, HWND hwnd*/ ) +{ + IDirectInput8* idi8; + if ( DI_OK != DirectInput8Create( GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (LPVOID*)&idi8, NULL ) ) + return; + +#ifdef CIFACE_USE_DIRECTINPUT_KBM + InitKeyboardMouse( idi8, devices ); +#endif +#ifdef CIFACE_USE_DIRECTINPUT_JOYSTICK + InitJoystick( idi8, devices/*, hwnd*/ ); +#endif + + idi8->Release(); + +} + +} +} + +#endif |