diff examples/iAudioDB/AppController.h @ 692:02756c5ca15a

* Added interface elements for query start selection
* Added logic for sec/vector conversion.

--- a/examples/iAudioDB/AppController.h	Fri Mar 12 14:46:22 2010 +0000
+++ b/examples/iAudioDB/AppController.h	Thu Apr 22 15:43:26 2010 +0000
@@ -9,9 +9,8 @@
 #import <Cocoa/Cocoa.h>
 #include <audioDB_API.h>
 
-
 @interface AppController : NSObject {
-	adb_t *db;
+	adb_ptr db;
 	NSModalSession session;
 	
 	NSString* dbName;
@@ -21,47 +20,28 @@
 	NSString* selectedFilename;
 	
 	IBOutlet NSTextField *statusField;
-	IBOutlet NSTableView* tracksView;
+	IBOutlet NSTableView *tracksView;
 	IBOutlet id mainWindow;
 
-	// Query Customizing
+	// Querying
+	IBOutlet NSTextField* queryKey;
+	IBOutlet NSButton* playBothButton;
+	IBOutlet NSButton* playResultButton;
+	IBOutlet NSButton* stopButton;
+	IBOutlet NSButton* chooseButton;
 	
-	IBOutlet NSButton* multipleCheckBox;
-	IBOutlet NSButton* resetButton;
-	IBOutlet NSTextField* queryLengthVectors;
-	IBOutlet NSTextField* queryLengthSeconds;
-	IBOutlet NSTextField* queryPath;
-	IBOutlet NSButton* queryButton;
-	
-	// Main window buttons/fields.
-	
-	IBOutlet NSToolbarItem* importAudioButton;
-	IBOutlet NSToolbarItem* performQueryButton;
-	IBOutlet NSToolbarItem* playBothButton;
-	IBOutlet NSToolbarItem* playResultButton;
-	IBOutlet NSToolbarItem* stopButton;
-	IBOutlet NSTextField* queryKey;
-	
-	NSSound* queryTrack;
-	NSSound* resultTrack;
-	
-	// Creating
-	IBOutlet id createSheet;
-	IBOutlet id querySheet;
-	
-	IBOutlet NSMatrix* extractorOptions;
-	IBOutlet NSTextField* windowSizeField;
-	IBOutlet NSTextField* hopSizeField;
-	IBOutlet NSTextField* maxTracksField;
-	IBOutlet NSTextField* maxLengthField;
+	NSMutableArray* results;
+	NSDictionary* trackMap;
 	
 	// Extracting
 	IBOutlet id importSheet;
+	IBOutlet NSBox* extractingBox;
+	IBOutlet NSMatrix* extractorOptions;
 	IBOutlet NSProgressIndicator* indicator;
 	
-	NSMutableArray* results;
-	NSDictionary* trackMap;
-	NSDictionary* dbState;
+	// Playback
+	NSSound* queryTrack;
+	NSSound* resultTrack;
 	
 	// Query param fields
 	
@@ -72,26 +52,17 @@
 	 IBOutlet NSTextField* queryLengthField;
 	 IBOutlet NSTextField* queryRadiusField;
 	 IBOutlet NSButtonCell* exhaustiveField;*/
+	
 }
 
 //  Menus
 -(IBAction)newDatabase:(id)sender;
 -(IBAction)openDatabase:(id)sender;
+-(IBAction)selectFiles:(id)sender;
 
 // Import
 -(IBAction)importAudio:(id)sender;
-// -(IBAction)cancelImport:(id)sender;
-
-// Create
--(IBAction)cancelCreate:(id)sender;
--(IBAction)createDatabase:(id)sender;
-
-// Query
--(IBAction)pathAction:(id)sender;
--(IBAction)cancelQuery:(id)sender;
--(IBAction)performQuery:(id)sender;
--(IBAction)selectQueryFile:(id)sender;
--(IBAction)resetLengths:(id)sender;
+-(IBAction)cancelImport:(id)sender;
 
 // Buttons
 -(IBAction)playBoth:(id)sender;
@@ -99,9 +70,9 @@
 -(IBAction)stopPlay:(id)sender;
 -(IBAction)chooseQuery:(id)sender;
 -(IBAction)selectedChanged:(id)sender;
--(IBAction)tableDoubleClick:(id)sender;
 
--(void)reset;
+
+-(void)performQuery;
 -(void)updateStatus;
 - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem;
 - (void)sound:(NSSound *)sound didFinishPlaying:(BOOL)playbackSuccessful;