X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ApplicationController.h;h=88c9d29c72fc7b5c3d5607ba92740ee2713b5b36;hp=581abc2b95b371c2b900eab99bc3ac4b0056a0a4;hb=e2a4d830dd9817f6a515a3b1b6aa152d3bb98c2b;hpb=3a40cba25b9bb38887fe4809277d4c0f73462d12

diff --git a/ApplicationController.h b/ApplicationController.h
index 581abc2..88c9d29 100644
--- a/ApplicationController.h
+++ b/ApplicationController.h
@@ -6,13 +6,11 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-
-@class JoystickController;
+@class NJInputController;
 @class TargetController;
-@class ConfigsController;
+@class NJMappingsController;
 
-@interface ApplicationController : NSObject {
+@interface ApplicationController : NSObject <NSApplicationDelegate> {
     IBOutlet NSDrawer *drawer;
     IBOutlet NSWindow *mainWindow;
     IBOutlet NSToolbarItem *activeButton;
@@ -20,13 +18,11 @@
     IBOutlet NSMenu *dockMenuBase;
 }
 
-@property (strong) IBOutlet JoystickController *jsController;
-@property (strong) IBOutlet TargetController *targetController;
-@property (strong) IBOutlet ConfigsController *configsController;
-@property (assign) BOOL active;
+@property (nonatomic, strong) IBOutlet NJInputController *inputController;
+@property (nonatomic, strong) IBOutlet TargetController *targetController;
+@property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController;
 
 - (IBAction)toggleActivity:(id)sender;
-- (void)configsChanged;
-- (void)configChanged;
+- (void)mappingsChanged;
 
 @end