X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJInput.m;h=d7144a041969b234ba37e2aef1d77091972b0bb5;hp=a279322583d4a19e9fedb83513b2b30da138e0cc;hb=794a6e8c99be447b2ebc2b5510f7bf8ddeb4d75d;hpb=53afd7c25f4423020c805c3587875cdce99ba3f4

diff --git a/Classes/NJInput.m b/Classes/NJInput.m
index a279322..d7144a0 100644
--- a/Classes/NJInput.m
+++ b/Classes/NJInput.m
@@ -9,10 +9,16 @@
 
 @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;
 }
@@ -21,10 +27,6 @@
     return nil;
 }
 
-- (NSString *)uid {
-    return [NSString stringWithFormat:@"%@~%@", _base.uid, _name];
-}
-
 - (void)notifyEvent:(IOHIDValueRef)value {
     [self doesNotRecognizeSelector:_cmd];
 }