X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Joystick.h;h=831b10b6f3a3e15a93a38bde8bd9c665d32f9081;hp=99587a7f50ba4bc292c8ecca16fb8a841ad51bb9;hb=25dd74a4a34f4ba7ec797360bd8f92cbd7bc758e;hpb=d2b45b2c32dcc7c3cc553b62252ca48842e08d48

diff --git a/Joystick.h b/Joystick.h
index 99587a7..831b10b 100644
--- a/Joystick.h
+++ b/Joystick.h
@@ -6,7 +6,9 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
+#import <IOKit/hid/IOHIDBase.h>
+
 @class JSAction;
 
 @interface Joystick : NSObject
@@ -16,12 +18,12 @@
 @property (assign) int index;
 @property (copy) NSString *productName;
 @property (assign) IOHIDDeviceRef device;
-@property (readonly) NSArray *children;
+@property (copy) NSArray *children;
 @property (readonly) NSString *name;
+@property (readonly) NSString *uid;
 
--(void) populateActions;
--(id) handlerForEvent: (IOHIDValueRef) value;
--(id)initWithDevice: (IOHIDDeviceRef) newDevice;
--(JSAction*) actionForEvent: (IOHIDValueRef) value;
+- (id)initWithDevice:(IOHIDDeviceRef)device;
+- (id)handlerForEvent:(IOHIDValueRef)value;
+- (JSAction *)actionForEvent:(IOHIDValueRef)value;
 
 @end