comparison examples/iAudioDB/AppController.m @ 739:040f14b5a5fc

Tweak to file extensions and playback

 {
 	[self cancelCreate:self];
 	
 	NSSavePanel* panel = [NSSavePanel savePanel];
 	[panel setCanSelectHiddenExtension:YES];
-	[panel setAllowedFileTypes:[NSArray arrayWithObjects:@"adb", nil]];
+	[panel setAllowedFileTypes:[NSArray arrayWithObject:@"adb"]];
 	NSInteger response = [panel runModalForDirectory:NSHomeDirectory() file:@""];
 	 
 	[results removeAllObjects];
 	[tracksView reloadData];
 	 

 	[queryLengthVectors setEnabled:NO];
 	[queryStartSeconds setEnabled:NO];
 	[queryStartVectors setEnabled:NO];
 	[resetButton setEnabled:NO];
 	[multipleCheckBox setEnabled:NO];
+	
+	[playBothButton setEnabled:NO];
+	[playResultButton setEnabled:NO];
 }
 
 /**
  * Open an existing adb (which must have a plist)
  */

  */
 -(IBAction)importAudio:(id)sender
 {
 	[tracksView reloadData];
 	
-	NSArray *fileTypes = [NSArray arrayWithObjects:@"wav", @"mp3", @"aiff", @"m4a", nil];
+	NSArray *fileTypes = [NSArray arrayWithObjects:@"wav", @"mp3", @"aif", @"aiff", @"m4a",nil];
 	NSOpenPanel* panel = [NSOpenPanel openPanel];
 	[panel setAllowsMultipleSelection:TRUE];
 	NSInteger response = [panel runModalForDirectory:NSHomeDirectory() file:@"" types:fileTypes];
 	if(response == NSFileHandlingPanelOKButton)
 	{

 		if(!db)
 		{
 			return NO;
 		}
 	}
+	else if(theAction == @selector(playBoth:) || theAction == @selector(playResult:))
+	{
+		if([tracksView numberOfSelectedRows] == 0)
+		{
+			return NO;
+		}
+		else
+		{
+			return YES;
+		}
+	}
+	else if(theAction == @selector(stopPlay:))
+	{
+		return NO;
+	}
+	
+	NSLog(@"Returning yes for %@", NSStringFromSelector(theAction));
+	
 	return YES;
 }
 
 /**
  * Ensure play buttons are only enabled if a track is selected.
  */
 -(IBAction)selectedChanged:(id)sender
 {
+	NSLog(@"Selection changed");
 	if([tracksView numberOfSelectedRows] == 0)
 	{
 		[playBothButton setEnabled:NO];
 		[playResultButton setEnabled:NO];
 	}

 }
 
 
 -(IBAction)selectQueryFile:(id)sender
 {
-	NSArray* fileTypes = [NSArray arrayWithObjects: @"wav", @"mp3", @"aiff",@"m4a", nil];
+	NSArray* fileTypes = [NSArray arrayWithObjects: @"wav", @"mp3", @"aif", @"aiff", @"m4a",  nil];
 	NSOpenPanel* panel = [NSOpenPanel openPanel];
 	NSInteger response = [panel runModalForDirectory:NSHomeDirectory() file:@"" types:fileTypes];
 	if(response == NSFileHandlingPanelOKButton)
 	{
 		NSArray* opts = [trackMap allKeysForObject:[panel filename]];

 	
 	int ok = audiodb_retrieve_datum(db, [selectedKey cStringUsingEncoding:NSUTF8StringEncoding], spec->qid.datum);
 	if(ok == 0)
 	{
 		
-		float hopSize = [[dbState objectForKey:@"hopsize"] floatValue];
+	//	float hopSize = [[dbState objectForKey:@"hopsize"] floatValue];
 		NSLog(@"Got a datum");
 		result = audiodb_query_spec(db, spec);
 		if(result == NULL)
 		{
 			

 				NSMutableDictionary* dict = [[NSMutableDictionary alloc] initWithCapacity:4];
 				[dict setValue:[NSString stringWithFormat:@"%s", result->results[i].ikey] forKey:@"key"];
 				[dict setValue:[NSNumber numberWithFloat:result->results[i].dist] forKey:@"distance"];
 				[dict setValue:[NSNumber numberWithFloat:result->results[i].dist] forKey:@"meter"];
 				[dict setValue:[NSNumber numberWithFloat:result->results[i].ipos/divisor] forKey:@"ipos"];
-				NSLog(@"%s ipos: %d, dist: %f", result->results[i].ikey,result->results[i].ipos, result->results[i].dist);
 				[results addObject: dict];
 			}
 		}
 		
 		NSSortDescriptor *distSort = [[NSSortDescriptor alloc]initWithKey:@"meter"  ascending:YES];