X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JSAction.h;h=94d56f012583e1451f39014b6db0b2857324d10c;hp=1e60cf2e11f3ec9bb86d80e13e5f225918e9fbd9;hb=25dd74a4a34f4ba7ec797360bd8f92cbd7bc758e;hpb=5a79f9f05829ca1aecc70aeadb8c980ec4f3556d

diff --git a/JSAction.h b/JSAction.h
index 1e60cf2..94d56f0 100644
--- a/JSAction.h
+++ b/JSAction.h
@@ -6,28 +6,23 @@
 //  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;
-}
+@interface JSAction : NSObject
 
-@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 (weak) id base;
+@property (copy) NSString *name;
+@property (assign) BOOL active;
+@property (readonly) float magnitude;
+@property (readonly) NSString *uid;
 
--(void) notifyEvent: (IOHIDValueRef) value;
--(NSString*) stringify;
--(NSArray*) subActions;
--(id) findSubActionForValue: (IOHIDValueRef) value;
+- (id)initWithName:(NSString *)newName base:(JSAction *)newBase;
+
+- (void)notifyEvent:(IOHIDValueRef)value;
+- (id)findSubActionForValue:(IOHIDValueRef)value;
 
 @end