# HG changeset patch
# User samer
# Date 1329308770 0
# Node ID f973f0cc743bc7e5f6106debde17c2830b49b5a0
# Parent  5a6c5f3be3c6e2cca658d2af7a80927052c74b2c# Parent  b650357127132ab2cf7e8fb8b45e35da49cfd7cd
Merge.

diff -r 5a6c5f3be3c6 -r f973f0cc743b MelodyTriangle.xcodeproj/hekeus.mode1v3
--- a/MelodyTriangle.xcodeproj/hekeus.mode1v3	Wed Feb 15 12:25:11 2012 +0000
+++ b/MelodyTriangle.xcodeproj/hekeus.mode1v3	Wed Feb 15 12:26:10 2012 +0000
@@ -272,7 +272,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>12</integer>
+									<integer>9</integer>
 									<integer>3</integer>
 									<integer>0</integer>
 								</array>
@@ -297,7 +297,7 @@
 							<real>186</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>39 59 1100 675 0 0 1280 778 </string>
+						<string>126 -3 1100 675 0 0 1280 778 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -315,7 +315,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>main.cpp</string>
+								<string>Voice.cpp</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -323,11 +323,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>main.cpp</string>
+										<string>Voice.cpp</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>C8C55A8F14D21C8000DE2448</string>
+										<string>C8CD9D3314DF0A9B0038C1D0</string>
 										<key>history</key>
 										<array>
 											<string>C8E1DA3A14BF6043000A0193</string>
@@ -335,10 +335,10 @@
 											<string>C852882A14CC47A200AE6996</string>
 											<string>C852882B14CC47A200AE6996</string>
 											<string>C852882C14CC47A200AE6996</string>
+											<string>C8C55A8C14D21C8000DE2448</string>
+											<string>C8CD9D3114DF0A9B0038C1D0</string>
+											<string>C8CD9D3214DF0A9B0038C1D0</string>
 											<string>C84FFCD314CDB71400D92A44</string>
-											<string>C8C55A8C14D21C8000DE2448</string>
-											<string>C8C55A8D14D21C8000DE2448</string>
-											<string>C8C55A8E14D21C8000DE2448</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -350,14 +350,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {892, 584}}</string>
+								<string>{{0, 0}, {892, 582}}</string>
 								<key>RubberWindowFrame</key>
-								<string>39 59 1100 675 0 0 1280 778 </string>
+								<string>126 -3 1100 675 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>584pt</string>
+							<string>582pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -370,14 +370,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 589}, {892, 45}}</string>
+								<string>{{0, 587}, {892, 47}}</string>
 								<key>RubberWindowFrame</key>
-								<string>39 59 1100 675 0 0 1280 778 </string>
+								<string>126 -3 1100 675 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>45pt</string>
+							<string>47pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -396,9 +396,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>C8C55A7214D219B800DE2448</string>
+				<string>C8CD9D1E14DDAB730038C1D0</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>C8C55A7314D219B800DE2448</string>
+				<string>C8CD9D1F14DDAB730038C1D0</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -538,15 +538,14 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>C8C55A9714D21C8000DE2448</string>
-		<string>C8C55A9814D21C8000DE2448</string>
+		<string>C8CD9D2914DDAB730038C1D0</string>
+		<string>C8CD9D2A14DDAB730038C1D0</string>
+		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>C859AFFA140D23E1002C5ACF</string>
-		<string>1C78EAAD065D492600B07095</string>
-		<string>/Users/hekeus/Documents/QMUL/InfoDynInstallation/melodytriangle/of_preRelease_v0062_osxSL_FAT/apps/examples/MelodyTriangle/MelodyTriangle.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>39 59 1100 675 0 0 1280 778 </string>
+	<string>126 -3 1100 675 0 0 1280 778 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
@@ -567,7 +566,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>main.cpp</string>
+								<string></string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -584,8 +583,6 @@
 							<string>218pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -625,7 +622,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>C859AFFA140D23E1002C5ACF</string>
-				<string>C8C55A7514D219B800DE2448</string>
+				<string>C8CD9D2014DDAB730038C1D0</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -638,7 +635,7 @@
 			<key>WindowToolGUID</key>
 			<string>C859AFFA140D23E1002C5ACF</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
@@ -747,13 +744,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>C8C55A9014D21C8000DE2448</string>
+				<string>C8CD9D2114DDAB730038C1D0</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>C8C55A9114D21C8000DE2448</string>
-				<string>C8C55A9214D21C8000DE2448</string>
-				<string>C8C55A9314D21C8000DE2448</string>
-				<string>C8C55A9414D21C8000DE2448</string>
-				<string>C8C55A9514D21C8000DE2448</string>
+				<string>C8CD9D2214DDAB730038C1D0</string>
+				<string>C8CD9D2314DDAB730038C1D0</string>
+				<string>C8CD9D2414DDAB730038C1D0</string>
+				<string>C8CD9D2514DDAB730038C1D0</string>
+				<string>C8CD9D2614DDAB730038C1D0</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -880,8 +877,6 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -917,7 +912,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>C8C55A9614D21C8000DE2448</string>
+				<string>C8CD9D2714DDAB730038C1D0</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
@@ -927,7 +922,7 @@
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>Identifier</key>
diff -r 5a6c5f3be3c6 -r f973f0cc743b MelodyTriangle.xcodeproj/hekeus.pbxuser
--- a/MelodyTriangle.xcodeproj/hekeus.pbxuser	Wed Feb 15 12:25:11 2012 +0000
+++ b/MelodyTriangle.xcodeproj/hekeus.pbxuser	Wed Feb 15 12:26:10 2012 +0000
@@ -27,12 +27,6 @@
 		path = "/usr/include/c++/4.2.1/cmath";
 		sourceTree = "<absolute>";
 	};
-	C852874414C5BF6800AE6996 /* MelodyTriangle_windowed */ = {
-		activeExec = 0;
-		executables = (
-			C852877214C5BF6800AE6996 /* MelodyTriangle_windowed */,
-		);
-	};
 	C852877214C5BF6800AE6996 /* MelodyTriangle_windowed */ = {
 		isa = PBXExecutable;
 		activeArgIndices = (
@@ -75,7 +69,6 @@
 	};
 	C852882B14CC47A200AE6996 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */;
 		name = "testApp.cpp: 8";
 		rLen = 0;
 		rLoc = 180;
@@ -85,7 +78,6 @@
 	};
 	C852882C14CC47A200AE6996 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = E4B69E1F0A3A1BDC003C02F2 /* testApp.h */;
 		name = "testApp.h: 22";
 		rLen = 0;
 		rLoc = 429;
@@ -147,26 +139,7 @@
 		vrLen = 900;
 		vrLoc = 22;
 	};
-	C8C55A8D14D21C8000DE2448 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
-		name = "melodyTriangle.cpp: 85";
-		rLen = 0;
-		rLoc = 2409;
-		rType = 0;
-		vrLen = 1142;
-		vrLoc = 1278;
-	};
-	C8C55A8E14D21C8000DE2448 /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "No matching function for call to 'melodyTriangle::melodyTriangle(const char*, int, int, int, int)'";
-		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 26;
-		rType = 1;
-	};
-	C8C55A8F14D21C8000DE2448 /* PBXTextBookmark */ = {
+	C8CD9D3114DF0A9B0038C1D0 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
 		name = "main.cpp: 28";
@@ -176,11 +149,31 @@
 		vrLen = 884;
 		vrLoc = 0;
 	};
+	C8CD9D3214DF0A9B0038C1D0 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
+		name = "melodyTriangle.cpp: 92";
+		rLen = 0;
+		rLoc = 2409;
+		rType = 0;
+		vrLen = 1129;
+		vrLoc = 0;
+	};
+	C8CD9D3314DF0A9B0038C1D0 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = C8E1DA4214BF60B7000A0193 /* Voice.cpp */;
+		name = "Voice.cpp: 31";
+		rLen = 1;
+		rLoc = 544;
+		rType = 0;
+		vrLen = 853;
+		vrLoc = 304;
+	};
 	C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {887, 5967}}";
+			sepNavIntBoundsRect = "{{0, 0}, {887, 5226}}";
 			sepNavSelRange = "{2409, 0}";
-			sepNavVisRange = "{1278, 1142}";
+			sepNavVisRange = "{0, 1129}";
 			sepNavWindowFrame = "{{293, 4}, {971, 730}}";
 		};
 	};
@@ -211,9 +204,9 @@
 	};
 	C8E1DA4214BF60B7000A0193 /* Voice.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {831, 663}}";
-			sepNavSelRange = "{571, 0}";
-			sepNavVisRange = "{155, 547}";
+			sepNavIntBoundsRect = "{{0, 0}, {831, 754}}";
+			sepNavSelRange = "{544, 1}";
+			sepNavVisRange = "{304, 853}";
 			sepNavWindowFrame = "{{178, -17}, {971, 730}}";
 		};
 	};
@@ -300,8 +293,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 349313459;
-			PBXWorkspaceStateSaveDate = 349313459;
+			PBXPerProjectTemplateStateSaveDate = 350071638;
+			PBXWorkspaceStateSaveDate = 350071638;
 		};
 		perUserProjectItems = {
 			C84FFCD314CDB71400D92A44 /* PBXTextBookmark */ = C84FFCD314CDB71400D92A44 /* PBXTextBookmark */;
@@ -310,9 +303,9 @@
 			C852882B14CC47A200AE6996 /* PBXTextBookmark */ = C852882B14CC47A200AE6996 /* PBXTextBookmark */;
 			C852882C14CC47A200AE6996 /* PBXTextBookmark */ = C852882C14CC47A200AE6996 /* PBXTextBookmark */;
 			C8C55A8C14D21C8000DE2448 /* PBXTextBookmark */ = C8C55A8C14D21C8000DE2448 /* PBXTextBookmark */;
-			C8C55A8D14D21C8000DE2448 /* PBXTextBookmark */ = C8C55A8D14D21C8000DE2448 /* PBXTextBookmark */;
-			C8C55A8E14D21C8000DE2448 /* XCBuildMessageTextBookmark */ = C8C55A8E14D21C8000DE2448 /* XCBuildMessageTextBookmark */;
-			C8C55A8F14D21C8000DE2448 /* PBXTextBookmark */ = C8C55A8F14D21C8000DE2448 /* PBXTextBookmark */;
+			C8CD9D3114DF0A9B0038C1D0 /* PBXTextBookmark */ = C8CD9D3114DF0A9B0038C1D0 /* PBXTextBookmark */;
+			C8CD9D3214DF0A9B0038C1D0 /* PBXTextBookmark */ = C8CD9D3214DF0A9B0038C1D0 /* PBXTextBookmark */;
+			C8CD9D3314DF0A9B0038C1D0 /* PBXTextBookmark */ = C8CD9D3314DF0A9B0038C1D0 /* PBXTextBookmark */;
 			C8E1DA3A14BF6043000A0193 /* PlistBookmark */ = C8E1DA3A14BF6043000A0193 /* PlistBookmark */;
 		};
 		sourceControlManager = C859B006140D23E1002C5ACF /* Source Control */;
@@ -327,26 +320,12 @@
 	};
 	E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {719, 416}}";
-			sepNavSelRange = "{790, 0}";
-			sepNavVisRange = "{439, 445}";
+			sepNavIntBoundsRect = "{{0, 0}, {831, 527}}";
+			sepNavSelRange = "{873, 0}";
+			sepNavVisRange = "{0, 884}";
 			sepNavWindowFrame = "{{15, 43}, {971, 730}}";
 		};
 	};
-	E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {831, 1586}}";
-			sepNavSelRange = "{180, 0}";
-			sepNavVisRange = "{0, 1122}";
-		};
-	};
-	E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {831, 534}}";
-			sepNavSelRange = "{429, 0}";
-			sepNavVisRange = "{0, 477}";
-		};
-	};
 	E4B6FCAD0C3E899E008CF71C /* MelodyTriangle.plist */ = {
 		uiCtxt = {
 			sepNavWindowFrame = "{{234, 30}, {971, 730}}";