X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJInput.m;h=d7144a041969b234ba37e2aef1d77091972b0bb5;hp=077dac86158748c377fa8181e8b0886661ebc301;hb=58ce8f7f50f382f18e7b416eca737803af284868;hpb=0064c1fbff36795885a9724081af2a17d83c20a3

diff --git a/Classes/NJInput.m b/Classes/NJInput.m
index 077dac8..d7144a0 100644
--- a/Classes/NJInput.m
+++ b/Classes/NJInput.m
@@ -9,20 +9,22 @@
 
 @implementation NJInput
 
-- (id)initWithName:(NSString *)newName base:(id <NJInputPathElement>)newBase {
-    if ((self = [super init])) {
-        self.name = newName;
-        self.base = newBase;
+- (id)initWithName:(NSString *)name
+               eid:(NSString *)eid
+           element:(IOHIDElementRef)element
+            parent:(NJInputPathElement *)parent
+{
+    NSString *elementName = (__bridge NSString *)IOHIDElementGetName(element);
+    if (elementName.length)
+        name = [name stringByAppendingFormat:@"- %@", elementName];
+    if ((self = [super initWithName:name eid:eid parent:parent])) {
+        _cookie = IOHIDElementGetCookie(element);
     }
     return self;
 }
 
 - (id)findSubInputForValue:(IOHIDValueRef)value {
-    return NULL;
-}
-
-- (NSString *)uid {
-    return [NSString stringWithFormat:@"%@~%@", [_base uid], _name];
+    return nil;
 }
 
 - (void)notifyEvent:(IOHIDValueRef)value {