diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-07-03 08:04:10 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-07-03 08:04:10 +0000 |
| commit | 0bf3dfda036f1da0cb26e1f266ea500fbe74f872 (patch) | |
| tree | 309db5ac993b660eac11dfcc7332a08d47003474 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | |
| parent | 0dc8833396ab26377b4cd1ba952371e74b94e739 (diff) | |
New Wiimote Plugin: Added real wiimote support.(only tested on Windows, still a few probs: after refresh alt+F{5..8} x2 is needed) New Wiimote/GCPad: Re-merged Keyboard+Mouse for easier kb+mouse configuration, like before.(DirectInput doesn't support individual kb/mice anymore like I thought it did) Fixed some bugs and maybe leaks in GUI.(got rid of evil dynamic_cast) Renamed stuff from DirectInput to DInput, cause it's shorter and rhymes with XInput, I guess. (I remembered eol-style native, shuffle lost his job :P)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5822 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index 2888465487..cfdb114425 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -3,8 +3,8 @@ #ifdef CIFACE_USE_XINPUT #include "XInput/XInput.h" #endif -#ifdef CIFACE_USE_DIRECTINPUT - #include "DirectInput/DirectInput.h" +#ifdef CIFACE_USE_DINPUT + #include "DInput/DInput.h" #endif #ifdef CIFACE_USE_XLIB #include "Xlib/Xlib.h" @@ -30,8 +30,8 @@ void ControllerInterface::Init() if ( m_is_init ) return; -#ifdef CIFACE_USE_DIRECTINPUT - ciface::DirectInput::Init(m_devices); +#ifdef CIFACE_USE_DINPUT + ciface::DInput::Init(m_devices); #endif #ifdef CIFACE_USE_XINPUT ciface::XInput::Init(m_devices); @@ -88,7 +88,7 @@ void ControllerInterface::DeInit(const bool hacks_no_sdl_quit) #ifdef CIFACE_USE_XINPUT // nothing needed #endif -#ifdef CIFACE_USE_DIRECTINPUT +#ifdef CIFACE_USE_DINPUT // nothing needed #endif #ifdef CIFACE_USE_XLIB @@ -364,7 +364,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* // adding | to parse the last item, silly std::istringstream ss(ref->expression + '|'); - const std::string mode_chars("|&!#"); + const std::string mode_chars("|&!^"); ControlReference::DeviceControl devc; @@ -530,6 +530,7 @@ ControllerInterface::Device::Control* ControllerInterface::OutputReference::Dete // this loop is to make stuff like flashing keyboard LEDs work while (ms > (slept += 10)) { + // TODO: improve this to update more than just the default device's output device->UpdateOutput(); Common::SleepCurrentThread(10); } |