// Copyright 2009 University of Otago. All rights reserved.
//
-@class NJMappingsController;
-
#import "NJMappingMenuController.h"
#import "NJMappingsViewController.h"
#import "NJDeviceViewController.h"
-#import "NJOutputController.h"
-#import "NJDeviceController.h"
+#import "NJOutputViewController.h"
+#import "NJInputController.h"
@interface EnjoyableApplicationDelegate : NSObject <NSApplicationDelegate,
- NJDeviceControllerDelegate,
+ NJInputControllerDelegate,
NJDeviceViewControllerDelegate,
NJMappingsViewControllerDelegate,
+ NJOutputViewControllerDelegate,
NJMappingMenuDelegate,
NSWindowDelegate>
-@property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController;
-@property (nonatomic, strong) IBOutlet NJDeviceController *deviceController;
-@property (nonatomic, strong) IBOutlet NJOutputController *outputController;
+@property (nonatomic, strong) IBOutlet NJInputController *ic;
+@property (nonatomic, strong) IBOutlet NJOutputViewController *oc;
@property (nonatomic, strong) IBOutlet NJMappingsViewController *mvc;
@property (nonatomic, strong) IBOutlet NJDeviceViewController *dvc;