projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge device and mapping controllers into NJInputController.
[enjoyable.git]
/
Classes
/
NJOutputController.m
diff --git
a/Classes/NJOutputController.m
b/Classes/NJOutputController.m
index
22c387f
..
f8ed2ea
100644
(file)
--- a/
Classes/NJOutputController.m
+++ b/
Classes/NJOutputController.m
@@
-7,11
+7,10
@@
#import "NJOutputController.h"
#import "NJOutputController.h"
-#import "NJMappingsController.h"
#import "NJMapping.h"
#import "NJInput.h"
#import "NJEvents.h"
#import "NJMapping.h"
#import "NJInput.h"
#import "NJEvents.h"
-#import "NJ
Device
Controller.h"
+#import "NJ
Input
Controller.h"
#import "NJKeyInputField.h"
#import "NJOutputMapping.h"
#import "NJOutputController.h"
#import "NJKeyInputField.h"
#import "NJOutputMapping.h"
#import "NJOutputController.h"
@@
-159,7
+158,7
@@
}
- (NJOutput *)currentOutput {
}
- (NJOutput *)currentOutput {
- return
mappings
Controller.currentMapping[_input];
+ return
input
Controller.currentMapping[_input];
}
- (NJOutput *)makeOutput {
}
- (NJOutput *)makeOutput {
@@
-177,7
+176,7
@@
break;
case 2: {
NJOutputMapping *c = [[NJOutputMapping alloc] init];
break;
case 2: {
NJOutputMapping *c = [[NJOutputMapping alloc] init];
- c.mapping =
mappings
Controller.mappings[mappingPopup.indexOfSelectedItem];
+ c.mapping =
input
Controller.mappings[mappingPopup.indexOfSelectedItem];
return c;
}
case 3: {
return c;
}
case 3: {
@@
-205,8
+204,8
@@
- (void)commit {
[self cleanUpInterface];
- (void)commit {
[self cleanUpInterface];
-
mappings
Controller.currentMapping[_input] = [self makeOutput];
- [
mappings
Controller save];
+
input
Controller.currentMapping[_input] = [self makeOutput];
+ [
input
Controller save];
}
- (BOOL)enabled {
}
- (BOOL)enabled {