X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJDeviceController.h;h=e594f1058ed6a3dfbb85b794ee81eaab90038cc3;hp=7658c64afc615bc3c78aca4daf649aa40d4c97f1;hb=6cee2033d1c0fc0dacf444064305b9e7e87672a9;hpb=0064c1fbff36795885a9724081af2a17d83c20a3

diff --git a/Classes/NJDeviceController.h b/Classes/NJDeviceController.h
index 7658c64..e594f10 100644
--- a/Classes/NJDeviceController.h
+++ b/Classes/NJDeviceController.h
@@ -6,26 +6,37 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
+#import "NJHIDManager.h"
+
 @class NJDevice;
 @class NJInput;
+@class NJInputPathElement;
 @class NJMappingsController;
-@class NJOutputController;
 
-@interface NJDeviceController : NSObject <NSOutlineViewDataSource, NSOutlineViewDelegate> {
-    IBOutlet NSOutlineView *outlineView;
-    IBOutlet NJOutputController *outputController;
+@protocol NJDeviceControllerDelegate;
+
+@interface NJDeviceController : NSObject <NJHIDManagerDelegate> {
     IBOutlet NJMappingsController *mappingsController;
-    IBOutlet NSButton *translatingEventsButton;
-    IBOutlet NSMenuItem *translatingEventsMenu;
 }
 
-@property (nonatomic, readonly) NJInput *selectedInput;
+@property (nonatomic, weak) IBOutlet id <NJDeviceControllerDelegate> delegate;
+
 @property (nonatomic, assign) NSPoint mouseLoc;
-@property (nonatomic, assign) BOOL translatingEvents;
+@property (nonatomic, assign) BOOL simulatingEvents;
+
+- (NJDevice *)objectAtIndexedSubscript:(NSUInteger)idx;
+- (NJInputPathElement *)objectForKeyedSubscript:(NSString *)uid;
+- (NSUInteger)count;
+
+@end
 
-- (void)setup;
-- (NJDevice *)findDeviceByRef:(IOHIDDeviceRef)device;
+@protocol NJDeviceControllerDelegate
 
-- (IBAction)translatingEventsChanged:(id)sender;
+- (void)deviceController:(NJDeviceController *)dc didAddDevice:(NJDevice *)device;
+- (void)deviceController:(NJDeviceController *)dc didRemoveDeviceAtIndex:(NSInteger)idx;
+- (void)deviceController:(NJDeviceController *)dc didInput:(NJInput *)input;
+- (void)deviceControllerDidStartHID:(NJDeviceController *)dc;
+- (void)deviceControllerDidStopHID:(NJDeviceController *)dc;
+- (void)deviceController:(NJDeviceController *)dc didError:(NSError *)error;
 
 @end