X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JSAction.h;h=dc00a8d8749eca6f84c6c3f30ebc5a50b21936f1;hp=50e37e2311a1092bd44b8747b4d82d36f831788d;hb=f563321aec9e13b8479ab3b890a9179f095a8b17;hpb=530009447c5bbd360ac5023979cffc6d32a28df3

diff --git a/JSAction.h b/JSAction.h
index 50e37e2..dc00a8d 100644
--- a/JSAction.h
+++ b/JSAction.h
@@ -6,28 +6,21 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-#import <IOKit/hid/IOHIDLib.h>
+#import "NJActionPathElement.h"
 
-@interface JSAction : NSObject {
-	int usage, index;
-	void* cookie;
-	NSArray* subActions;
-	id base;
-	NSString* name;
-}
+@interface JSAction : NSObject <NJActionPathElement>
 
-@property(readwrite) int usage;
-@property(readwrite) void* cookie;
-@property(readonly) int index;
-@property(readonly) NSArray* subActions;
-@property(readwrite, retain) id base;
-@property(readonly) NSString* name;
-@property(readonly) BOOL active;
+@property (nonatomic, assign) IOHIDElementCookie cookie;
+@property (nonatomic, copy) NSArray *children;
+@property (nonatomic, weak) id base;
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, assign) BOOL active;
+@property (nonatomic, readonly) float magnitude;
+@property (readonly) NSString *uid;
 
--(void) notifyEvent: (IOHIDValueRef) value;
--(NSString*) stringify;
--(NSArray*) subActions;
--(id) findSubActionForValue: (IOHIDValueRef) value;
+- (id)initWithName:(NSString *)newName base:(id <NJActionPathElement>)newBase;
+
+- (void)notifyEvent:(IOHIDValueRef)value;
+- (id)findSubActionForValue:(IOHIDValueRef)value;
 
 @end