X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Joystick.h;h=1c254a75abb01112ef70ad0e1277e028c5b2d749;hp=587ad3fdc1bcfe7a115bd4229eb16d30eda28779;hb=d442b81606d83ebf913f43d7c3fc5c885c0bbe30;hpb=530009447c5bbd360ac5023979cffc6d32a28df3

diff --git a/Joystick.h b/Joystick.h
index 587ad3f..1c254a7 100644
--- a/Joystick.h
+++ b/Joystick.h
@@ -6,31 +6,19 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
 @class JSAction;
 
-@interface Joystick : NSObject {
-	int vendorId;
-	int productId;
-	int index;
-	NSString* productName;
-	IOHIDDeviceRef device;
-	NSMutableArray* children;
-	NSString* name;
-}
+@interface Joystick : NSObject
 
-@property(readwrite) int vendorId;
-@property(readwrite) int productId;
-@property(readwrite) int index;
-@property(readwrite, copy) NSString* productName;
-@property(readwrite) IOHIDDeviceRef device;
-@property(readonly) NSArray* children;
-@property(readonly) NSString* name;
+@property (assign) int index;
+@property (copy) NSString *productName;
+@property (assign) IOHIDDeviceRef device;
+@property (copy) NSArray *children;
+@property (readonly) NSString *name;
+@property (readonly) NSString *uid;
 
--(void) populateActions;
--(void) invalidate;
--(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