X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJInput.h;h=b530c371bd23e0c04ab91e1f6d2474f62bceb15f;hp=380e85858ad4a67cb182d75afecb119c9e2e4a25;hb=eb9ae7c6c0504f07fe058e9be43ec26763be4591;hpb=0064c1fbff36795885a9724081af2a17d83c20a3

diff --git a/Classes/NJInput.h b/Classes/NJInput.h
index 380e858..b530c37 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 base;
-@property (nonatomic, copy) NSString *name;
+#define NJINPUT_DID(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;