projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
App delegate now controls communication between device / mapping controllers and...
[enjoyable.git]
/
Classes
/
NJOutputController.m
diff --git
a/Classes/NJOutputController.m
b/Classes/NJOutputController.m
index
5235837
..
1567fee
100644
(file)
--- a/
Classes/NJOutputController.m
+++ b/
Classes/NJOutputController.m
@@
-20,7
+20,9
@@
#import "NJOutputMouseMove.h"
#import "NJOutputMouseScroll.h"
#import "NJOutputMouseMove.h"
#import "NJOutputMouseScroll.h"
-@implementation NJOutputController
+@implementation NJOutputController {
+ NJInput *_input;
+}
- (id)init {
if ((self = [super init])) {
- (id)init {
if ((self = [super init])) {
@@
-157,7
+159,7
@@
}
- (NJOutput *)currentOutput {
}
- (NJOutput *)currentOutput {
- return mappingsController.currentMapping[
inputController.selectedI
nput];
+ return mappingsController.currentMapping[
_i
nput];
}
- (NJOutput *)makeOutput {
}
- (NJOutput *)makeOutput {
@@
-203,7
+205,7
@@
- (void)commit {
[self cleanUpInterface];
- (void)commit {
[self cleanUpInterface];
- mappingsController.currentMapping[
inputController.selectedI
nput] = [self makeOutput];
+ mappingsController.currentMapping[
_i
nput] = [self makeOutput];
[mappingsController save];
}
[mappingsController save];
}
@@
-272,8
+274,9
@@
[self cleanUpInterface];
}
[self cleanUpInterface];
}
-- (void)loadCurrent {
- [self loadOutput:self.currentOutput forInput:inputController.selectedInput];
+- (void)loadInput:(NJInput *)input {
+ _input = input;
+ [self loadOutput:self.currentOutput forInput:input];
}
- (void)focusKey {
}
- (void)focusKey {
@@
-299,7
+302,7
@@
}
- (void)mappingDidChange:(NSNotification *)note {
}
- (void)mappingDidChange:(NSNotification *)note {
- [self load
Curren
t];
+ [self load
Input:_inpu
t];
}
@end
}
@end