# HG changeset patch
# User Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
# Date 1325809242 0
# Node ID ffb563f6e4cdec6e8fb0ba42d856ca3b9ee74fc4
# Parent  ff1702b723f32a3cb88bc410fbd2daec4e918be8
Timewarp uncomitted changes

diff -r ff1702b723f3 -r ffb563f6e4cd chromaReader13timewarp1copy.xcodeproj/andrew.mode1v3
--- a/chromaReader13timewarp1copy.xcodeproj/andrew.mode1v3	Fri Nov 25 16:51:33 2011 +0000
+++ b/chromaReader13timewarp1copy.xcodeproj/andrew.mode1v3	Fri Jan 06 00:20:42 2012 +0000
@@ -216,11 +216,11 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>49EDEC0C13825AF300BC779D</string>
+						<string>49F66E181486AA9000C8AD53</string>
 						<key>history</key>
 						<array>
 							<string>49EDEBEC1382579600BC779D</string>
-							<string>49EDEBE41382578F00BC779D</string>
+							<string>49EDEC0C13825AF300BC779D</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -239,47 +239,6 @@
 				<string>333 118 1305 909 0 0 1680 1028 </string>
 			</dict>
 		</dict>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>491DFB871382504A0040A95D</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>timeWarp.cpp</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>491DFB881382504A0040A95D</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>timeWarp.cpp</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>49EDEC0D13825AF300BC779D</string>
-						<key>history</key>
-						<array>
-							<string>49EDEC001382589C00BC779D</string>
-							<string>49EDEC011382589C00BC779D</string>
-						</array>
-					</dict>
-					<key>SplitCount</key>
-					<string>1</string>
-				</dict>
-				<key>StatusBarVisibility</key>
-				<true/>
-			</dict>
-			<key>Geometry</key>
-			<dict>
-				<key>Frame</key>
-				<string>{{0, 20}, {1305, 869}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>25 118 1305 910 0 0 1680 1028 </string>
-			</dict>
-		</dict>
 	</array>
 	<key>PerspectiveWidths</key>
 	<array>
@@ -408,15 +367,12 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>49EDEC0A13825AF300BC779D</string>
+										<string>49F66E141486AA9000C8AD53</string>
 										<key>history</key>
 										<array>
-											<string>493EE1311381912F0089A0FD</string>
 											<string>491DFB66138240910040A95D</string>
-											<string>491DFB811382504A0040A95D</string>
-											<string>491DFBA4138252840040A95D</string>
 											<string>49EDEBE71382579600BC779D</string>
-											<string>49EDEBE81382579600BC779D</string>
+											<string>49EDEC0A13825AF300BC779D</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -428,14 +384,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {806, 543}}</string>
+								<string>{{0, 0}, {806, 537}}</string>
 								<key>RubberWindowFrame</key>
 								<string>179 235 1014 793 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>543pt</string>
+							<string>537pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -448,14 +404,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 548}, {806, 204}}</string>
+								<string>{{0, 542}, {806, 210}}</string>
 								<key>RubberWindowFrame</key>
 								<string>179 235 1014 793 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>204pt</string>
+							<string>210pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -474,9 +430,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>49EDEBEA1382579600BC779D</string>
+				<string>49F66E161486AA9000C8AD53</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>49EDEBEB1382579600BC779D</string>
+				<string>49F66E171486AA9000C8AD53</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -614,14 +570,9 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>49EDEBF81382579600BC779D</string>
-		<string>49EDEBF91382579600BC779D</string>
-		<string>1CD10A99069EF8BA00B06720</string>
-		<string>/Users/andrew/Documents/work/programming/of_preRelease_v0061_osx_FAT/apps/my_openFrameworks/chromaReader13timeWarp1/chromaReader13timewarp1.xcodeproj</string>
 		<string>493EE0FA13818A2E0089A0FD</string>
-		<string>491DFB871382504A0040A95D</string>
-		<string>1C78EAAD065D492600B07095</string>
 		<string>493EE1361381912F0089A0FD</string>
+		<string>/Users/andrew/hg/audio-time-warp/chromaReader13timewarp1copy.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>179 235 1014 793 0 0 1680 1028 </string>
@@ -645,7 +596,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>testApp.cpp</string>
+								<string></string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -662,8 +613,6 @@
 							<string>218pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -703,7 +652,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>493EE0FA13818A2E0089A0FD</string>
-				<string>49EDEBEF1382579600BC779D</string>
+				<string>49F66E191486AA9000C8AD53</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -716,7 +665,7 @@
 			<key>WindowToolGUID</key>
 			<string>493EE0FA13818A2E0089A0FD</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
diff -r ff1702b723f3 -r ffb563f6e4cd chromaReader13timewarp1copy.xcodeproj/andrew.pbxuser
--- a/chromaReader13timewarp1copy.xcodeproj/andrew.pbxuser	Fri Nov 25 16:51:33 2011 +0000
+++ b/chromaReader13timewarp1copy.xcodeproj/andrew.pbxuser	Fri Jan 06 00:20:42 2012 +0000
@@ -10,38 +10,6 @@
 		vrLen = 747;
 		vrLoc = 0;
 	};
-	491DFB811382504A0040A95D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 493EE10B13818C190089A0FD /* timeWarp.h */;
-		name = "timeWarp.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 639;
-		vrLoc = 0;
-	};
-	491DFBA4138252840040A95D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 493EE10C13818C190089A0FD /* timeWarp.cpp */;
-		name = "timeWarp.cpp: 34";
-		rLen = 0;
-		rLoc = 749;
-		rType = 0;
-		vrLen = 939;
-		vrLoc = 271;
-	};
-	491DFBA6138252840040A95D /* stl_vector.h */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.h;
-		name = stl_vector.h;
-		path = "/Developer/SDKs/MacOSX10.5.sdk/usr/include/c++/4.0.0/bits/stl_vector.h";
-		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {745, 15456}}";
-			sepNavSelRange = "{12251, 0}";
-			sepNavVisRange = "{11748, 968}";
-		};
-	};
 	493EE0EF13818A200089A0FD /* ChromaReader13 */ = {
 		isa = PBXExecutable;
 		activeArgIndices = (
@@ -103,32 +71,6 @@
 			sepNavWindowFrame = "{{25, 62}, {1305, 966}}";
 		};
 	};
-	493EE12013818CA00089A0FD /* testApp.h */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.h;
-		name = testApp.h;
-		path = /Users/andrew/Documents/work/programming/of_preRelease_v0061_osx_FAT/apps/my_openFrameworks/chromaReader13/../chromaReader2/src/testApp.h;
-		sourceTree = "<absolute>";
-	};
-	493EE1311381912F0089A0FD /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 493EE12013818CA00089A0FD /* testApp.h */;
-		name = "testApp.h: 17";
-		rLen = 0;
-		rLoc = 423;
-		rType = 0;
-		vrLen = 449;
-		vrLoc = 128;
-	};
-	49EDEBE41382578F00BC779D /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'similarityMatrix' was not declared in this scope";
-		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 449;
-		rType = 1;
-	};
 	49EDEBE71382579600BC779D /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
@@ -139,13 +81,6 @@
 		vrLen = 770;
 		vrLoc = 1663;
 	};
-	49EDEBE81382579600BC779D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 491DFBA6138252840040A95D /* stl_vector.h */;
-		rLen = 0;
-		rLoc = 342;
-		rType = 1;
-	};
 	49EDEBEC1382579600BC779D /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
@@ -156,26 +91,6 @@
 		vrLen = 1366;
 		vrLoc = 855;
 	};
-	49EDEC001382589C00BC779D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 493EE10B13818C190089A0FD /* timeWarp.h */;
-		name = "timeWarp.h: 119";
-		rLen = 0;
-		rLoc = 3115;
-		rType = 0;
-		vrLen = 1530;
-		vrLoc = 1935;
-	};
-	49EDEC011382589C00BC779D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 493EE10C13818C190089A0FD /* timeWarp.cpp */;
-		name = "timeWarp.cpp: 303";
-		rLen = 0;
-		rLoc = 7313;
-		rType = 0;
-		vrLen = 1339;
-		vrLoc = 6708;
-	};
 	49EDEC0A13825AF300BC779D /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 49EDEC0B13825AF300BC779D /* stl_vector.h */;
@@ -192,11 +107,6 @@
 		name = stl_vector.h;
 		path = "/Developer/SDKs/MacOSX10.5.sdk/usr/include/c++/4.0.0/bits/stl_vector.h";
 		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {745, 15456}}";
-			sepNavSelRange = "{12251, 0}";
-			sepNavVisRange = "{11748, 1012}";
-		};
 	};
 	49EDEC0C13825AF300BC779D /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -208,15 +118,36 @@
 		vrLen = 1040;
 		vrLoc = 17443;
 	};
-	49EDEC0D13825AF300BC779D /* PBXTextBookmark */ = {
+	49F66E141486AA9000C8AD53 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 493EE10C13818C190089A0FD /* timeWarp.cpp */;
-		name = "timeWarp.cpp: 40";
+		fRef = 49F66E151486AA9000C8AD53 /* stl_vector.h */;
+		name = "stl_vector.h: 337";
 		rLen = 0;
-		rLoc = 872;
+		rLoc = 12073;
 		rType = 0;
-		vrLen = 1160;
-		vrLoc = 251;
+		vrLen = 1002;
+		vrLoc = 11748;
+	};
+	49F66E151486AA9000C8AD53 /* stl_vector.h */ = {
+		isa = PBXFileReference;
+		name = stl_vector.h;
+		path = "/Developer/SDKs/MacOSX10.5.sdk/usr/include/c++/4.0.0/bits/stl_vector.h";
+		sourceTree = "<absolute>";
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {745, 15584}}";
+			sepNavSelRange = "{12073, 0}";
+			sepNavVisRange = "{11748, 1002}";
+		};
+	};
+	49F66E181486AA9000C8AD53 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
+		name = "testApp.cpp: 615";
+		rLen = 0;
+		rLoc = 18063;
+		rType = 0;
+		vrLen = 1465;
+		vrLoc = 17166;
 	};
 	E4B69B4C0A3A1720003C02F2 /* Project object */ = {
 		activeBuildConfigurationName = Debug;
@@ -252,23 +183,17 @@
 					PBXFileDataSource_Target_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 327308062;
-			PBXWorkspaceStateSaveDate = 327308062;
+			PBXPerProjectTemplateStateSaveDate = 344369793;
+			PBXWorkspaceStateSaveDate = 344369793;
 		};
 		perUserProjectItems = {
 			491DFB66138240910040A95D /* PBXTextBookmark */ = 491DFB66138240910040A95D /* PBXTextBookmark */;
-			491DFB811382504A0040A95D /* PBXTextBookmark */ = 491DFB811382504A0040A95D /* PBXTextBookmark */;
-			491DFBA4138252840040A95D /* PBXTextBookmark */ = 491DFBA4138252840040A95D /* PBXTextBookmark */;
-			493EE1311381912F0089A0FD /* PBXTextBookmark */ = 493EE1311381912F0089A0FD /* PBXTextBookmark */;
-			49EDEBE41382578F00BC779D /* XCBuildMessageTextBookmark */ = 49EDEBE41382578F00BC779D /* XCBuildMessageTextBookmark */;
 			49EDEBE71382579600BC779D /* PBXTextBookmark */ = 49EDEBE71382579600BC779D /* PBXTextBookmark */;
-			49EDEBE81382579600BC779D /* PBXTextBookmark */ = 49EDEBE81382579600BC779D /* PBXTextBookmark */;
 			49EDEBEC1382579600BC779D /* PBXTextBookmark */ = 49EDEBEC1382579600BC779D /* PBXTextBookmark */;
-			49EDEC001382589C00BC779D /* PBXTextBookmark */ = 49EDEC001382589C00BC779D /* PBXTextBookmark */;
-			49EDEC011382589C00BC779D /* PBXTextBookmark */ = 49EDEC011382589C00BC779D /* PBXTextBookmark */;
 			49EDEC0A13825AF300BC779D /* PBXTextBookmark */ = 49EDEC0A13825AF300BC779D /* PBXTextBookmark */;
 			49EDEC0C13825AF300BC779D /* PBXTextBookmark */ = 49EDEC0C13825AF300BC779D /* PBXTextBookmark */;
-			49EDEC0D13825AF300BC779D /* PBXTextBookmark */ = 49EDEC0D13825AF300BC779D /* PBXTextBookmark */;
+			49F66E141486AA9000C8AD53 /* PBXTextBookmark */ = 49F66E141486AA9000C8AD53 /* PBXTextBookmark */;
+			49F66E181486AA9000C8AD53 /* PBXTextBookmark */ = 49F66E181486AA9000C8AD53 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 493EE10613818A2E0089A0FD /* Source Control */;
 		userBuildSettings = {
@@ -282,9 +207,9 @@
 	};
 	E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {460, 20688}}";
-			sepNavSelRange = "{21854, 0}";
-			sepNavVisRange = "{21755, 241}";
+			sepNavIntBoundsRect = "{{0, 0}, {1246, 30880}}";
+			sepNavSelRange = "{18063, 0}";
+			sepNavVisRange = "{17166, 1465}";
 			sepNavWindowFrame = "{{94, -269}, {1305, 970}}";
 		};
 	};
diff -r ff1702b723f3 -r ffb563f6e4cd chromaReader13timewarp1copy.xcodeproj/project.pbxproj
--- a/chromaReader13timewarp1copy.xcodeproj/project.pbxproj	Fri Nov 25 16:51:33 2011 +0000
+++ b/chromaReader13timewarp1copy.xcodeproj/project.pbxproj	Fri Jan 06 00:20:42 2012 +0000
@@ -651,7 +651,7 @@
 /* Begin PBXProject section */
 		E4B69B4C0A3A1720003C02F2 /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "chromaReader13timewarp1" */;
+			buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "chromaReader13timewarp1copy" */;
 			compatibilityVersion = "Xcode 2.4";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -1004,7 +1004,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "chromaReader13timewarp1" */ = {
+		E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "chromaReader13timewarp1copy" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				E4B69B4E0A3A1720003C02F2 /* Debug */,