Output view controller now has a delegate rather than a direct reference to the input...

[enjoyable.git] / Classes / EnjoyableApplicationDelegate.h

diff --git a/Classes/EnjoyableApplicationDelegate.h b/Classes/EnjoyableApplicationDelegate.h
index 52869f2..0207036 100644 (file)
--- a/Classes/EnjoyableApplicationDelegate.h
+++ b/Classes/EnjoyableApplicationDelegate.h
@@ -6,33 +6,33 @@
 //  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> {
-    IBOutlet NSMenu *dockMenu;
-    IBOutlet NSMenu *statusItemMenu;
-    IBOutlet NSWindow *window;
-}
+                                                    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;
 
+@property (nonatomic, strong) IBOutlet NSMenu *dockMenu;
+@property (nonatomic, strong) IBOutlet NSMenu *statusItemMenu;
+@property (nonatomic, strong) IBOutlet NSWindow *window;
+@property (nonatomic, strong) IBOutlet NSButton *simulatingEventsButton;
+
 - (IBAction)restoreToForeground:(id)sender;
 - (IBAction)importMappingClicked:(id)sender;
 - (IBAction)exportMappingClicked:(id)sender;
+- (IBAction)simulatingEventsChanged:(NSButton *)sender;
 
 @end