Merge device and mapping controllers into NJInputController.

[enjoyable.git] / Classes / NJOutputMouseScroll.m

diff --git a/Classes/NJOutputMouseScroll.m b/Classes/NJOutputMouseScroll.m
index 6fdc918..b2775a8 100644 (file)
--- a/Classes/NJOutputMouseScroll.m
+++ b/Classes/NJOutputMouseScroll.m
@@ -21,8 +21,7 @@
               };
 }
 
-+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
-                  withMappings:(id <NSFastEnumeration>)mappings {
++ (NJOutput *)outputDeserialize:(NSDictionary *)serialization {
     NJOutputMouseScroll *output = [[NJOutputMouseScroll alloc] init];
     output.direction = [serialization[@"direction"] intValue];
     output.speed = [serialization[@"speed"] floatValue];
@@ -53,7 +52,7 @@
     }
 }
 
-- (BOOL)update:(NJDeviceController *)jc {
+- (BOOL)update:(NJInputController *)jc {
     if (self.magnitude < 0.05f)
         return NO; // dead zone