actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix logging. Also fix typo.

Browse Source
This commit is contained in:
Steve Checkoway
2008-10-05 08:54:10 +00:00
parent 5fc76284c1
commit f525c5ca8d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/InputHandler/InputHandler_MacOSX_HID.cpp
+5 -3
View File
@@ -14,7 +14,7 @@
REGISTER_INPUT_HANDLER_CLASS2( HID, MacOSX_HID ); REGISTER_INPUT_HANDLER_CLASS2( HID, MacOSX_HID );
void InputHandler_MacOSX_HID::QueueCallBack( void *target, int result, void *refcon, void *sender ) void InputHandler_MacOSX_HID::QueueCallback( void *target, int result, void *refcon, void *sender )
{ {
// The result seems useless as you can't actually return anything... // The result seems useless as you can't actually return anything...
// refcon is the Device number // refcon is the Device number
@@ -27,9 +27,11 @@ void InputHandler_MacOSX_HID::QueueCallBack( void *target, int result, void *ref
HIDDevice *dev = This->m_vDevices[int( refcon )]; HIDDevice *dev = This->m_vDevices[int( refcon )];
vector<DeviceInput> vPresses; vector<DeviceInput> vPresses;
LOG->Trace( "Got event with cookie %p, value %d", event.elementCookie, int(event.value) );
while( (result = CALL(queue, getNextEvent, &event, zeroTime, 0)) == kIOReturnSuccess ) while( (result = CALL(queue, getNextEvent, &event, zeroTime, 0)) == kIOReturnSuccess )
{
LOG->Trace( "Got event with cookie %p, value %d", event.elementCookie, int(event.value) );
dev->GetButtonPresses( vPresses, event.elementCookie, event.value, now ); dev->GetButtonPresses( vPresses, event.elementCookie, event.value, now );
}
FOREACH_CONST( DeviceInput, vPresses, i ) FOREACH_CONST( DeviceInput, vPresses, i )
INPUTFILTER->ButtonPressed( *i ); INPUTFILTER->ButtonPressed( *i );
} }
@@ -111,7 +113,7 @@ void InputHandler_MacOSX_HID::StartDevices()
ASSERT( m_LoopRef ); ASSERT( m_LoopRef );
FOREACH( HIDDevice *, m_vDevices, i ) FOREACH( HIDDevice *, m_vDevices, i )
(*i)->StartQueue( m_LoopRef, InputHandler_MacOSX_HID::QueueCallBack, this, n++ ); (*i)->StartQueue( m_LoopRef, InputHandler_MacOSX_HID::QueueCallback, this, n++ );
CFRunLoopSourceRef runLoopSource = IONotificationPortGetRunLoopSource( m_NotifyPort ); CFRunLoopSourceRef runLoopSource = IONotificationPortGetRunLoopSource( m_NotifyPort );
stepmania/src/arch/InputHandler/InputHandler_MacOSX_HID.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
void GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevicesOut ); void GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevicesOut );
RString GetDeviceSpecificInputString( const DeviceInput &di ); RString GetDeviceSpecificInputString( const DeviceInput &di );
wchar_t DeviceButtonToChar( DeviceButton button, bool bUseCurrentKeyModifiers ); wchar_t DeviceButtonToChar( DeviceButton button, bool bUseCurrentKeyModifiers );
static void QueueCallBack( void *target, int result, void *refcon, void *sender ); static void QueueCallback( void *target, int result, void *refcon, void *sender );
}; };