This commit is contained in:
Steve Checkoway
2005-10-17 11:53:20 +00:00
parent 19631fe280
commit d070a41916
@@ -79,7 +79,7 @@ public:
JoystickDevice(); JoystickDevice();
~JoystickDevice(); ~JoystickDevice();
bool Open( io_object_t device, int foo, void *bar ); bool Open( io_object_t device );
// returns the number of IDs assigned starting from startID // returns the number of IDs assigned starting from startID
int AssignJoystickIDs( int startID ); int AssignJoystickIDs( int startID );
void StartQueue(CFRunLoopRef loopRef, int num, InputHandler_Carbon *handler); void StartQueue(CFRunLoopRef loopRef, int num, InputHandler_Carbon *handler);
@@ -92,7 +92,7 @@ JoystickDevice::JoystickDevice() : mInterface(NULL), mQueue(NULL), mRunning(fals
{ {
} }
bool JoystickDevice::Open( io_object_t device, int foo, void *bar ) bool JoystickDevice::Open( io_object_t device )
{ {
IOReturn ret; IOReturn ret;
CFMutableDictionaryRef properties; CFMutableDictionaryRef properties;
@@ -602,7 +602,7 @@ InputHandler_Carbon::InputHandler_Carbon() : mSem("Input thread started")
{ {
JoystickDevice *jd = new JoystickDevice; JoystickDevice *jd = new JoystickDevice;
if( jd->Open(device, 0, this) ) if( jd->Open(device) )
{ {
id += jd->AssignJoystickIDs( id ); id += jd->AssignJoystickIDs( id );
mDevices.push_back( jd ); mDevices.push_back( jd );