X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Joystick.h;h=4b60ba84d75c563d14763f8d9cb9b32bd78ce7b1;hp=04c5686f42d5ec955c934ddbf791a48d1504f636;hb=19f40be5b645e44ffb55bdce0b6cc5c5615f68e7;hpb=e68c19b5923618b763543c74bf8dd6f85d4d323e

diff --git a/Joystick.h b/Joystick.h
index 04c5686..4b60ba8 100644
--- a/Joystick.h
+++ b/Joystick.h
@@ -6,20 +6,16 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import <IOKit/hid/IOHIDBase.h>
-
 @class JSAction;
 
 @interface Joystick : NSObject
 
-@property (assign) int vendorId;
-@property (assign) int productId;
-@property (assign) int index;
-@property (copy) NSString *productName;
-@property (assign) IOHIDDeviceRef device;
-@property (copy) NSArray *children;
-@property (readonly) NSString *name;
+@property (nonatomic, assign) int index;
+@property (nonatomic, copy) NSString *productName;
+@property (nonatomic, assign) IOHIDDeviceRef device;
+@property (nonatomic, copy) NSArray *children;
+@property (nonatomic, readonly) NSString *name;
+@property (readonly) NSString *uid;
 
 - (id)initWithDevice:(IOHIDDeviceRef)device;
 - (id)handlerForEvent:(IOHIDValueRef)value;