X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJInputController.m;h=cd665de54b1f78718e669bbb77e4f24b96661eeb;hp=4ca33e1a1bc06dcfd1a940b8197bf152bda11802;hb=794a6e8c99be447b2ebc2b5510f7bf8ddeb4d75d;hpb=93d9951d6bd16b37e88b8fb6c38bc4afd6c9401e

diff --git a/Classes/NJInputController.m b/Classes/NJInputController.m
index 4ca33e1..cd665de 100644
--- a/Classes/NJInputController.m
+++ b/Classes/NJInputController.m
@@ -1,8 +1,6 @@
 //
-//  NJDeviceController.m
-//  Enjoy
-//
-//  Created by Sam McCall on 4/05/09.
+//  NJInputController.m
+//  Enjoyable
 //
 
 #import "NJInputController.h"
@@ -14,7 +12,7 @@
 #import "NJEvents.h"
 
 @implementation NJInputController {
-    NJHIDManager *_hidManager;
+    NJHIDManager *_HIDManager;
     NSTimer *_continuousOutputsTick;
     NSMutableArray *_continousOutputs;
     NSMutableArray *_devices;
@@ -30,7 +28,7 @@
         _devices = [[NSMutableArray alloc] initWithCapacity:16];
         _continousOutputs = [[NSMutableArray alloc] initWithCapacity:32];
         
-        _hidManager = [[NJHIDManager alloc] initWithCriteria:@[
+        _HIDManager = [[NJHIDManager alloc] initWithCriteria:@[
                        @{ NSSTR(kIOHIDDeviceUsagePageKey) : @(kHIDPage_GenericDesktop),
                        NSSTR(kIOHIDDeviceUsageKey) : @(kHIDUsage_GD_Joystick) },
                        @{ NSSTR(kIOHIDDeviceUsagePageKey) : @(kHIDPage_GenericDesktop),
@@ -108,10 +106,10 @@
     if (!handler)
         return;
     
-    [self.delegate deviceController:self didInput:handler];
+    [self.delegate inputController:self didInput:handler];
 }
 
-- (void)hidManager:(NJHIDManager *)manager
+- (void)HIDManager:(NJHIDManager *)manager
       valueChanged:(IOHIDValueRef)value
         fromDevice:(IOHIDDeviceRef)device {
     if (self.simulatingEvents
@@ -137,10 +135,10 @@
     [_devices addObject:device];
 }
 
-- (void)hidManager:(NJHIDManager *)manager deviceAdded:(IOHIDDeviceRef)device {
+- (void)HIDManager:(NJHIDManager *)manager deviceAdded:(IOHIDDeviceRef)device {
     NJDevice *match = [[NJDevice alloc] initWithDevice:device];
     [self addDevice:match];
-    [self.delegate deviceController:self didAddDevice:match];
+    [self.delegate inputController:self didAddDevice:match];
 }
 
 - (NJDevice *)findDeviceByRef:(IOHIDDeviceRef)device {
@@ -150,12 +148,12 @@
     return nil;
 }
 
-- (void)hidManager:(NJHIDManager *)manager deviceRemoved:(IOHIDDeviceRef)device {
+- (void)HIDManager:(NJHIDManager *)manager deviceRemoved:(IOHIDDeviceRef)device {
     NJDevice *match = [self findDeviceByRef:device];
     if (match) {
         NSInteger idx = [_devices indexOfObjectIdenticalTo:match];
         [_devices removeObjectAtIndex:idx];
-        [self.delegate deviceController:self didRemoveDeviceAtIndex:idx];
+        [self.delegate inputController:self didRemoveDeviceAtIndex:idx];
     }
 }
 
@@ -172,26 +170,26 @@
     }
 }
 
-- (void)hidManager:(NJHIDManager *)manager didError:(NSError *)error {
-    [self.delegate deviceController:self didError:error];
+- (void)HIDManager:(NJHIDManager *)manager didError:(NSError *)error {
+    [self.delegate inputController:self didError:error];
     self.simulatingEvents = NO;
 }
 
-- (void)hidManagerDidStart:(NJHIDManager *)manager {
-    [self.delegate deviceControllerDidStartHID:self];
+- (void)HIDManagerDidStart:(NJHIDManager *)manager {
+    [self.delegate inputControllerDidStartHID:self];
 }
 
-- (void)hidManagerDidStop:(NJHIDManager *)manager {
+- (void)HIDManagerDidStop:(NJHIDManager *)manager {
     [_devices removeAllObjects];
-    [self.delegate deviceControllerDidStopHID:self];
+    [self.delegate inputControllerDidStopHID:self];
 }
 
 - (void)startHid {
-    [_hidManager start];
+    [_HIDManager start];
 }
 
 - (void)stopHid {
-    [_hidManager stop];
+    [_HIDManager stop];
 }
 
 - (void)setSimulatingEvents:(BOOL)simulatingEvents {