GCPad/New Wiimote Plugin: Individual keyboard and mouse devices are now listed on Windows(2 player with 2 keyboards possible). Improved the ability to map multiple inputs to the same control. Inputs from different devices can be mapped to the same button (example: Mouse Left and XInput A). More advanced mappings such as "Button 1 or 2 and NOT button 3" are possible. I hope the GUI after right clicking a button isn't too confusing(may change it to be a bit more user friendly). Hopefully, I didn't break OSX stuff by 'const'ing a few functions.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5757 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.h b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.h
index 7edbe3abf8..9f4a045a55 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.h
@@ -9,18 +9,18 @@
 #include <Windows.h>
 #include <dinput.h>
 
-#ifdef CIFACE_USE_DIRECTINPUT_JOYSTICK
-	#include "DirectInputJoystick.h"
-#endif
-#ifdef CIFACE_USE_DIRECTINPUT_KBM
-	#include "DirectInputKeyboardMouse.h"
-#endif
+#include <list>
 
 namespace ciface
 {
 namespace DirectInput
 {
 
+//BOOL CALLBACK DIEnumEffectsCallback(LPCDIEFFECTINFO pdei, LPVOID pvRef);
+BOOL CALLBACK DIEnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef);
+BOOL CALLBACK DIEnumDevicesCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef);
+std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device);
+
 void Init( std::vector<ControllerInterface::Device*>& devices/*, HWND hwnd*/ );
 
 }