X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJDevice.m;h=a5efd96fed9453e2afd4e76341282d1793cce1ef;hp=e2a0efa6608923fb2f91451f5992181f3b99a39a;hb=79b05c3cf1c75bc4f7078acde43aaf4215c6408a;hpb=8f3613a31e2012374e00a6973f221421e0b770f0

diff --git a/Classes/NJDevice.m b/Classes/NJDevice.m
index e2a0efa..a5efd96 100644
--- a/Classes/NJDevice.m
+++ b/Classes/NJDevice.m
@@ -66,7 +66,7 @@ static NSArray *InputsForElement(IOHIDDeviceRef device, id base) {
 }
 
 - (id)initWithDevice:(IOHIDDeviceRef)dev {
-    if ((self = [super init])) {
+    if ((self = [super initWithName:nil did:nil base:nil])) {
         self.device = dev;
         self.productName = (__bridge NSString *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDProductKey));
         vendorId = [(__bridge NSNumber *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDVendorIDKey)) intValue];
@@ -89,7 +89,7 @@ static NSArray *InputsForElement(IOHIDDeviceRef device, id base) {
 }
 
 - (NJInput *)findInputByCookie:(IOHIDElementCookie)cookie {
-    for (NJInput *child in _children)
+    for (NJInput *child in self.children)
         if (child.cookie == cookie)
             return child;
     return nil;
@@ -106,28 +106,4 @@ static NSArray *InputsForElement(IOHIDDeviceRef device, id base) {
     return [self findInputByCookie:cookie];
 }
 
-- (BOOL)isEqual:(id)object {
-    return [object isKindOfClass:NJDevice.class]
-        && [[object uid] isEqualToString:self.uid];
-}
-
-- (NSUInteger)hash {
-    return self.uid.hash;
-}
-
-- (id <NJInputPathElement>)elementForUID:(NSString *)uid {
-    if ([uid isEqualToString:self.uid])
-        return self;
-    else if (![uid hasPrefix:self.uid])
-        return nil;
-    else {
-        for (id <NJInputPathElement> elem in self.children) {
-            id <NJInputPathElement> ret = [elem elementForUID:uid];
-            if (ret)
-                return ret;
-        }
-    }
-    return nil;
-}
-
 @end