X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJInput.h;h=ad7320ecbdfda3361acacd49da179059c2c949a7;hp=d63be1bd6e2028d94402f843b0d16336316f22df;hb=e7c0b2d96e9e3209b5ba80cc1fdc8e7213cb5302;hpb=53afd7c25f4423020c805c3587875cdce99ba3f4

diff --git a/Classes/NJInput.h b/Classes/NJInput.h
index d63be1b..ad7320e 100644
--- a/Classes/NJInput.h
+++ b/Classes/NJInput.h
@@ -8,17 +8,19 @@
 
 #import "NJInputPathElement.h"
 
-@interface NJInput : NSObject <NJInputPathElement>
+@interface NJInput : NJInputPathElement
 
-@property (nonatomic, assign) IOHIDElementCookie cookie;
-@property (nonatomic, copy) NSArray *children;
-@property (nonatomic, weak) id <NJInputPathElement> base;
-@property (nonatomic, copy) NSString *name;
+#define NJINPUT_EID(name, index) [[NSString alloc] initWithFormat:@"%s %d", name, index]
+#define NJINPUT_NAME(name, index) [[NSString alloc] initWithFormat:name, index]
+
+- (id)initWithName:(NSString *)name
+               eid:(NSString *)eid
+           element:(IOHIDElementRef)element
+            parent:(NJInputPathElement *)parent;
+
+@property (nonatomic, readonly) IOHIDElementCookie cookie;
 @property (nonatomic, assign) BOOL active;
 @property (nonatomic, assign) float magnitude;
-@property (readonly) NSString *uid;
-
-- (id)initWithName:(NSString *)newName base:(id <NJInputPathElement>)newBase;
 
 - (void)notifyEvent:(IOHIDValueRef)value;
 - (id)findSubInputForValue:(IOHIDValueRef)value;