changeset 739:040f14b5a5fc

Tweak to file extensions and playback

--- a/examples/iAudioDB/AppController.m	Thu Sep 16 11:40:23 2010 +0000
+++ b/examples/iAudioDB/AppController.m	Wed Sep 22 15:56:14 2010 +0000
@@ -62,7 +62,7 @@
 	
 	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];
@@ -201,6 +201,9 @@
 	[queryStartVectors setEnabled:NO];
 	[resetButton setEnabled:NO];
 	[multipleCheckBox setEnabled:NO];
+	
+	[playBothButton setEnabled:NO];
+	[playResultButton setEnabled:NO];
 }
 
 /**
@@ -395,7 +398,7 @@
 {
 	[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];
@@ -485,6 +488,24 @@
 			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;
 }
 
@@ -493,6 +514,7 @@
  */
 -(IBAction)selectedChanged:(id)sender
 {
+	NSLog(@"Selection changed");
 	if([tracksView numberOfSelectedRows] == 0)
 	{
 		[playBothButton setEnabled:NO];
@@ -645,7 +667,7 @@
 
 -(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)
@@ -838,7 +860,7 @@
 	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)
@@ -863,7 +885,6 @@
 				[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];
 			}
 		}

--- a/examples/iAudioDB/English.lproj/MainMenu.xib	Thu Sep 16 11:40:23 2010 +0000
+++ b/examples/iAudioDB/English.lproj/MainMenu.xib	Wed Sep 22 15:56:14 2010 +0000
@@ -10,9 +10,9 @@
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="106"/>
 			<integer value="779"/>
-			<integer value="565"/>
-			<integer value="371"/>
 			<integer value="793"/>
+			<integer value="618"/>
+			<integer value="869"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -922,7 +922,7 @@
 							<object class="NSMutableArray" key="NSCells">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSButtonCell" id="71088072">
-									<int key="NSCellFlags">67239424</int>
+									<int key="NSCellFlags">-2080244224</int>
 									<int key="NSCellFlags2">134217728</int>
 									<string key="NSContents"/>
 									<reference key="NSSupport" ref="294883811"/>
@@ -942,7 +942,7 @@
 									<int key="NSPeriodicInterval">25</int>
 								</object>
 								<object class="NSButtonCell" id="386321118">
-									<int key="NSCellFlags">-2080244224</int>
+									<int key="NSCellFlags">67239424</int>
 									<int key="NSCellFlags2">0</int>
 									<string key="NSContents"/>
 									<reference key="NSSupport" ref="294883811"/>
@@ -2178,6 +2178,14 @@
 					</object>
 					<int key="connectionID">905</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectedChanged:</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="21728481"/>
+					</object>
+					<int key="connectionID">919</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -3443,8 +3451,8 @@
 					<reference ref="9"/>
 					<string>{74, 862}</string>
 					<string>{{6, 978}, {478, 20}}</string>
-					<string>{{275, 274}, {606, 477}}</string>
-					<string>{{275, 274}, {606, 477}}</string>
+					<string>{{168, -323}, {606, 477}}</string>
+					<string>{{168, -323}, {606, 477}}</string>
 					<reference ref="9"/>
 					<string>{{33, 99}, {480, 360}}</string>
 					<string>{3.40282e+38, 3.40282e+38}</string>
@@ -3460,8 +3468,8 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{107, 508}, {322, 320}}</string>
-					<string>{{107, 508}, {322, 320}}</string>
+					<string>{{121, 337}, {322, 320}}</string>
+					<string>{{121, 337}, {322, 320}}</string>
 					<boolean value="NO" id="6"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{64, 108}, {187, 183}}</string>
@@ -3606,7 +3614,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">918</int>
+			<int key="maxID">919</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">