diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2010-04-25 18:04:55 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2010-04-25 18:04:55 +0000 |
| commit | 452c2e711abbe40b8b4da72dedbf292992fd35f0 (patch) | |
| tree | 8822e4677217240db4649a2b3a533821753ca303 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | |
| parent | a443ec7d8d32cbbe616b4d0775944b7ccdf5b1e4 (diff) | |
First OSX keyboard stuff...works, with limitations:\nNo Mouse support yet (Add gamepad via IOKit as well?)\nCould poll less for less cpu time\nDon't know why rumble events don't seem to be sent to the class until right before it's deleted (Billiard?)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5407 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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index d1b97c7e37..4d2dad502c 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -43,7 +43,7 @@ void ControllerInterface::Init() ciface::Xlib::Init( m_devices, m_hwnd ); #endif #ifdef CIFACE_USE_OSX - ciface::OSX::Init( m_devices, m_hwnd ); + ciface::OSX::Init( m_devices ); #endif #ifdef CIFACE_USE_SDL ciface::SDL::Init( m_devices ); @@ -89,7 +89,7 @@ void ControllerInterface::DeInit() // nothing needed #endif #ifdef CIFACE_USE_OSX - // nothing needed + ciface::OSX::DeInit(); #endif #ifdef CIFACE_USE_SDL // there seems to be some sort of memory leak with SDL, quit isn't freeing everything up |