X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJOutputController.m;h=f8ed2ea8cbc6ec4c50bbfad0ea2e4ebe94756fca;hp=22c387fc9490107a4bee3a0d89e8fc7ef23556bc;hb=93d9951d6bd16b37e88b8fb6c38bc4afd6c9401e;hpb=6a8c6539cc3f7a4b32a9f226da6ae06074e4f0cb diff --git a/Classes/NJOutputController.m b/Classes/NJOutputController.m index 22c387f..f8ed2ea 100644 --- a/Classes/NJOutputController.m +++ b/Classes/NJOutputController.m @@ -7,11 +7,10 @@ #import "NJOutputController.h" -#import "NJMappingsController.h" #import "NJMapping.h" #import "NJInput.h" #import "NJEvents.h" -#import "NJDeviceController.h" +#import "NJInputController.h" #import "NJKeyInputField.h" #import "NJOutputMapping.h" #import "NJOutputController.h" @@ -159,7 +158,7 @@ } - (NJOutput *)currentOutput { - return mappingsController.currentMapping[_input]; + return inputController.currentMapping[_input]; } - (NJOutput *)makeOutput { @@ -177,7 +176,7 @@ break; case 2: { NJOutputMapping *c = [[NJOutputMapping alloc] init]; - c.mapping = mappingsController.mappings[mappingPopup.indexOfSelectedItem]; + c.mapping = inputController.mappings[mappingPopup.indexOfSelectedItem]; return c; } case 3: { @@ -205,8 +204,8 @@ - (void)commit { [self cleanUpInterface]; - mappingsController.currentMapping[_input] = [self makeOutput]; - [mappingsController save]; + inputController.currentMapping[_input] = [self makeOutput]; + [inputController save]; } - (BOOL)enabled {