X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=JoystickController.h;h=cc0419fa833f48151970753029ccae3dc8b9c319;hp=aa95815bdd92b6cf8990422a14d2c5c7793411b6;hb=e24d2ce8323c713180d44933ca72cdb96ac356cd;hpb=61f8cdec21ab083b29c22aa11fda54d6005666ca

diff --git a/JoystickController.h b/JoystickController.h
index aa95815..cc0419f 100644
--- a/JoystickController.h
+++ b/JoystickController.h
@@ -6,34 +6,23 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-#import <IOKit/hid/IOHIDLib.h>
 @class Joystick;
+@class JSAction;
 @class ConfigsController;
-
 @class TargetController;
 
-@interface JoystickController : NSObject {
-	NSMutableArray *joysticks;
-    NSMutableArray *runningTargets;
-	IOHIDManagerRef hidManager;
-	IBOutlet NSOutlineView* outlineView;
-	IBOutlet TargetController* targetController;
-	IBOutlet ConfigsController* configsController;
-	id selectedAction;
-	BOOL programmaticallySelecting;
-    BOOL frontWindowOnly;
-    
-    @public
-    NSPoint mouseLoc;
+@interface JoystickController : NSObject <NSOutlineViewDataSource, NSOutlineViewDelegate> {
+	IBOutlet NSOutlineView *outlineView;
+	IBOutlet TargetController *targetController;
+	IBOutlet ConfigsController *configsController;
 }
 
--(void) setup;
--(Joystick*) findJoystickByRef: (IOHIDDeviceRef) device;
+- (void)setup;
+- (Joystick *)findJoystickByRef:(IOHIDDeviceRef)device;
 
-@property(readonly) id selectedAction;
-@property(readonly) NSMutableArray *joysticks;
-@property(readonly) NSMutableArray *runningTargets;
-@property(readwrite) BOOL frontWindowOnly;
+@property (nonatomic, readonly) JSAction *selectedAction;
+@property (nonatomic, assign) NSPoint mouseLoc;
+@property (nonatomic, assign) BOOL frontWindowOnly;
+@property (nonatomic, assign) BOOL sendingRealEvents;
 
 @end