summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/ControllerInterface
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2010-04-27 15:50:54 +0000
committerShawn Hoffman <godisgovernment@gmail.com>2010-04-27 15:50:54 +0000
commitc7634aa8dc620222560ae7d916d2c047fe592241 (patch)
tree6608b9c0882a450258b272cc9a622b2262afdec1 /Source/Core/InputCommon/Src/ControllerInterface
parented71457d46cb7347ee5a4104e92e7ef84e9ac377 (diff)
osx input: remove some debug code...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5418 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface')
-rw-r--r--Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm7
-rw-r--r--Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXMouse.mm7
2 files changed, 1 insertions, 13 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm
index 0388bbd2d7..67498c4752 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm
+++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm
@@ -53,13 +53,6 @@ Keyboard::Keyboard(IOHIDDeviceRef device)
try { inputs.push_back(new Key(e)); }
catch (std::bad_alloc&) { /*Thrown if the key is reserved*/ }
}
-
- ////
- NSDictionary *melements;
- kern_return_t err = kIOReturnSuccess;
- if ((err = IOHIDDeviceCopyValueMultiple(m_device, elements, (CFDictionaryRef *)&melements)) != kIOReturnSuccess)
- NSLog(@"FAILBOAT %x", err);
- ////
CFRelease(elements);
}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXMouse.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXMouse.mm
index 87810a42e6..b5b288ec1f 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXMouse.mm
+++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXMouse.mm
@@ -163,12 +163,7 @@ ControlState Mouse::Axis::GetState(IOHIDDeviceRef device)
!int_value)
return false;
- float actual_value = 0;
-
- if (int_value < 0)
- actual_value = abs(int_value) / m_range;
- else if (int_value > 0)
- actual_value = int_value / m_range;
+ float actual_value = abs(int_value) / m_range;
//NSLog(@"%s %i %f", m_name.c_str(), int_value, actual_value);