Commits

Sam Drazin committed 91444dc

Creating and returning new array with carrier data, and real-time cvocoding is occuring (with stagnant buffer of a carrier signal)

  • Participants
  • Parent commits 5475268

Comments (0)

Files changed (7)

File ChanelVocoderAUEffect/ChanelVocoderAUEffect.cpp

 	mProcessFlag		= 0;
 	mSine				= new double[kBufferLength];
 	mSquare				= new double[kBufferLength];
-
+	
 	mInputBuffer.AllocateClear(kLongBufferLength);
 	mCarrierInputBuffer.AllocateClear(kLongBufferLength);
 	mOutputBuffer.AllocateClear(kBufferLength);
     }
 	
 	make_window();
-	read_carrier_buffer();
+	
+	// TODO: make this read dynamically from an input source instead of a file
+	// Reads 1 buffer's worth of data into the carrierData array, for single-buffer processing
+	carrierBuffer = read_carrier_buffer();
 }
 
 
 double *ChanelVocoderAUEffect::ChanelVocoderAUEffectKernel::TakeFrameFromInputBuffer()
 {
 	static double *mTempBuffer = new double[kBufferLength];
+	
 	int i, j;
 	for (i = 0, j = mNextFrameIndex; i < kBufferLength; i += 1)
 	{
 }
 
 void ChanelVocoderAUEffect::ChanelVocoderAUEffectKernel::SendToOutputBuffer(double *frame)
-{
-	int index = mNextFrameIndex;
-	for (int i = 0; i < kBufferLength; i += 1, index += 1)
+{	
+	for (int i = 0, index = mNextFrameIndex; i < kBufferLength; i += 1, index += 1)
 	{
 		index %= kLongBufferLength;
 		mOutputBuffer[index] += frame[i];
 	while (mProcessFlag) 
 	{
 		double *frameToProcess = TakeFrameFromInputBuffer();
-//		double *carrierFrameToProcess = TakeFrameFromCarrierInputBuffer();
+//		double *carrierFrameToProcess = carrierData;
+			//TakeFrameFromCarrierInputBuffer();
 		
-		double *processedFrame = frequency_domain_process(frameToProcess, carrierData);//carrierFrameToProcess);
+		double *processedFrame = frequency_domain_process(frameToProcess, carrierBuffer);//carrierFrameToProcess);
 			//time_frequency_transform(frameToProcess);
 			//pass_thru(frameToProcess);
 		

File ChanelVocoderAUEffect/ChanelVocoderAUEffect.h

 		TAUBuffer <Float32>		mInputBuffer;
 		TAUBuffer <Float32>		mCarrierInputBuffer;
 		TAUBuffer <double>		mOutputBuffer;
-
+		double					*carrierBuffer;
 		
 		int						mBufferIndex;
 		int						mNextFrameIndex;

File ChanelVocoderAUEffect/ChanelVocoderAUEffect.xcodeproj/sdrazin.mode1v3

 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>7</integer>
+									<integer>5</integer>
 									<integer>4</integer>
 									<integer>1</integer>
 									<integer>0</integer>
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>ChanelVocoderAUEffect.exp</string>
+								<string>ChanelVocoderAUEffect.cpp</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>ChanelVocoderAUEffect.exp</string>
+										<string>ChanelVocoderAUEffect.cpp</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>F47F3C6A118F6CB200625E6D</string>
+										<string>F44F4D7F118FA09E008A8E94</string>
 										<key>history</key>
 										<array>
 											<string>F4AC63D5117E3C5D0064A2E0</string>
 											<string>F4B52BF0118622C6009C2A96</string>
 											<string>F4A2E0A61188C39A003E52C1</string>
 											<string>F4156E18118A15E200660B62</string>
-											<string>F477D01C118E235400F5E1B6</string>
-											<string>F477D01D118E235400F5E1B6</string>
-											<string>F47F3C68118F6CB200625E6D</string>
-											<string>F47F3C69118F6CB200625E6D</string>
-											<string>F4B52BF1118622C6009C2A96</string>
+											<string>F44F4D72118F9FEF008A8E94</string>
+											<string>F44F4D73118F9FEF008A8E94</string>
+											<string>F44F4D74118F9FEF008A8E94</string>
+											<string>F44F4D7D118FA09E008A8E94</string>
+											<string>F44F4D7E118FA09E008A8E94</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {1004, 605}}</string>
+								<string>{{0, 0}, {1004, 594}}</string>
 								<key>RubberWindowFrame</key>
 								<string>3 109 1290 769 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>605pt</string>
+							<string>594pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 610}, {1004, 118}}</string>
+								<string>{{0, 599}, {1004, 129}}</string>
 								<key>RubberWindowFrame</key>
 								<string>3 109 1290 769 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>118pt</string>
+							<string>129pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>F47F3C1C118F692B00625E6D</string>
+				<string>F44F4D59118F9E91008A8E94</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>F47F3C1D118F692B00625E6D</string>
+				<string>F44F4D5A118F9E91008A8E94</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>294612146.08249199</real>
+	<real>294625438.71534902</real>
 	<key>ToolbarConfigUserDefaultsMinorVersion</key>
 	<string>2</string>
 	<key>ToolbarDisplayMode</key>
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>F47F3C2E118F6A3800625E6D</string>
-		<string>F47F3C2F118F6A3800625E6D</string>
+		<string>F44F4D64118F9E91008A8E94</string>
+		<string>F44F4D65118F9E91008A8E94</string>
+		<string>F4AC63BD117E3BB40064A2E0</string>
+		<string>/Users/sdrazin/Documents/Programs/C/Channel Vocoder/ChanelVocoderAUEffect/ChanelVocoderAUEffect.xcodeproj</string>
 		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
-		<string>F4AC63BD117E3BB40064A2E0</string>
-		<string>/Users/sdrazin/Documents/Programs/C/Channel Vocoder/ChanelVocoderAUEffect/ChanelVocoderAUEffect.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>3 109 1290 769 0 0 1440 878 </string>
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>ChanelVocoderAUEffect.cpp</string>
+								<string>Transform.c</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
 								<key>Frame</key>
 								<string>{{0, 0}, {850, 329}}</string>
 								<key>RubberWindowFrame</key>
-								<string>347 165 850 611 0 0 1440 878 </string>
+								<string>347 162 850 611 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<string>329pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<key>Frame</key>
 								<string>{{0, 334}, {850, 236}}</string>
 								<key>RubberWindowFrame</key>
-								<string>347 165 850 611 0 0 1440 878 </string>
+								<string>347 162 850 611 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXBuildResultsModule</string>
 			<key>TableOfContents</key>
 			<array>
 				<string>F4AC63BD117E3BB40064A2E0</string>
-				<string>F47F3C1E118F692B00625E6D</string>
+				<string>F44F4D5B118F9E91008A8E94</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
 			<key>WindowContentMinSize</key>
 			<string>486 300</string>
 			<key>WindowString</key>
-			<string>347 165 850 611 0 0 1440 878 </string>
+			<string>347 162 850 611 0 0 1440 878 </string>
 			<key>WindowToolGUID</key>
 			<string>F4AC63BD117E3BB40064A2E0</string>
 			<key>WindowToolIsVisible</key>
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {639, 291}}</string>
-											<string>{{639, 0}, {629, 291}}</string>
+											<string>{{0, 0}, {487, 181}}</string>
+											<string>{{487, 0}, {480, 181}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {1268, 291}}</string>
-											<string>{{0, 291}, {1268, 345}}</string>
+											<string>{{0, 0}, {967, 181}}</string>
+											<string>{{0, 181}, {967, 527}}</string>
 										</array>
 									</dict>
 								</dict>
 								<key>DebugSTDIOWindowFrame</key>
 								<string>{{200, 200}, {500, 300}}</string>
 								<key>Frame</key>
-								<string>{{0, 0}, {1268, 636}}</string>
+								<string>{{0, 0}, {967, 708}}</string>
 								<key>PBXDebugSessionStackFrameViewKey</key>
 								<dict>
 									<key>DebugVariablesTableConfiguration</key>
 										<string>Value</string>
 										<real>85</real>
 										<string>Summary</string>
-										<real>399</real>
+										<real>250</real>
 									</array>
 									<key>Frame</key>
-									<string>{{639, 0}, {629, 291}}</string>
+									<string>{{487, 0}, {480, 181}}</string>
 									<key>RubberWindowFrame</key>
-									<string>24 178 1268 677 0 0 1440 878 </string>
+									<string>24 106 967 749 0 0 1440 878 </string>
 								</dict>
 								<key>RubberWindowFrame</key>
-								<string>24 178 1268 677 0 0 1440 878 </string>
+								<string>24 106 967 749 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXDebugSessionModule</string>
 							<key>Proportion</key>
-							<string>636pt</string>
+							<string>708pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>636pt</string>
+					<string>708pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>F47F3C26118F6A3800625E6D</string>
+				<string>F44F4D5C118F9E91008A8E94</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>F47F3C27118F6A3800625E6D</string>
-				<string>F47F3C28118F6A3800625E6D</string>
-				<string>F47F3C29118F6A3800625E6D</string>
-				<string>F47F3C2A118F6A3800625E6D</string>
-				<string>F47F3C2B118F6A3800625E6D</string>
+				<string>F44F4D5D118F9E91008A8E94</string>
+				<string>F44F4D5E118F9E91008A8E94</string>
+				<string>F44F4D5F118F9E91008A8E94</string>
+				<string>F44F4D60118F9E91008A8E94</string>
+				<string>F44F4D61118F9E91008A8E94</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
 			<key>WindowString</key>
-			<string>24 178 1268 677 0 0 1440 878 </string>
+			<string>24 106 967 749 0 0 1440 878 </string>
 			<key>WindowToolGUID</key>
 			<string>1CD10A99069EF8BA00B06720</string>
 			<key>WindowToolIsVisible</key>
-			<false/>
+			<true/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>F47F3C2C118F6A3800625E6D</string>
+				<string>F44F4D62118F9E91008A8E94</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>
-			<false/>
+			<true/>
 		</dict>
 		<dict>
 			<key>Identifier</key>
 			<string>743 379 452 308 0 0 1280 1002 </string>
 		</dict>
 		<dict>
+			<key>FirstTimeWindowDisplayed</key>
+			<false/>
 			<key>Identifier</key>
 			<string>windowTool.breakpoints</string>
 			<key>IsVertical</key>
-			<integer>0</integer>
+			<false/>
 			<key>Layout</key>
 			<array>
 				<dict>
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXBottomSmartGroupGIDs</key>
 								<key>PBXTopSmartGroupGIDs</key>
 								<array/>
 								<key>XCIncludePerspectivesSwitch</key>
-								<integer>0</integer>
+								<false/>
 							</dict>
 							<key>GeometryConfiguration</key>
 							<dict>
 									<real>168</real>
 								</array>
 								<key>RubberWindowFrame</key>
-								<string>315 424 744 409 0 0 1440 878 </string>
+								<string>45 423 744 409 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXSmartGroupTreeModule</string>
 							<string>185pt</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<key>Frame</key>
 								<string>{{190, 0}, {554, 368}}</string>
 								<key>RubberWindowFrame</key>
-								<string>315 424 744 409 0 0 1440 878 </string>
+								<string>45 423 744 409 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 				<string>XCDetailModule</string>
 			</array>
 			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
+			<true/>
 			<key>TableOfContents</key>
 			<array>
-				<string>1CDDB66807F98D9800BB5817</string>
-				<string>1CDDB66907F98D9800BB5817</string>
+				<string>F47F3D82118F876500625E6D</string>
+				<string>F47F3D83118F876500625E6D</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
 				<string>1CA1AED706398EBD00589147</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.breakpointsV3</string>
 			<key>WindowString</key>
-			<string>315 424 744 409 0 0 1440 878 </string>
+			<string>45 423 744 409 0 0 1440 878 </string>
 			<key>WindowToolGUID</key>
-			<string>1CDDB66807F98D9800BB5817</string>
+			<string>F47F3D82118F876500625E6D</string>
 			<key>WindowToolIsVisible</key>
-			<integer>1</integer>
+			<false/>
 		</dict>
 		<dict>
 			<key>Identifier</key>

File ChanelVocoderAUEffect/ChanelVocoderAUEffect.xcodeproj/sdrazin.pbxuser

 			8D01CCC60486CAD60068D4B7 /* ChanelVocoderAUEffect */,
 		);
 		breakpoints = (
+			F461090F118F9DF500C151E4 /* ChanelVocoderAUEffect.cpp:299 */,
+			F4610911118F9DF900C151E4 /* ChanelVocoderAUEffect.cpp:303 */,
+			F4610913118F9E3800C151E4 /* ChanelVocoderAUEffect.cpp:193 */,
+			F44F4D52118F9E88008A8E94 /* Transform.c:82 */,
 		);
 		codeSenseManager = F4AC63C0117E3BB40064A2E0 /* Code sense */;
 		executables = (
 			F477CFAD118DFCAB00F5E1B6 /* ChannelVocoder */,
 		);
 		perUserDictionary = {
+			"PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXBreakpointsDataSource_BreakpointID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					20,
+					20,
+					198,
+					20,
+					99,
+					99,
+					29,
+					20,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXBreakpointsDataSource_ActionID,
+					PBXBreakpointsDataSource_TypeID,
+					PBXBreakpointsDataSource_BreakpointID,
+					PBXBreakpointsDataSource_UseID,
+					PBXBreakpointsDataSource_LocationID,
+					PBXBreakpointsDataSource_ConditionID,
+					PBXBreakpointsDataSource_IgnoreCountID,
+					PBXBreakpointsDataSource_ContinueID,
+				);
+			};
 			PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = {
 				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
 				PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID;
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 294611242;
-			PBXWorkspaceStateSaveDate = 294611242;
+			PBXPerProjectTemplateStateSaveDate = 294624892;
+			PBXWorkspaceStateSaveDate = 294624892;
 		};
 		perUserProjectItems = {
 			F4156E18118A15E200660B62 = F4156E18118A15E200660B62 /* PBXTextBookmark */;
-			F477CFCA118E002800F5E1B6 = F477CFCA118E002800F5E1B6 /* PBXTextBookmark */;
-			F477D01C118E235400F5E1B6 = F477D01C118E235400F5E1B6 /* PBXTextBookmark */;
-			F477D01D118E235400F5E1B6 = F477D01D118E235400F5E1B6 /* PBXTextBookmark */;
-			F477D01E118E235400F5E1B6 = F477D01E118E235400F5E1B6 /* PBXTextBookmark */;
-			F477D01F118E235400F5E1B6 = F477D01F118E235400F5E1B6 /* PBXTextBookmark */;
-			F47F3C1B118F692B00625E6D /* PBXTextBookmark */ = F47F3C1B118F692B00625E6D /* PBXTextBookmark */;
-			F47F3C25118F6A3800625E6D /* PBXTextBookmark */ = F47F3C25118F6A3800625E6D /* PBXTextBookmark */;
-			F47F3C34118F6B2600625E6D /* XCBuildMessageTextBookmark */ = F47F3C34118F6B2600625E6D /* XCBuildMessageTextBookmark */;
-			F47F3C35118F6B2600625E6D /* PBXTextBookmark */ = F47F3C35118F6B2600625E6D /* PBXTextBookmark */;
-			F47F3C67118F6CA600625E6D /* PBXTextBookmark */ = F47F3C67118F6CA600625E6D /* PBXTextBookmark */;
-			F47F3C68118F6CB200625E6D /* PBXTextBookmark */ = F47F3C68118F6CB200625E6D /* PBXTextBookmark */;
-			F47F3C69118F6CB200625E6D /* PBXTextBookmark */ = F47F3C69118F6CB200625E6D /* PBXTextBookmark */;
-			F47F3C6A118F6CB200625E6D /* PBXTextBookmark */ = F47F3C6A118F6CB200625E6D /* PBXTextBookmark */;
-			F47F3CBE118F732900625E6D /* XCBuildMessageTextBookmark */ = F47F3CBE118F732900625E6D /* XCBuildMessageTextBookmark */;
-			F47F3CBF118F732900625E6D /* PBXTextBookmark */ = F47F3CBF118F732900625E6D /* PBXTextBookmark */;
+			F44F4D56118F9E91008A8E94 /* PBXTextBookmark */ = F44F4D56118F9E91008A8E94 /* PBXTextBookmark */;
+			F44F4D57118F9E91008A8E94 /* PBXTextBookmark */ = F44F4D57118F9E91008A8E94 /* PBXTextBookmark */;
+			F44F4D58118F9E91008A8E94 /* PBXTextBookmark */ = F44F4D58118F9E91008A8E94 /* PBXTextBookmark */;
+			F44F4D6D118F9FED008A8E94 /* PBXTextBookmark */ = F44F4D6D118F9FED008A8E94 /* PBXTextBookmark */;
+			F44F4D6E118F9FED008A8E94 /* XCBuildMessageTextBookmark */ = F44F4D6E118F9FED008A8E94 /* XCBuildMessageTextBookmark */;
+			F44F4D6F118F9FED008A8E94 /* PBXTextBookmark */ = F44F4D6F118F9FED008A8E94 /* PBXTextBookmark */;
+			F44F4D72118F9FEF008A8E94 /* PBXTextBookmark */ = F44F4D72118F9FEF008A8E94 /* PBXTextBookmark */;
+			F44F4D73118F9FEF008A8E94 /* PBXTextBookmark */ = F44F4D73118F9FEF008A8E94 /* PBXTextBookmark */;
+			F44F4D74118F9FEF008A8E94 /* PBXTextBookmark */ = F44F4D74118F9FEF008A8E94 /* PBXTextBookmark */;
+			F44F4D75118F9FEF008A8E94 /* PBXTextBookmark */ = F44F4D75118F9FEF008A8E94 /* PBXTextBookmark */;
+			F44F4D76118F9FEF008A8E94 /* XCBuildMessageTextBookmark */ = F44F4D76118F9FEF008A8E94 /* XCBuildMessageTextBookmark */;
+			F44F4D77118F9FEF008A8E94 /* PBXTextBookmark */ = F44F4D77118F9FEF008A8E94 /* PBXTextBookmark */;
+			F44F4D7D118FA09E008A8E94 /* PBXTextBookmark */ = F44F4D7D118FA09E008A8E94 /* PBXTextBookmark */;
+			F44F4D7E118FA09E008A8E94 /* PBXTextBookmark */ = F44F4D7E118FA09E008A8E94 /* PBXTextBookmark */;
+			F44F4D7F118FA09E008A8E94 /* PBXTextBookmark */ = F44F4D7F118FA09E008A8E94 /* PBXTextBookmark */;
+			F4610919118F9E4000C151E4 = F4610919118F9E4000C151E4 /* PBXTextBookmark */;
+			F461091A118F9E4000C151E4 = F461091A118F9E4000C151E4 /* PBXTextBookmark */;
+			F461091B118F9E4000C151E4 = F461091B118F9E4000C151E4 /* PBXTextBookmark */;
+			F461091C118F9E4000C151E4 = F461091C118F9E4000C151E4 /* PBXTextBookmark */;
+			F4610920118F9E5F00C151E4 = F4610920118F9E5F00C151E4 /* PBXTextBookmark */;
+			F47F3CF8118F7CD800625E6D = F47F3CF8118F7CD800625E6D /* PBXTextBookmark */;
 			F4A2E0A61188C39A003E52C1 = F4A2E0A61188C39A003E52C1 /* PBXTextBookmark */;
 			F4A7E8AE11838341007A162C = F4A7E8AE11838341007A162C /* PBXTextBookmark */;
 			F4AC63D5117E3C5D0064A2E0 = F4AC63D5117E3C5D0064A2E0 /* PBXTextBookmark */;
 			F4B25C981183AE32009BA0D3 = F4B25C981183AE32009BA0D3 /* PBXTextBookmark */;
 			F4B52BF0118622C6009C2A96 = F4B52BF0118622C6009C2A96 /* PBXTextBookmark */;
-			F4B52BF1118622C6009C2A96 = F4B52BF1118622C6009C2A96 /* PBXTextBookmark */;
 		};
 		sourceControlManager = F4AC63BF117E3BB40064A2E0 /* Source Control */;
 		userBuildSettings = {
 	};
 	8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */ = {
 		uiCtxt = {
-			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{3100, 31}\";\n            s = 0;\n        },\n                {\n            r = \"{7514, 833}\";\n            s = 0;\n        },\n                {\n            r = \"{8682, 167}\";\n            s = 0;\n        },\n                {\n            r = \"{9175, 173}\";\n            s = 0;\n        },\n                {\n            r = \"{9446, 180}\";\n            s = 0;\n        },\n                {\n            r = \"{9721, 159}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 12046}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {964, 3497}}";
-			sepNavSelRange = "{10507, 0}";
-			sepNavVisRange = "{9060, 1319}";
+			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{1, 2608}\";\n            s = 0;\n        },\n                {\n            r = \"{3100, 31}\";\n            s = 0;\n        },\n                {\n            r = \"{3596, 218}\";\n            s = 0;\n        },\n                {\n            r = \"{4330, 52}\";\n            s = 0;\n        },\n                {\n            r = \"{4884, 811}\";\n            s = 0;\n        },\n                {\n            r = \"{6328, 93}\";\n            s = 0;\n        },\n                {\n            r = \"{6964, 72}\";\n            s = 0;\n        },\n                {\n            r = \"{8869, 167}\";\n            s = 0;\n        },\n                {\n            r = \"{9362, 232}\";\n            s = 0;\n        },\n                {\n            r = \"{9692, 239}\";\n            s = 0;\n        },\n                {\n            r = \"{10026, 155}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 12367}\";\n    s = 0;\n}";
+			sepNavIntBoundsRect = "{{0, 0}, {964, 2262}}";
+			sepNavSelRange = "{4616, 0}";
+			sepNavVisRange = "{3981, 1628}";
 		};
 	};
 	8BA05A670720730100365D66 /* ChanelVocoderAUEffect.exp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {943, 573}}";
+			sepNavIntBoundsRect = "{{0, 0}, {943, 562}}";
 			sepNavSelRange = "{0, 0}";
 			sepNavVisRange = "{0, 28}";
 		};
 	8BA05A7F072073D200365D66 /* AUBase.cpp */ = {
 		uiCtxt = {
 			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{1, 2443}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 66798}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {1040, 26949}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 1235}";
+			sepNavIntBoundsRect = "{{0, 0}, {795, 27261}}";
+			sepNavSelRange = "{5059, 0}";
+			sepNavVisRange = "{5225, 549}";
+		};
+	};
+	8BA05A80072073D200365D66 /* AUBase.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {795, 11622}}";
+			sepNavSelRange = "{19729, 0}";
+			sepNavVisRange = "{19215, 1066}";
+		};
+	};
+	8BA05A81072073D200365D66 /* AUDispatch.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {873, 6071}}";
+			sepNavSelRange = "{4638, 0}";
+			sepNavVisRange = "{12080, 587}";
+		};
+	};
+	8BA05A84072073D200365D66 /* AUInputElement.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {795, 1313}}";
+			sepNavSelRange = "{2921, 0}";
+			sepNavVisRange = "{2783, 1114}";
+		};
+	};
+	8BA05A88072073D200365D66 /* AUScopeElement.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {845, 6344}}";
+			sepNavSelRange = "{11694, 0}";
+			sepNavVisRange = "{10879, 967}";
+		};
+	};
+	8BA05A89072073D200365D66 /* AUScopeElement.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1069, 6695}}";
+			sepNavSelRange = "{9501, 0}";
+			sepNavVisRange = "{9053, 1072}";
+		};
+	};
+	8BA05A8B072073D200365D66 /* ComponentBase.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {985, 2886}}";
+			sepNavSelRange = "{5185, 0}";
+			sepNavVisRange = "{4731, 938}";
 		};
 	};
 	8BA05A9A072073D200365D66 /* AUEffectBase.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1207, 6240}}";
-			sepNavSelRange = "{8635, 0}";
-			sepNavVisRange = "{8207, 718}";
+			sepNavIntBoundsRect = "{{0, 0}, {795, 6305}}";
+			sepNavSelRange = "{16233, 0}";
+			sepNavVisRange = "{15982, 637}";
 		};
 	};
 	8BA05A9B072073D200365D66 /* AUEffectBase.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1207, 3432}}";
-			sepNavSelRange = "{8533, 0}";
-			sepNavVisRange = "{8227, 752}";
+			sepNavIntBoundsRect = "{{0, 0}, {894, 3523}}";
+			sepNavSelRange = "{9256, 0}";
+			sepNavVisRange = "{8685, 784}";
+		};
+	};
+	8BA05AA7072073D200365D66 /* AUBuffer.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {873, 2496}}";
+			sepNavSelRange = "{3076, 0}";
+			sepNavVisRange = "{2958, 818}";
 		};
 	};
 	8BA05AA8072073D200365D66 /* AUBuffer.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1207, 3471}}";
-			sepNavSelRange = "{8189, 0}";
-			sepNavVisRange = "{7876, 546}";
+			sepNavIntBoundsRect = "{{0, 0}, {795, 3536}}";
+			sepNavSelRange = "{7569, 0}";
+			sepNavVisRange = "{7879, 534}";
+		};
+	};
+	8BA05AE40720742100365D66 /* CAStreamBasicDescription.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {795, 3861}}";
+			sepNavSelRange = "{5477, 0}";
+			sepNavVisRange = "{4998, 682}";
 		};
 	};
 	8BC6025B073B072D006C4272 /* ChanelVocoderAUEffect.h */ = {
 		uiCtxt = {
-			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{1, 2606}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 5384}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {943, 1365}}";
-			sepNavSelRange = "{2494, 0}";
-			sepNavVisRange = "{1440, 1199}";
+			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{1, 2606}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 5412}\";\n    s = 0;\n}";
+			sepNavIntBoundsRect = "{{0, 0}, {943, 1339}}";
+			sepNavSelRange = "{2508, 13}";
+			sepNavVisRange = "{1481, 1186}";
 		};
 	};
 	8D01CCC60486CAD60068D4B7 /* ChanelVocoderAUEffect */ = {
 		vrLen = 1869;
 		vrLoc = 0;
 	};
+	F44F4D52118F9E88008A8E94 /* Transform.c:82 */ = {
+		isa = PBXFileBreakpoint;
+		actions = (
+		);
+		breakpointStyle = 0;
+		continueAfterActions = 0;
+		countType = 0;
+		delayBeforeContinue = 0;
+		fileReference = F4AC63C1117E3BDC0064A2E0 /* Transform.c */;
+		functionName = "read_carrier_buffer()";
+		hitCount = 2;
+		ignoreCount = 0;
+		lineNumber = 82;
+		location = ChanelVocoderAUEffect;
+		modificationTime = 294625336.21588;
+		originalNumberOfMultipleMatches = 1;
+		state = 1;
+	};
+	F44F4D56118F9E91008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = F4AC63C1117E3BDC0064A2E0 /* Transform.c */;
+		name = "Transform.c: 38";
+		rLen = 0;
+		rLoc = 686;
+		rType = 0;
+		vrLen = 2151;
+		vrLoc = 0;
+	};
+	F44F4D57118F9E91008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
+		name = "ChanelVocoderAUEffect.cpp: 77";
+		rLen = 0;
+		rLoc = 3814;
+		rType = 0;
+		vrLen = 1915;
+		vrLoc = 7664;
+	};
+	F44F4D58118F9E91008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
+		name = "ChanelVocoderAUEffect.cpp: 77";
+		rLen = 0;
+		rLoc = 3814;
+		rType = 0;
+		vrLen = 1593;
+		vrLoc = 7664;
+	};
+	F44F4D6D118F9FED008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = F4AC63C2117E3BDC0064A2E0 /* Transform.h */;
+		name = "Transform.h: 39";
+		rLen = 0;
+		rLoc = 815;
+		rType = 0;
+		vrLen = 648;
+		vrLoc = 791;
+	};
+	F44F4D6E118F9FED008A8E94 /* XCBuildMessageTextBookmark */ = {
+		isa = PBXTextBookmark;
+		comments = "Incompatible types in return";
+		fRef = F4AC63C1117E3BDC0064A2E0 /* Transform.c */;
+		fallbackIsa = XCBuildMessageTextBookmark;
+		rLen = 1;
+		rLoc = 77;
+		rType = 1;
+	};
+	F44F4D6F118F9FED008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = F4AC63C1117E3BDC0064A2E0 /* Transform.c */;
+		name = "Transform.c: 78";
+		rLen = 0;
+		rLoc = 1598;
+		rType = 0;
+		vrLen = 840;
+		vrLoc = 869;
+	};
+	F44F4D72118F9FEF008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A670720730100365D66 /* ChanelVocoderAUEffect.exp */;
+		name = "ChanelVocoderAUEffect.exp: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 28;
+		vrLoc = 0;
+	};
+	F44F4D73118F9FEF008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = F4AC63C1117E3BDC0064A2E0 /* Transform.c */;
+		name = "Transform.c: 72";
+		rLen = 0;
+		rLoc = 1219;
+		rType = 0;
+		vrLen = 2173;
+		vrLoc = 0;
+	};
+	F44F4D74118F9FEF008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BC6025B073B072D006C4272 /* ChanelVocoderAUEffect.h */;
+		name = "ChanelVocoderAUEffect.h: 129";
+		rLen = 13;
+		rLoc = 5113;
+		rType = 0;
+		vrLen = 1186;
+		vrLoc = 4086;
+	};
+	F44F4D75118F9FEF008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
+		name = "ChanelVocoderAUEffect.cpp: 302";
+		rLen = 0;
+		rLoc = 12048;
+		rType = 0;
+		vrLen = 1195;
+		vrLoc = 11172;
+	};
+	F44F4D76118F9FEF008A8E94 /* XCBuildMessageTextBookmark */ = {
+		isa = PBXTextBookmark;
+		comments = "'carrierData' defined but not used";
+		fRef = F4AC63C2117E3BDC0064A2E0 /* Transform.h */;
+		fallbackIsa = XCBuildMessageTextBookmark;
+		rLen = 1;
+		rLoc = 38;
+		rType = 1;
+	};
+	F44F4D77118F9FEF008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = F4AC63C2117E3BDC0064A2E0 /* Transform.h */;
+		name = "Transform.h: 39";
+		rLen = 0;
+		rLoc = 815;
+		rType = 0;
+		vrLen = 1158;
+		vrLoc = 349;
+	};
+	F44F4D7D118FA09E008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = F4AC63C2117E3BDC0064A2E0 /* Transform.h */;
+		name = "Transform.h: 39";
+		rLen = 0;
+		rLoc = 815;
+		rType = 0;
+		vrLen = 1158;
+		vrLoc = 349;
+	};
+	F44F4D7E118FA09E008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
+		rLen = 0;
+		rLoc = 192;
+		rType = 1;
+	};
+	F44F4D7F118FA09E008A8E94 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
+		name = "ChanelVocoderAUEffect.cpp: 193";
+		rLen = 0;
+		rLoc = 8494;
+		rType = 0;
+		vrLen = 2417;
+		vrLoc = 7859;
+	};
+	F461090F118F9DF500C151E4 /* ChanelVocoderAUEffect.cpp:299 */ = {
+		isa = PBXFileBreakpoint;
+		actions = (
+		);
+		breakpointStyle = 0;
+		continueAfterActions = 0;
+		countType = 0;
+		delayBeforeContinue = 0;
+		fileReference = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
+		functionName = "ChanelVocoderAUEffect::ChanelVocoderAUEffectKernel::Process( const Float32 *inSourceP, Float32 *inDestP, UInt32 inFramesToProcess, UInt32 inNumChannels, // for version 2 AudioUnits inNumChannels is always 1 bool &ioSilence )";
+		hitCount = 18;
+		ignoreCount = 0;
+		lineNumber = 299;
+		location = ChanelVocoderAUEffect;
+		modificationTime = 294625363.360389;
+		originalNumberOfMultipleMatches = 1;
+		state = 1;
+	};
+	F4610911118F9DF900C151E4 /* ChanelVocoderAUEffect.cpp:303 */ = {
+		isa = PBXFileBreakpoint;
+		actions = (
+		);
+		breakpointStyle = 0;
+		continueAfterActions = 0;
+		countType = 0;
+		delayBeforeContinue = 0;
+		fileReference = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
+		functionName = "ChanelVocoderAUEffect::ChanelVocoderAUEffectKernel::Process( const Float32 *inSourceP, Float32 *inDestP, UInt32 inFramesToProcess, UInt32 inNumChannels, // for version 2 AudioUnits inNumChannels is always 1 bool &ioSilence )";
+		hitCount = 18;
+		ignoreCount = 0;
+		lineNumber = 303;
+		location = ChanelVocoderAUEffect;
+		modificationTime = 294625363.576724;
+		originalNumberOfMultipleMatches = 1;
+		state = 1;
+	};
+	F4610913118F9E3800C151E4 /* ChanelVocoderAUEffect.cpp:193 */ = {
+		isa = PBXFileBreakpoint;
+		actions = (
+		);
+		breakpointStyle = 0;
+		continueAfterActions = 0;
+		countType = 0;
+		delayBeforeContinue = 0;
+		fileReference = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
+		functionName = "ChanelVocoderAUEffect::ChanelVocoderAUEffectKernel::ChanelVocoderAUEffectKernel(AUEffectBase *inAudioUnit)";
+		hitCount = 2;
+		ignoreCount = 0;
+		lineNumber = 193;
+		location = ChanelVocoderAUEffect;
+		modificationTime = 294625333.447972;
+		originalNumberOfMultipleMatches = 1;
+		state = 1;
+	};
+	F4610919118F9E4000C151E4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BC6025B073B072D006C4272 /* ChanelVocoderAUEffect.h */;
+		name = "ChanelVocoderAUEffect.h: 129";
+		rLen = 0;
+		rLoc = 5127;
+		rType = 0;
+		vrLen = 1144;
+		vrLoc = 4045;
+	};
+	F461091A118F9E4000C151E4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = F4AC63C2117E3BDC0064A2E0 /* Transform.h */;
+		name = "Transform.h: 31";
+		rLen = 0;
+		rLoc = 635;
+		rType = 0;
+		vrLen = 1153;
+		vrLoc = 349;
+	};
+	F461091B118F9E4000C151E4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = F4AC63C1117E3BDC0064A2E0 /* Transform.c */;
+		name = "Transform.c: 75";
+		rLen = 0;
+		rLoc = 1288;
+		rType = 0;
+		vrLen = 4037;
+		vrLoc = 891;
+	};
+	F461091C118F9E4000C151E4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
+		name = "ChanelVocoderAUEffect.cpp: 162";
+		rLen = 0;
+		rLoc = 3716;
+		rType = 0;
+		vrLen = 2441;
+		vrLoc = 772;
+	};
+	F4610920118F9E5F00C151E4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
+		name = "ChanelVocoderAUEffect.cpp: 77";
+		rLen = 0;
+		rLoc = 3814;
+		rType = 0;
+		vrLen = 1915;
+		vrLoc = 7664;
+	};
 	F477CFAD118DFCAB00F5E1B6 /* ChannelVocoder */ = {
 		isa = PBXExecutable;
 		activeArgIndices = (
 		path = "/Developer/Applications/Audio/AU Lab.app";
 		sourceTree = "<absolute>";
 	};
-	F477CFCA118E002800F5E1B6 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BC6025B073B072D006C4272 /* ChanelVocoderAUEffect.h */;
-		name = "ChanelVocoderAUEffect.h: 60";
-		rLen = 0;
-		rLoc = 3003;
-		rType = 0;
-		vrLen = 3948;
-		vrLoc = 0;
-	};
-	F477D01C118E235400F5E1B6 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = F4AC63C1117E3BDC0064A2E0 /* Transform.c */;
-		name = "Transform.c: 70";
-		rLen = 19;
-		rLoc = 1174;
-		rType = 0;
-		vrLen = 4618;
-		vrLoc = 385;
-	};
-	F477D01D118E235400F5E1B6 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = F4AC63C2117E3BDC0064A2E0 /* Transform.h */;
-		name = "Transform.h: 48";
-		rLen = 0;
-		rLoc = 1055;
-		rType = 0;
-		vrLen = 1157;
-		vrLoc = 250;
-	};
-	F477D01E118E235400F5E1B6 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
-		name = "ChanelVocoderAUEffect.cpp: 299";
-		rLen = 0;
-		rLoc = 11925;
-		rType = 0;
-		vrLen = 2232;
-		vrLoc = 7662;
-	};
-	F477D01F118E235400F5E1B6 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
-		name = "ChanelVocoderAUEffect.cpp: 192";
-		rLen = 0;
-		rLoc = 8347;
-		rType = 0;
-		vrLen = 2077;
-		vrLoc = 11188;
-	};
-	F47F3C1B118F692B00625E6D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
-		name = "ChanelVocoderAUEffect.cpp: 192";
-		rLen = 0;
-		rLoc = 8347;
-		rType = 0;
-		vrLen = 2077;
-		vrLoc = 11188;
-	};
-	F47F3C25118F6A3800625E6D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
-		name = "ChanelVocoderAUEffect.cpp: 171";
-		rLen = 0;
-		rLoc = 7859;
-		rType = 0;
-		vrLen = 1509;
-		vrLoc = 6803;
-	};
-	F47F3C34118F6B2600625E6D /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "No matching function for call to 'TAUBuffer<float>::Clear(int)'";
-		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 203;
-		rType = 1;
-	};
-	F47F3C35118F6B2600625E6D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
-		name = "ChanelVocoderAUEffect.cpp: 205";
-		rLen = 0;
-		rLoc = 8772;
-		rType = 0;
-		vrLen = 918;
-		vrLoc = 8394;
-	};
-	F47F3C67118F6CA600625E6D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
-		name = "ChanelVocoderAUEffect.cpp: 205";
-		rLen = 0;
-		rLoc = 8772;
-		rType = 0;
-		vrLen = 874;
-		vrLoc = 8018;
-	};
-	F47F3C68118F6CB200625E6D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
-		name = "ChanelVocoderAUEffect.cpp: 209";
-		rLen = 0;
-		rLoc = 8849;
-		rType = 0;
-		vrLen = 4329;
-		vrLoc = 0;
-	};
-	F47F3C69118F6CB200625E6D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BC6025B073B072D006C4272 /* ChanelVocoderAUEffect.h */;
-		name = "ChanelVocoderAUEffect.h: 130";
-		rLen = 0;
-		rLoc = 5099;
-		rType = 0;
-		vrLen = 3794;
-		vrLoc = 0;
-	};
-	F47F3C6A118F6CB200625E6D /* PBXTextBookmark */ = {
+	F47F3CF8118F7CD800625E6D /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BA05A670720730100365D66 /* ChanelVocoderAUEffect.exp */;
 		name = "ChanelVocoderAUEffect.exp: 1";
 		vrLen = 28;
 		vrLoc = 0;
 	};
-	F47F3CBE118F732900625E6D /* XCBuildMessageTextBookmark */ = {
-		isa = PBXTextBookmark;
-		comments = "'carrierData' was not declared in this scope";
-		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
-		rLen = 1;
-		rLoc = 298;
-		rType = 1;
-	};
-	F47F3CBF118F732900625E6D /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A660720730100365D66 /* ChanelVocoderAUEffect.cpp */;
-		name = "ChanelVocoderAUEffect.cpp: 298";
-		rLen = 0;
-		rLoc = 11846;
-		rType = 0;
-		vrLen = 617;
-		vrLoc = 11490;
-	};
 	F4A2E0A61188C39A003E52C1 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 8BA05A9B072073D200365D66 /* AUEffectBase.h */;
 	};
 	F4AC63C1117E3BDC0064A2E0 /* Transform.c */ = {
 		uiCtxt = {
-			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{284, 99}\";\n            s = 0;\n        },\n                {\n            r = \"{439, 247}\";\n            s = 0;\n        },\n                {\n            r = \"{732, 135}\";\n            s = 0;\n        },\n                {\n            r = \"{892, 107}\";\n            s = 0;\n        },\n                {\n            r = \"{1031, 72}\";\n            s = 0;\n        },\n                {\n            r = \"{1721, 300}\";\n            s = 0;\n        },\n                {\n            r = \"{2081, 291}\";\n            s = 0;\n        },\n                {\n            r = \"{2419, 294}\";\n            s = 0;\n        },\n                {\n            r = \"{2760, 298}\";\n            s = 0;\n        },\n                {\n            r = \"{3096, 211}\";\n            s = 0;\n        },\n                {\n            r = \"{3443, 1144}\";\n            s = 0;\n        },\n                {\n            r = \"{4626, 32}\";\n            s = 0;\n        },\n                {\n            r = \"{4716, 286}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 5003}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {943, 923}}";
-			sepNavSelRange = "{704, 0}";
-			sepNavVisRange = "{0, 1018}";
+			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{1, 149}\";\n            s = 0;\n        },\n                {\n            r = \"{284, 99}\";\n            s = 0;\n        },\n                {\n            r = \"{439, 247}\";\n            s = 0;\n        },\n                {\n            r = \"{732, 135}\";\n            s = 0;\n        },\n                {\n            r = \"{892, 107}\";\n            s = 0;\n        },\n                {\n            r = \"{1031, 75}\";\n            s = 0;\n        },\n                {\n            r = \"{1818, 301}\";\n            s = 0;\n        },\n                {\n            r = \"{2179, 359}\";\n            s = 0;\n        },\n                {\n            r = \"{2585, 294}\";\n            s = 0;\n        },\n                {\n            r = \"{2926, 491}\";\n            s = 0;\n        },\n                {\n            r = \"{3455, 211}\";\n            s = 0;\n        },\n                {\n            r = \"{3802, 1149}\";\n            s = 0;\n        },\n                {\n            r = \"{4990, 32}\";\n            s = 0;\n        },\n                {\n            r = \"{5080, 286}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 5367}\";\n    s = 0;\n}";
+			sepNavIntBoundsRect = "{{0, 0}, {906, 780}}";
+			sepNavSelRange = "{880, 0}";
+			sepNavVisRange = "{0, 964}";
 			sepNavWindowFrame = "{{15, 89}, {729, 784}}";
 		};
 	};
 	F4AC63C2117E3BDC0064A2E0 /* Transform.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {943, 884}}";
-			sepNavSelRange = "{1048, 30}";
-			sepNavVisRange = "{433, 1082}";
+			sepNavIntBoundsRect = "{{0, 0}, {943, 845}}";
+			sepNavSelRange = "{815, 0}";
+			sepNavVisRange = "{349, 1158}";
 		};
 	};
 	F4AC63C7117E3C0C0064A2E0 /* fftw3.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {954, 4927}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 1869}";
+			sepNavIntBoundsRect = "{{0, 0}, {795, 4914}}";
+			sepNavSelRange = "{14736, 58}";
+			sepNavVisRange = "{14028, 980}";
 		};
 	};
 	F4AC63D5117E3C5D0064A2E0 /* PBXTextBookmark */ = {
 		vrLen = 666;
 		vrLoc = 7780;
 	};
-	F4B52BF1118622C6009C2A96 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 8BA05A670720730100365D66 /* ChanelVocoderAUEffect.exp */;
-		name = "ChanelVocoderAUEffect.exp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 28;
-		vrLoc = 0;
-	};
 }

File ChanelVocoderAUEffect/Transform.c

 void			window(double *data)
 { 
 	int i;
-	for (i = 0; i < kBufferLength; i++)
+	for (i = 0; i < kBufferLength; i += 1)
 		data[i] *= hanning[i];
 }
 
 // --------------------------------------------------------
 
-void			read_carrier_buffer()
+double			*read_carrier_buffer()
 {
-	SF_INFO	sfinfo ;
-	
-	const char *carrierFilename = "/Users/sdrazin/Desktop/dance_buffer.wav";
+	SF_INFO	sfinfo;	
+	//	Music/AudioClips/ChannelVocoder/Carriers/
+	const char *carrierFilename = "/Users/sdrazin/Desktop/dance_buffer.wav";	//chord_buffer.wav";
 	if (! (carrierFile = sf_open(carrierFilename, SFM_READ, &sfinfo)))
     {   printf ("Not able to open carrier file %s.\n", carrierFilename);
 		puts (sf_strerror(NULL)) ; // Prints the error message from libsndfile. 
-        return;
+        return NULL;
 	}
 	sf_read_double (carrierFile, carrierData, kBufferLength);
 	sf_close(carrierFile);
+	return carrierData;
 }
 
 // --------------------------------------------------------
 
 double			*compute_fft_to_double(double *data)
-{	int n = kBufferLength;
+{
 	fftw_complex *out;
 	fftw_plan plan_forward;
-	out = fftw_malloc(sizeof(fftw_complex)*n);
-	plan_forward = fftw_plan_dft_r2c_1d(n, data, out, FFTW_ESTIMATE);
+	out = fftw_malloc(sizeof(fftw_complex)*kBufferLength);
+	plan_forward = fftw_plan_dft_r2c_1d(kBufferLength, data, out, FFTW_ESTIMATE);
 	fftw_execute(plan_forward);
 	fftw_destroy_plan(plan_forward);
 	if (SHOULD_FREE) fftw_free(out);
 	fftw_complex *out;
 	fftw_plan plan_forward;
 	out = fftw_malloc(sizeof(fftw_complex)*kBufferLength);
+
+	// fftw_plan_dft_r2c_1d() takes double *in, and fftw_complex *out
 	plan_forward = fftw_plan_dft_r2c_1d(kBufferLength, data, out, FFTW_ESTIMATE);
 	fftw_execute(plan_forward);
 	fftw_destroy_plan(plan_forward);
 }
 
 double			*compute_ifft(fftw_complex *data)
-{	int n = kBufferLength;
+{
+	// TODO: look into why declaring things the old way (below) was f-ing shit up.
+	//fftw_complex *out;
+	
 	double *out;
 	fftw_plan plan_backward;
-	out = fftw_malloc(sizeof(fftw_complex)*n);
-	plan_backward = fftw_plan_dft_c2r_1d(n, data, out, FFTW_ESTIMATE);
+	out = fftw_malloc(sizeof(double)*kBufferLength);	//sizeof(fftw_complex)
+	
+	// fftw_plan_dft_c2r_1d() takes fftw_complex *in, and double *out
+	plan_backward = fftw_plan_dft_c2r_1d(kBufferLength, data, out, FFTW_ESTIMATE);
 	fftw_execute(plan_backward);
 	fftw_destroy_plan(plan_backward);
 	if (SHOULD_FREE) fftw_free(out);
+	
 	return (double*) out;
 }
 
 	fftw_complex *fft_carrier	= compute_fft_to_fftw_complex(carrier);
 	
 	// Rescale
-	fft_modulator = rescale(fft_modulator);
-	fft_carrier = rescale(fft_carrier);
+	fft_modulator	= rescale(fft_modulator);
+	fft_carrier		= rescale(fft_carrier);
 	
 	// Frequency Domain processing here...
-	fftw_complex *synthOut = (fftw_complex*)malloc(kBufferLength*sizeof(fftw_complex));
+	fftw_complex *synthOut = (fftw_complex*)fftw_malloc(kBufferLength*sizeof(fftw_complex));
 	int i, j;
 	double averageMagnitudeOfBins;
 	
 		for (j = i; (j < i + kBandInterval) && (j < kBufferLength); j += 1)
 		{
 			synthOut[j][0] = averageMagnitudeOfBins*(fft_carrier[j][0])*normGain;
-			synthOut[j][1] = 0;//averageMagnitudeOfBins*(fft_carrier[j][1])*normGain;
+			synthOut[j][1] = averageMagnitudeOfBins*(fft_carrier[j][1])*normGain;
 		}			
 	}	
 	
 	// Back to Time Domain
 	double *ifft_result = compute_ifft(synthOut);	
-	free(synthOut);
+	fftw_free(synthOut);
 	
 	//	ifft_result = normalize(ifft_result);
-	
 	window(ifft_result);
 	return ifft_result;	
 }

File ChanelVocoderAUEffect/Transform.h

 #include	<math.h>
 #include	"sndfile.h"
 #include	"fftw3.h"
-
+	
 #define		pi						acos(-1.0)
 #define		kBufferLength			512
 #define		kLongBufferLength		2*kBufferLength
 #define		kNormalizedAmplitude	0.95
 	
 #define		SHOULD_FREE				0
-#define		normGain				35	
+#define		normGain				35
 	
 const int	kHopSize =				kBufferLength/(1/kOverlap);
 
 	
 SNDFILE			*carrierFile;
 static double	carrierData[kBufferLength];
-
-	
-	
 double			hanning[kBufferLength];
 
 // Math Utilities
 fftw_complex	*rescale(fftw_complex *);
 
 // Libsndfile Utilities	
-void			read_carrier_buffer();
+double			*read_carrier_buffer();
 	
 // FFT Utilities	
 void			make_window();	

File test/test.xcodeproj/sdrazin.pbxuser

 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 294611798;
-			PBXWorkspaceStateSaveDate = 294611798;
+			PBXPerProjectTemplateStateSaveDate = 294619690;
+			PBXWorkspaceStateSaveDate = 294619690;
 		};
 		perUserProjectItems = {
 			F477D014118E235200F5E1B6 = F477D014118E235200F5E1B6 /* PBXTextBookmark */;
 			F477D015118E235200F5E1B6 = F477D015118E235200F5E1B6 /* PBXTextBookmark */;
 			F477D016118E235200F5E1B6 = F477D016118E235200F5E1B6 /* PBXTextBookmark */;
 			F477D017118E235200F5E1B6 = F477D017118E235200F5E1B6 /* PBXTextBookmark */;
-			F47F3C41118F6B9100625E6D /* XCBuildMessageTextBookmark */ = F47F3C41118F6B9100625E6D /* XCBuildMessageTextBookmark */;
-			F47F3C42118F6B9100625E6D /* PBXTextBookmark */ = F47F3C42118F6B9100625E6D /* PBXTextBookmark */;
-			F47F3C44118F6BA600625E6D /* PBXTextBookmark */ = F47F3C44118F6BA600625E6D /* PBXTextBookmark */;
-			F47F3C4B118F6BF500625E6D /* PBXTextBookmark */ = F47F3C4B118F6BF500625E6D /* PBXTextBookmark */;
-			F47F3C4C118F6C0200625E6D /* PBXTextBookmark */ = F47F3C4C118F6C0200625E6D /* PBXTextBookmark */;
-			F47F3C50118F6C0F00625E6D /* PBXTextBookmark */ = F47F3C50118F6C0F00625E6D /* PBXTextBookmark */;
-			F47F3C6E118F6CE400625E6D /* PBXTextBookmark */ = F47F3C6E118F6CE400625E6D /* PBXTextBookmark */;
-			F47F3C6F118F6CE400625E6D /* PBXTextBookmark */ = F47F3C6F118F6CE400625E6D /* PBXTextBookmark */;
-			F47F3C72118F704200625E6D /* PBXTextBookmark */ = F47F3C72118F704200625E6D /* PBXTextBookmark */;
-			F47F3C73118F704400625E6D /* PBXTextBookmark */ = F47F3C73118F704400625E6D /* PBXTextBookmark */;
-			F47F3C7C118F70CD00625E6D /* PBXTextBookmark */ = F47F3C7C118F70CD00625E6D /* PBXTextBookmark */;
-			F47F3C8D118F71C400625E6D /* PBXTextBookmark */ = F47F3C8D118F71C400625E6D /* PBXTextBookmark */;
-			F47F3C8E118F71C400625E6D /* PBXTextBookmark */ = F47F3C8E118F71C400625E6D /* PBXTextBookmark */;
-			F47F3C8F118F71C400625E6D /* PBXTextBookmark */ = F47F3C8F118F71C400625E6D /* PBXTextBookmark */;
-			F47F3C90118F71C400625E6D /* PBXTextBookmark */ = F47F3C90118F71C400625E6D /* PBXTextBookmark */;
-			F47F3C96118F71E300625E6D /* PBXTextBookmark */ = F47F3C96118F71E300625E6D /* PBXTextBookmark */;
-			F47F3CB9118F730100625E6D /* PBXTextBookmark */ = F47F3CB9118F730100625E6D /* PBXTextBookmark */;
-			F47F3CC2118F749100625E6D /* PBXTextBookmark */ = F47F3CC2118F749100625E6D /* PBXTextBookmark */;
-			F47F3CC3118F749800625E6D /* PBXTextBookmark */ = F47F3CC3118F749800625E6D /* PBXTextBookmark */;
-			F47F3CC4118F74A100625E6D /* PBXTextBookmark */ = F47F3CC4118F74A100625E6D /* PBXTextBookmark */;
-			F47F3CC7118F74B000625E6D /* PBXTextBookmark */ = F47F3CC7118F74B000625E6D /* PBXTextBookmark */;
-			F47F3CCA118F773900625E6D /* PBXTextBookmark */ = F47F3CCA118F773900625E6D /* PBXTextBookmark */;
-			F47F3CCD118F77DE00625E6D /* PBXTextBookmark */ = F47F3CCD118F77DE00625E6D /* PBXTextBookmark */;
-			F47F3CD2118F78E000625E6D /* PBXTextBookmark */ = F47F3CD2118F78E000625E6D /* PBXTextBookmark */;
-			F47F3CD5118F790C00625E6D /* PBXTextBookmark */ = F47F3CD5118F790C00625E6D /* PBXTextBookmark */;
-			F47F3CD6118F797A00625E6D /* PBXTextBookmark */ = F47F3CD6118F797A00625E6D /* PBXTextBookmark */;
-			F47F3CD9118F799800625E6D /* PBXTextBookmark */ = F47F3CD9118F799800625E6D /* PBXTextBookmark */;
-			F47F3CDA118F79DE00625E6D /* PBXTextBookmark */ = F47F3CDA118F79DE00625E6D /* PBXTextBookmark */;
-			F47F3CDD118F79EA00625E6D /* PBXTextBookmark */ = F47F3CDD118F79EA00625E6D /* PBXTextBookmark */;
-			F47F3CE0118F7A3000625E6D /* PBXTextBookmark */ = F47F3CE0118F7A3000625E6D /* PBXTextBookmark */;
-			F47F3CE1118F7A3000625E6D /* PBXTextBookmark */ = F47F3CE1118F7A3000625E6D /* PBXTextBookmark */;
-			F47F3CE2118F7A3000625E6D /* PBXTextBookmark */ = F47F3CE2118F7A3000625E6D /* PBXTextBookmark */;
-			F47F3CE5118F7AEC00625E6D /* PBXTextBookmark */ = F47F3CE5118F7AEC00625E6D /* PBXTextBookmark */;
-			F47F3CE6118F7AEC00625E6D /* PBXTextBookmark */ = F47F3CE6118F7AEC00625E6D /* PBXTextBookmark */;
-			F47F3CE7118F7AEC00625E6D /* PBXTextBookmark */ = F47F3CE7118F7AEC00625E6D /* PBXTextBookmark */;
-			F47F3CE8118F7AEC00625E6D /* PBXTextBookmark */ = F47F3CE8118F7AEC00625E6D /* PBXTextBookmark */;
-			F47F3CEF118F7BBB00625E6D /* PBXTextBookmark */ = F47F3CEF118F7BBB00625E6D /* PBXTextBookmark */;
-			F47F3CF0118F7BBB00625E6D /* PBXTextBookmark */ = F47F3CF0118F7BBB00625E6D /* PBXTextBookmark */;
-			F47F3CF1118F7BBB00625E6D /* PBXTextBookmark */ = F47F3CF1118F7BBB00625E6D /* PBXTextBookmark */;
-			F47F3CF2118F7BBB00625E6D /* PBXTextBookmark */ = F47F3CF2118F7BBB00625E6D /* PBXTextBookmark */;
-			F47F3CF3118F7BD600625E6D /* PBXTextBookmark */ = F47F3CF3118F7BD600625E6D /* PBXTextBookmark */;
+			F47F3C41118F6B9100625E6D = F47F3C41118F6B9100625E6D /* PBXTextBookmark */;
+			F47F3C42118F6B9100625E6D = F47F3C42118F6B9100625E6D /* PBXTextBookmark */;
+			F47F3C44118F6BA600625E6D = F47F3C44118F6BA600625E6D /* PBXTextBookmark */;
+			F47F3C4B118F6BF500625E6D = F47F3C4B118F6BF500625E6D /* PBXTextBookmark */;
+			F47F3C4C118F6C0200625E6D = F47F3C4C118F6C0200625E6D /* PBXTextBookmark */;
+			F47F3C50118F6C0F00625E6D = F47F3C50118F6C0F00625E6D /* PBXTextBookmark */;
+			F47F3C6E118F6CE400625E6D = F47F3C6E118F6CE400625E6D /* PBXTextBookmark */;
+			F47F3C6F118F6CE400625E6D = F47F3C6F118F6CE400625E6D /* PBXTextBookmark */;
+			F47F3C72118F704200625E6D = F47F3C72118F704200625E6D /* PBXTextBookmark */;
+			F47F3C73118F704400625E6D = F47F3C73118F704400625E6D /* PBXTextBookmark */;
+			F47F3C7C118F70CD00625E6D = F47F3C7C118F70CD00625E6D /* PBXTextBookmark */;
+			F47F3C8D118F71C400625E6D = F47F3C8D118F71C400625E6D /* PBXTextBookmark */;
+			F47F3C8E118F71C400625E6D = F47F3C8E118F71C400625E6D /* PBXTextBookmark */;
+			F47F3C8F118F71C400625E6D = F47F3C8F118F71C400625E6D /* PBXTextBookmark */;
+			F47F3C90118F71C400625E6D = F47F3C90118F71C400625E6D /* PBXTextBookmark */;
+			F47F3C96118F71E300625E6D = F47F3C96118F71E300625E6D /* PBXTextBookmark */;
+			F47F3CB9118F730100625E6D = F47F3CB9118F730100625E6D /* PBXTextBookmark */;
+			F47F3CC2118F749100625E6D = F47F3CC2118F749100625E6D /* PBXTextBookmark */;
+			F47F3CC3118F749800625E6D = F47F3CC3118F749800625E6D /* PBXTextBookmark */;
+			F47F3CC4118F74A100625E6D = F47F3CC4118F74A100625E6D /* PBXTextBookmark */;
+			F47F3CC7118F74B000625E6D = F47F3CC7118F74B000625E6D /* PBXTextBookmark */;
+			F47F3CCA118F773900625E6D = F47F3CCA118F773900625E6D /* PBXTextBookmark */;
+			F47F3CCD118F77DE00625E6D = F47F3CCD118F77DE00625E6D /* PBXTextBookmark */;
+			F47F3CD2118F78E000625E6D = F47F3CD2118F78E000625E6D /* PBXTextBookmark */;
+			F47F3CD5118F790C00625E6D = F47F3CD5118F790C00625E6D /* PBXTextBookmark */;
+			F47F3CD6118F797A00625E6D = F47F3CD6118F797A00625E6D /* PBXTextBookmark */;
+			F47F3CD9118F799800625E6D = F47F3CD9118F799800625E6D /* PBXTextBookmark */;
+			F47F3CDA118F79DE00625E6D = F47F3CDA118F79DE00625E6D /* PBXTextBookmark */;
+			F47F3CDD118F79EA00625E6D = F47F3CDD118F79EA00625E6D /* PBXTextBookmark */;
+			F47F3CE0118F7A3000625E6D = F47F3CE0118F7A3000625E6D /* PBXTextBookmark */;
+			F47F3CE1118F7A3000625E6D = F47F3CE1118F7A3000625E6D /* PBXTextBookmark */;
+			F47F3CE2118F7A3000625E6D = F47F3CE2118F7A3000625E6D /* PBXTextBookmark */;
+			F47F3CE5118F7AEC00625E6D = F47F3CE5118F7AEC00625E6D /* PBXTextBookmark */;
+			F47F3CE6118F7AEC00625E6D = F47F3CE6118F7AEC00625E6D /* PBXTextBookmark */;
+			F47F3CE7118F7AEC00625E6D = F47F3CE7118F7AEC00625E6D /* PBXTextBookmark */;
+			F47F3CE8118F7AEC00625E6D = F47F3CE8118F7AEC00625E6D /* PBXTextBookmark */;
+			F47F3CEF118F7BBB00625E6D = F47F3CEF118F7BBB00625E6D /* PBXTextBookmark */;
+			F47F3CF0118F7BBB00625E6D = F47F3CF0118F7BBB00625E6D /* PBXTextBookmark */;
+			F47F3CF1118F7BBB00625E6D = F47F3CF1118F7BBB00625E6D /* PBXTextBookmark */;
+			F47F3CF2118F7BBB00625E6D = F47F3CF2118F7BBB00625E6D /* PBXTextBookmark */;
+			F47F3CF3118F7BD600625E6D = F47F3CF3118F7BD600625E6D /* PBXTextBookmark */;
 			F4A2DFCB11888B2F003E52C1 = F4A2DFCB11888B2F003E52C1 /* PBXTextBookmark */;
 			F4A2DFCD11888B2F003E52C1 = F4A2DFCD11888B2F003E52C1 /* PBXTextBookmark */;
 		};
 		vrLen = 1768;
 		vrLoc = 1325;
 	};
-	F47F3C41118F6B9100625E6D /* XCBuildMessageTextBookmark */ = {
+	F47F3C41118F6B9100625E6D /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		comments = "Expected constructor, destructor, or type conversion before '<' token";
 		fRef = 2A1C563A117B8D340022B1C3 /* main.cpp */;
-		fallbackIsa = XCBuildMessageTextBookmark;
 		rLen = 1;
 		rLoc = 23;
 		rType = 1;
 		rLen = 0;
 		rLoc = 5524;
 		rType = 0;
-		vrLen = 1239;
+		vrLen = 1217;
 		vrLoc = 4740;
 	};
 	F47F3CEF118F7BBB00625E6D /* PBXTextBookmark */ = {
 		rLen = 0;
 		rLoc = 5524;
 		rType = 0;
-		vrLen = 1239;
+		vrLen = 1217;
 		vrLoc = 4740;
 	};
 	F47F3CF2118F7BBB00625E6D /* PBXTextBookmark */ = {