Merge device and mapping controllers into NJInputController.

[enjoyable.git] / Classes / NJOutputController.h

diff --git a/Classes/NJOutputController.h b/Classes/NJOutputController.h
index 3974e2e..b22afdb 100644 (file)
--- a/Classes/NJOutputController.h
+++ b/Classes/NJOutputController.h
@@ -8,10 +8,9 @@
 
 #import "NJKeyInputField.h"
 
-@class NJMappingsController;
-@class NJDeviceController;
+@class NJInputController;
 @class NJOutput;
-@class NJOutputMouseMove;
+@class NJInput;
 
 @interface NJOutputController : NSObject <NJKeyInputFieldDelegate> {
     IBOutlet NJKeyInputField *keyInput;
@@ -23,15 +22,14 @@
     IBOutlet NSSlider *scrollSpeedSlider;
     IBOutlet NSTextField *title;
     IBOutlet NSPopUpButton *mappingPopup;
-    IBOutlet NJMappingsController *mappingsController;
-    IBOutlet NJDeviceController *inputController;
+    IBOutlet NJInputController *inputController;
     IBOutlet NSButton *smoothCheck;
     IBOutlet NSButton *unknownMapping;
 }
 
 @property (assign) BOOL enabled;
 
-- (void)loadCurrent;
+- (void)loadInput:(NJInput *)input;
 - (IBAction)radioChanged:(id)sender;
 - (IBAction)mdirChanged:(id)sender;
 - (IBAction)mbtnChanged:(id)sender;