X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Joystick.h;h=e5566f1e78451d924b7923dba646b701a4102d35;hp=04c5686f42d5ec955c934ddbf791a48d1504f636;hb=0238d141f06420e1a73eccd14ca73a7e29ad2a69;hpb=e68c19b5923618b763543c74bf8dd6f85d4d323e

diff --git a/Joystick.h b/Joystick.h
index 04c5686..e5566f1 100644
--- a/Joystick.h
+++ b/Joystick.h
@@ -6,23 +6,21 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import <IOKit/hid/IOHIDBase.h>
+#import "NJActionPathElement.h"
 
 @class JSAction;
 
-@interface Joystick : NSObject
+@interface Joystick : NSObject <NJActionPathElement>
 
-@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;
+- (JSAction *)handlerForEvent:(IOHIDValueRef)value;
 - (JSAction *)actionForEvent:(IOHIDValueRef)value;
 
 @end