Merge device and mapping controllers into NJInputController.

[enjoyable.git] / Classes / NJOutput.m

diff --git a/Classes/NJOutput.m b/Classes/NJOutput.m
index 35a56d9..8b21164 100644 (file)
--- a/Classes/NJOutput.m
+++ b/Classes/NJOutput.m
@@ -36,8 +36,7 @@
     return [[self serialize] hash];
 }
 
-+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
-                  withMappings:(id <NSFastEnumeration>)mappings {
++ (NJOutput *)outputDeserialize:(NSDictionary *)serialization {
     // Don't crash loading old/bad mappings (but don't load them either).
     if (![serialization isKindOfClass:NSDictionary.class])
         return nil;
@@ -49,7 +48,7 @@
                         NJOutputMouseScroll.class
          ]) {
         if ([type isEqualToString:cls.serializationCode])
-            return [cls outputDeserialize:serialization withMappings:mappings];
+            return [cls outputDeserialize:serialization];
     }
     
     return nil;
@@ -61,7 +60,7 @@
 - (void)untrigger {
 }
 
-- (BOOL)update:(NJDeviceController *)jc {
+- (BOOL)update:(NJInputController *)jc {
     return NO;
 }
 
@@ -83,5 +82,7 @@
     }
 }
 
+- (void)postLoadProcess:(id <NSFastEnumeration>)allMappings {
+}
 
 @end