changeset 689:015e361e5baa

Removed qpos
author mas01mj
date Fri, 12 Mar 2010 12:17:52 +0000
parents 8bc10774e56b
children f3268055df0a
files examples/iAudioDB/AppController.m examples/iAudioDB/English.lproj/MainMenu.xib
diffstat 2 files changed, 1 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- a/examples/iAudioDB/AppController.m	Fri Mar 12 11:54:02 2010 +0000
+++ b/examples/iAudioDB/AppController.m	Fri Mar 12 12:17:52 2010 +0000
@@ -449,7 +449,6 @@
 	NSDictionary* selectedRow = [results objectAtIndex:[tracksView selectedRow]];
 	NSString* value = [selectedRow objectForKey:@"key"];
 	float ipos = [[selectedRow objectForKey:@"ipos"] floatValue];
-	float qpos = [[selectedRow objectForKey:@"qpos"] floatValue];
 	NSString* filename = [trackMap objectForKey:value];
 	NSLog(@"Key: %@ Value: %@", value, filename);
 		
@@ -475,7 +474,6 @@
 	
 	// Get query track and shift to start point
 	queryTrack = [[[NSSound alloc] initWithContentsOfFile:selectedFilename byReference:YES] retain];
-	[queryTrack setCurrentTime:qpos];
 	[queryTrack setDelegate:self];
 	
 	[queryTrack play];
@@ -681,9 +679,7 @@
 				[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].qpos/divisor] forKey:@"qpos"];
 				[dict setValue:[NSNumber numberWithFloat:result->results[i].ipos/divisor] forKey:@"ipos"];
-				NSLog(@"%s qpos %d ipos %d", result->results[i].ikey, result->results[i].qpos/divisor, result->results[i].ipos/divisor);
 				[results addObject: dict];
 			}
 		}
--- a/examples/iAudioDB/English.lproj/MainMenu.xib	Fri Mar 12 11:54:02 2010 +0000
+++ b/examples/iAudioDB/English.lproj/MainMenu.xib	Fri Mar 12 12:17:52 2010 +0000
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="524"/>
+			<integer value="528"/>
 			<integer value="793"/>
 			<integer value="779"/>
 			<integer value="57"/>
@@ -699,37 +699,6 @@
 																<string key="NSSelector">compare:</string>
 															</object>
 														</object>
-														<object class="NSTableColumn" id="913401705">
-															<string key="NSIdentifier">qpos</string>
-															<double key="NSWidth">6.800000e+01</double>
-															<double key="NSMinWidth">1.000000e+01</double>
-															<double key="NSMaxWidth">3.402823e+38</double>
-															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																<int key="NSCellFlags">75628032</int>
-																<int key="NSCellFlags2">0</int>
-																<string key="NSContents">QPos</string>
-																<reference key="NSSupport" ref="26"/>
-																<reference key="NSBackgroundColor" ref="751640266"/>
-																<reference key="NSTextColor" ref="953606733"/>
-															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="66400504">
-																<int key="NSCellFlags">337772096</int>
-																<int key="NSCellFlags2">2048</int>
-																<string key="NSContents">Text Cell</string>
-																<reference key="NSSupport" ref="294883811"/>
-																<reference key="NSControlView" ref="372985267"/>
-																<reference key="NSBackgroundColor" ref="904458979"/>
-																<reference key="NSTextColor" ref="915193604"/>
-															</object>
-															<int key="NSResizingMask">3</int>
-															<bool key="NSIsResizeable">YES</bool>
-															<reference key="NSTableView" ref="372985267"/>
-															<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
-																<string key="NSKey">qpos</string>
-																<bool key="NSAscending">YES</bool>
-																<string key="NSSelector">compare:</string>
-															</object>
-														</object>
 														<object class="NSTableColumn" id="284178317">
 															<string key="NSIdentifier">ipos</string>
 															<double key="NSWidth">6.300000e+01</double>
@@ -808,14 +777,6 @@
 													<double key="NSRowHeight">1.700000e+01</double>
 													<int key="NSTvFlags">-692060160</int>
 													<int key="NSGridStyleMask">1</int>
-													<object class="NSArray" key="NSSortDescriptors">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSSortDescriptor">
-															<string key="NSKey">ipos</string>
-															<bool key="NSAscending">NO</bool>
-															<string key="NSSelector">compare:</string>
-														</object>
-													</object>
 													<int key="NSColumnAutoresizingStyle">4</int>
 													<int key="NSDraggingSourceMaskForLocal">15</int>
 													<int key="NSDraggingSourceMaskForNonLocal">0</int>
@@ -2569,7 +2530,6 @@
 						<reference key="object" ref="372985267"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="913401705"/>
 							<reference ref="602172838"/>
 							<reference ref="1014311959"/>
 							<reference ref="284178317"/>
@@ -2578,20 +2538,6 @@
 						<reference key="parent" ref="680449350"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">555</int>
-						<reference key="object" ref="913401705"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="66400504"/>
-						</object>
-						<reference key="parent" ref="372985267"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">556</int>
-						<reference key="object" ref="66400504"/>
-						<reference key="parent" ref="913401705"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">552</int>
 						<reference key="object" ref="602172838"/>
 						<object class="NSMutableArray" key="children">
@@ -3256,8 +3202,6 @@
 					<string>530.IBPluginDependency</string>
 					<string>552.IBPluginDependency</string>
 					<string>553.IBPluginDependency</string>
-					<string>555.IBPluginDependency</string>
-					<string>556.IBPluginDependency</string>
 					<string>56.IBPluginDependency</string>
 					<string>56.ImportedFromIB2</string>
 					<string>564.IBEditorWindowLastContentRect</string>
@@ -3451,8 +3395,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{169, 281}, {305, 281}}</string>
 					<string>{{169, 281}, {305, 281}}</string>