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
/
NJOutputMapping.m
diff --git
a/Classes/NJOutputMapping.m
b/Classes/NJOutputMapping.m
index
efb7c00
..
cfcc34f
100644
(file)
--- a/
Classes/NJOutputMapping.m
+++ b/
Classes/NJOutputMapping.m
@@
-9,7
+9,6
@@
#import "EnjoyableApplicationDelegate.h"
#import "NJMapping.h"
#import "EnjoyableApplicationDelegate.h"
#import "NJMapping.h"
-#import "NJMappingsController.h"
@implementation NJOutputMapping
@implementation NJOutputMapping
@@
-34,7
+33,7
@@
- (void)trigger {
EnjoyableApplicationDelegate *ctrl = (EnjoyableApplicationDelegate *)NSApplication.sharedApplication.delegate;
if (_mapping) {
- (void)trigger {
EnjoyableApplicationDelegate *ctrl = (EnjoyableApplicationDelegate *)NSApplication.sharedApplication.delegate;
if (_mapping) {
- [ctrl.
mappings
Controller activateMapping:_mapping];
+ [ctrl.
input
Controller activateMapping:_mapping];
self.mappingName = _mapping.name;
} else {
// TODO: Show an error message? Unobtrusively since something
self.mappingName = _mapping.name;
} else {
// TODO: Show an error message? Unobtrusively since something