X-Git-Url: https://git.yukkurigames.com/?a=blobdiff_plain;f=JSAction.h;h=8e52e9c4594b6fc1849e652c8d786d0c3ed0e3df;hb=51d43664909060e85c943c4d63cc3cff307ceb1d;hp=1e60cf2e11f3ec9bb86d80e13e5f225918e9fbd9;hpb=5a79f9f05829ca1aecc70aeadb8c980ec4f3556d;p=enjoyable.git

diff --git a/JSAction.h b/JSAction.h
index 1e60cf2..8e52e9c 100644
--- a/JSAction.h
+++ b/JSAction.h
@@ -6,28 +6,24 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-#import <IOKit/hid/IOHIDLib.h>
+#import <Foundation/Foundation.h>
+#import <IOKit/hid/IOHIDBase.h>
 
 @interface JSAction : NSObject {
-	int usage, index;
-	void* cookie;
-	NSArray *subActions;
 	id base;
 	NSString *name;
 }
 
-@property(readwrite) int usage;
-@property(readwrite) void* cookie;
-@property(readonly) int index;
-@property(copy) NSArray* subActions;
-@property(readwrite, strong) id base;
-@property(copy) NSString* name;
-@property(readonly) BOOL active;
+@property (assign) void* cookie;
+@property (assign) int index;
+@property (copy) NSArray *children;
+@property (strong) id base;
+@property (copy) NSString *name;
+@property (assign) BOOL active;
+@property (readonly) float magnitude;
 
--(void) notifyEvent: (IOHIDValueRef) value;
--(NSString*) stringify;
--(NSArray*) subActions;
--(id) findSubActionForValue: (IOHIDValueRef) value;
+- (void)notifyEvent:(IOHIDValueRef)value;
+- (NSString *)stringify;
+- (id)findSubActionForValue:(IOHIDValueRef)value;
 
 @end