X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FEnjoyableApplicationDelegate.h;h=020703636c7dddcd1669737739ffa7dc55ea1b7f;hp=3b1f2f44ccf17b61667e89444dd09b77d0a37d5f;hb=4fd28dc6483fd7c8323196abdbf4f1833a284e03;hpb=6cee2033d1c0fc0dacf444064305b9e7e87672a9

diff --git a/Classes/EnjoyableApplicationDelegate.h b/Classes/EnjoyableApplicationDelegate.h
index 3b1f2f4..0207036 100644
--- a/Classes/EnjoyableApplicationDelegate.h
+++ b/Classes/EnjoyableApplicationDelegate.h
@@ -6,24 +6,22 @@
 //  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;