comparison examples/iAudioDB/AppController.m @ 688:8bc10774e56b

Disabled query button if no query file selected.

 		[plistFilename release];
 		[trackMap release];
 		[dbState release];
 	}
 	
+	if(selectedKey)
+	{
+		NSLog(@"Released selected key: %@", selectedKey);
+		[selectedKey release];
+		selectedKey = Nil;
+		NSLog(@"Is now %@", selectedKey);
+	}
+	
+	if(selectedKey)
+	{
+		NSLog(@"Still evals");
+	}
+	
 	// Reset query flags
 	[queryPath setStringValue: @"No file selected"];
 	[queryLengthSeconds setDoubleValue:0];
 	[queryLengthVectors setDoubleValue:0];
 	[multipleCheckBox setState:NSOnState];

 	}
 	else
 	{
 		NSLog(@"No db");
 		[performQueryButton setEnabled:NO];
-		[playBothButton setEnabled:FALSE];
-		[playResultButton setEnabled:FALSE];
+		[playBothButton setEnabled:NO];
+		[playResultButton setEnabled:NO];
 	}
 }
 
 /**
  * Choose the file(s) to be imported.

 		[NSApp runModalSession:session];
 		
 		NSArray *filesToOpen = [panel filenames];
 		
 		NSString* extractor = [dbState objectForKey:@"extractor"];
-		NSString* extractorPath = [NSString stringWithFormat:@"/Users/mikej/Development/audioDB/examples/iAudioDB/rdf/%@.n3", extractor];
+		NSString* extractorPath = [NSString stringWithFormat:@"/Applications/iAudioDB.app/rdf/%@.n3", extractor];
 		
 		// TODO Shift this process into a separate function.
 		// Create the customized extractor config
 		NSString* extractorContent = [NSString stringWithContentsOfFile:extractorPath];
 		NSString* hopStr = [dbState objectForKey:@"hopsize"];

 /**
  * Select an audio file, determine the key, and fire off a query.
  */
 -(IBAction)chooseQuery:(id)sender
 {
+	[queryButton setEnabled:(selectedKey ? YES : NO)];
 	[NSApp beginSheet:querySheet modalForWindow:mainWindow modalDelegate:self didEndSelector:NULL contextInfo:nil];
 	session = [NSApp beginModalSessionForWindow:querySheet];
 	[NSApp runModalSession:session];	
 }
 

 		{
 			selectedKey = [opts objectAtIndex:0];
 			[queryKey setStringValue:selectedKey];
 			[queryPath setStringValue:selectedKey];
 			selectedFilename = [[panel filename] retain];
+			[queryButton setEnabled:YES];
 			
 			[self resetLengths:self];
 		}
 	}
 }

 	if (ed == queryLengthSeconds)
 	{
 		double secs = [queryLengthSeconds doubleValue];
 		if(secs > 0)
 		{
+			// (samples - windowSize) / hopSize
+			
 			[queryLengthVectors setDoubleValue:ceil(((secs*44100)-winSize)/hopSize)];
 		}
 	}
 	if (ed == queryLengthVectors)
 	{