diff --git a/AppController.h b/AppController.h
index eff4ba803..170ed6b7a 100644
--- a/AppController.h
+++ b/AppController.h
@@ -9,6 +9,17 @@
     IBOutlet PlaylistController *playlistController;
 	IBOutlet NSPanel *infoPanel;
 	IBOutlet NSWindow *mainWindow;
+	
+	IBOutlet NSButton *playButton;
+	IBOutlet NSButton *stopButton;
+	IBOutlet NSButton *prevButton;
+	IBOutlet NSButton *nextButton;
+	IBOutlet NSButton *addButton;
+	IBOutlet NSButton *remButton;
+	IBOutlet NSButton *infoButton;
+	IBOutlet NSButton *shuffleButton;
+	IBOutlet NSButton *repeatButton;
+
 }
 - (IBAction)addFiles:(id)sender;
 - (IBAction)delEntries:(id)sender;
diff --git a/AppController.m b/AppController.m
index 5d84654bb..a10a8b4a0 100644
--- a/AppController.m
+++ b/AppController.m
@@ -55,6 +55,17 @@
 - (void)awakeFromNib
 {
 //	DBLog(@"AWAKe");
+	
+	[playButton setToolTip:@"Play"];
+	[stopButton setToolTip:@"Stop"];
+	[prevButton setToolTip:@"Previous"];
+	[nextButton setToolTip:@"Next"];
+	[addButton setToolTip:@"Add files"];
+	[remButton setToolTip:@"Remove selected files"];
+	[infoButton setToolTip:@"Information on the selected file."];
+	[shuffleButton setToolTip:@"Shuffle mode"];
+	[repeatButton setToolTip:@"Repeat mode"];
+	
 	NSString *filename = @"~/Library/Application Support/Cog/Default.playlist";
 	[playlistController loadPlaylist:[filename stringByExpandingTildeInPath]];
 }
diff --git a/Cog.xcode/project.pbxproj b/Cog.xcode/project.pbxproj
index de9952e6b..b4b78bff8 100644
--- a/Cog.xcode/project.pbxproj
+++ b/Cog.xcode/project.pbxproj
@@ -559,12 +559,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		8E14E47B084CF1A200246BCC = {
-			fileRef = 8E14E479084CF1A200246BCC;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		8E14E47C084CF1A200246BCC = {
 			fileRef = 8E14E47A084CF1A200246BCC;
 			isa = PBXBuildFile;
@@ -1657,7 +1651,6 @@
 				8EFFB6D4083302A500C53833,
 				8EFFB6D5083302A500C53833,
 				8EFFB6D6083302A500C53833,
-				8E14E47B084CF1A200246BCC,
 			);
 			isa = PBXCopyFilesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Cog.xcode/xugg.mode1 b/Cog.xcode/xugg.mode1
index 1dc1d2f27..e18018171 100644
--- a/Cog.xcode/xugg.mode1
+++ b/Cog.xcode/xugg.mode1
@@ -255,18 +255,16 @@
 							<array>
 								<string>29B97314FDCFA39411CA2CEA</string>
 								<string>080E96DDFE201D6D7F000001</string>
-								<string>8E267D080837F7A6004ACBC5</string>
-								<string>8E47215C08318D12001F89FA</string>
 								<string>8EF6FA64082DA525006F7BE6</string>
-								<string>29B97323FDCFA39411CA2CEA</string>
 								<string>1C37FBAC04509CD000000102</string>
+								<string>8EFC6D17085376D100C67D06</string>
 								<string>1C37FABC05509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
 									<integer>7</integer>
-									<integer>3</integer>
+									<integer>5</integer>
 									<integer>1</integer>
 									<integer>0</integer>
 								</array>
@@ -291,7 +289,7 @@
 							<real>186</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>1 122 1024 624 0 0 1024 746 </string>
+						<string>2 122 1024 624 0 0 1024 746 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -309,7 +307,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>UpdateController.m</string>
+								<string>AACFile.m</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -317,18 +315,17 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>UpdateController.m</string>
+										<string>AACFile.m</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8E9E2E85084FA7E400599965</string>
+										<string>8EFC6E1B085380B800C67D06</string>
 										<key>history</key>
 										<array>
 											<string>8EF6FACD082DAA2B006F7BE6</string>
 											<string>8EF6FAD1082DAA2B006F7BE6</string>
 											<string>8E9BF100082FEF6B00B26943</string>
 											<string>8E267DDB0837FE5F004ACBC5</string>
-											<string>8E267E0008380176004ACBC5</string>
 											<string>8E1A1826083806B700AEA302</string>
 											<string>8E6082C7083920310017AECF</string>
 											<string>8E25B5E5083CDD4A0064353E</string>
@@ -340,49 +337,49 @@
 											<string>8EC8FBD20842932A00DF2C98</string>
 											<string>8EDC88A90842F8DE007D1532</string>
 											<string>8EDC88B50842F936007D1532</string>
-											<string>8E1BDA7908430E7700A08868</string>
 											<string>8ED833CD08457E6B0033CDBD</string>
 											<string>8E6F2A2708480D900011F126</string>
-											<string>8E6F2A2808480D900011F126</string>
 											<string>8E10DC00084BBE490013815C</string>
-											<string>8E10DC01084BBE490013815C</string>
 											<string>8E10DC02084BBE490013815C</string>
-											<string>8E94D973084BE3D1007F0AEB</string>
 											<string>8E94D9D2084BEA32007F0AEB</string>
 											<string>8E94D9D3084BEA32007F0AEB</string>
-											<string>8E94DA67084BF01F007F0AEB</string>
-											<string>8E94DA68084BF01F007F0AEB</string>
 											<string>8E5A8EA4084CB19900AE6D62</string>
-											<string>8E5A9054084CB7FE00AE6D62</string>
 											<string>8E5A90B7084CC25900AE6D62</string>
 											<string>8E5A90B8084CC25900AE6D62</string>
 											<string>8EA0A215084CC43F008DFEC9</string>
 											<string>8EA0A216084CC43F008DFEC9</string>
-											<string>8EA0A217084CC43F008DFEC9</string>
-											<string>8EA0A218084CC43F008DFEC9</string>
 											<string>8EA0A21A084CC43F008DFEC9</string>
 											<string>8E14E4A5084D089100246BCC</string>
-											<string>8E14E4A6084D089100246BCC</string>
-											<string>8E14E4A7084D089100246BCC</string>
-											<string>8E14E4AD084D089100246BCC</string>
-											<string>8E14E4B0084D089100246BCC</string>
-											<string>8E74C915084D451C00DF47F3</string>
 											<string>8E74C916084D451C00DF47F3</string>
-											<string>8E74C919084D451C00DF47F3</string>
-											<string>8E74C91A084D451C00DF47F3</string>
-											<string>8E74C91B084D451C00DF47F3</string>
-											<string>8EC18D9D084E3D8200AE0BA9</string>
-											<string>8EC18D9E084E3D8200AE0BA9</string>
 											<string>8EC18D9F084E3D8200AE0BA9</string>
-											<string>8EC18DDB084E403100AE0BA9</string>
-											<string>8EC18EA5084E55A800AE0BA9</string>
-											<string>8EC18EB8084E57D500AE0BA9</string>
-											<string>8EC7DA89084E672F00A079A7</string>
-											<string>8EC7DA8A084E672F00A079A7</string>
-											<string>8E9E2E7F084FA7E400599965</string>
-											<string>8E9E2E80084FA7E400599965</string>
 											<string>8E9E2E81084FA7E400599965</string>
-											<string>8ED3C9B1084915CE00BB7797</string>
+											<string>8EC156F4084FEB8900BB24E8</string>
+											<string>8EC156F5084FEB8900BB24E8</string>
+											<string>8E2752B70850A92E001618CD</string>
+											<string>8E2BC83D0850F56200BEAC36</string>
+											<string>8EE2A5B808511A1800367489</string>
+											<string>8EE2A5B908511A1800367489</string>
+											<string>8E72BC630851408F00E34F1D</string>
+											<string>8E72BC640851408F00E34F1D</string>
+											<string>8E72BC650851408F00E34F1D</string>
+											<string>8EFC6CC00853721700C67D06</string>
+											<string>8EFC6D18085376D100C67D06</string>
+											<string>8EFC6D1A085376D100C67D06</string>
+											<string>8EFC6DE7085380B800C67D06</string>
+											<string>8EFC6DE8085380B800C67D06</string>
+											<string>8EFC6DE9085380B800C67D06</string>
+											<string>8EFC6DEA085380B800C67D06</string>
+											<string>8EFC6DEB085380B800C67D06</string>
+											<string>8EFC6DEC085380B800C67D06</string>
+											<string>8EFC6DED085380B800C67D06</string>
+											<string>8EFC6DEE085380B800C67D06</string>
+											<string>8EFC6DEF085380B800C67D06</string>
+											<string>8EFC6DF0085380B800C67D06</string>
+											<string>8EFC6DF1085380B800C67D06</string>
+											<string>8EFC6DF2085380B800C67D06</string>
+											<string>8EFC6DF3085380B800C67D06</string>
+											<string>8EFC6DF4085380B800C67D06</string>
+											<string>8EFC6DF5085380B800C67D06</string>
 										</array>
 										<key>prevStack</key>
 										<array>
@@ -442,12 +439,80 @@
 											<string>8E14E4B3084D089100246BCC</string>
 											<string>8E14E4B4084D089100246BCC</string>
 											<string>8E14E4B5084D089100246BCC</string>
-											<string>8E14E4CB084D089100246BCC</string>
-											<string>8EC18EAA084E55A800AE0BA9</string>
 											<string>8EC18EBD084E57D500AE0BA9</string>
-											<string>8E9E2E82084FA7E400599965</string>
-											<string>8E9E2E83084FA7E400599965</string>
-											<string>8E9E2E84084FA7E400599965</string>
+											<string>8EC156F9084FEB8900BB24E8</string>
+											<string>8EFC6CC30853721700C67D06</string>
+											<string>8EFC6CC40853721700C67D06</string>
+											<string>8EFC6CC50853721700C67D06</string>
+											<string>8EFC6CD5085372A800C67D06</string>
+											<string>8EFC6CD6085372A800C67D06</string>
+											<string>8EFC6D21085376D100C67D06</string>
+											<string>8EFC6D22085376D100C67D06</string>
+											<string>8EFC6D23085376D100C67D06</string>
+											<string>8EFC6D24085376D100C67D06</string>
+											<string>8EFC6D25085376D100C67D06</string>
+											<string>8EFC6D26085376D100C67D06</string>
+											<string>8EFC6D27085376D100C67D06</string>
+											<string>8EFC6D28085376D100C67D06</string>
+											<string>8EFC6D29085376D100C67D06</string>
+											<string>8EFC6D2A085376D100C67D06</string>
+											<string>8EFC6D2B085376D100C67D06</string>
+											<string>8EFC6D2C085376D100C67D06</string>
+											<string>8EFC6D2D085376D100C67D06</string>
+											<string>8EFC6D2E085376D100C67D06</string>
+											<string>8EFC6D2F085376D100C67D06</string>
+											<string>8EFC6D30085376D100C67D06</string>
+											<string>8EFC6D31085376D100C67D06</string>
+											<string>8EFC6D32085376D100C67D06</string>
+											<string>8EFC6D33085376D100C67D06</string>
+											<string>8EFC6D34085376D100C67D06</string>
+											<string>8EFC6D35085376D100C67D06</string>
+											<string>8EFC6D36085376D100C67D06</string>
+											<string>8EFC6D37085376D100C67D06</string>
+											<string>8EFC6D38085376D100C67D06</string>
+											<string>8EFC6D39085376D100C67D06</string>
+											<string>8EFC6D3A085376D100C67D06</string>
+											<string>8EFC6D3B085376D100C67D06</string>
+											<string>8EFC6D3C085376D100C67D06</string>
+											<string>8EFC6D3D085376D100C67D06</string>
+											<string>8EFC6D3E085376D100C67D06</string>
+											<string>8EFC6DF6085380B800C67D06</string>
+											<string>8EFC6DF7085380B800C67D06</string>
+											<string>8EFC6DF8085380B800C67D06</string>
+											<string>8EFC6DF9085380B800C67D06</string>
+											<string>8EFC6DFA085380B800C67D06</string>
+											<string>8EFC6DFB085380B800C67D06</string>
+											<string>8EFC6DFC085380B800C67D06</string>
+											<string>8EFC6DFD085380B800C67D06</string>
+											<string>8EFC6DFE085380B800C67D06</string>
+											<string>8EFC6DFF085380B800C67D06</string>
+											<string>8EFC6E00085380B800C67D06</string>
+											<string>8EFC6E01085380B800C67D06</string>
+											<string>8EFC6E02085380B800C67D06</string>
+											<string>8EFC6E03085380B800C67D06</string>
+											<string>8EFC6E04085380B800C67D06</string>
+											<string>8EFC6E05085380B800C67D06</string>
+											<string>8EFC6E06085380B800C67D06</string>
+											<string>8EFC6E07085380B800C67D06</string>
+											<string>8EFC6E08085380B800C67D06</string>
+											<string>8EFC6E09085380B800C67D06</string>
+											<string>8EFC6E0A085380B800C67D06</string>
+											<string>8EFC6E0B085380B800C67D06</string>
+											<string>8EFC6E0C085380B800C67D06</string>
+											<string>8EFC6E0D085380B800C67D06</string>
+											<string>8EFC6E0E085380B800C67D06</string>
+											<string>8EFC6E0F085380B800C67D06</string>
+											<string>8EFC6E10085380B800C67D06</string>
+											<string>8EFC6E11085380B800C67D06</string>
+											<string>8EFC6E12085380B800C67D06</string>
+											<string>8EFC6E13085380B800C67D06</string>
+											<string>8EFC6E14085380B800C67D06</string>
+											<string>8EFC6E15085380B800C67D06</string>
+											<string>8EFC6E16085380B800C67D06</string>
+											<string>8EFC6E17085380B800C67D06</string>
+											<string>8EFC6E18085380B800C67D06</string>
+											<string>8EFC6E19085380B800C67D06</string>
+											<string>8EFC6E1A085380B800C67D06</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -461,7 +526,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {816, 404}}</string>
 								<key>RubberWindowFrame</key>
-								<string>1 122 1024 624 0 0 1024 746 </string>
+								<string>2 122 1024 624 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -481,7 +546,7 @@
 								<key>Frame</key>
 								<string>{{0, 409}, {816, 174}}</string>
 								<key>RubberWindowFrame</key>
-								<string>1 122 1024 624 0 0 1024 746 </string>
+								<string>2 122 1024 624 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
@@ -505,9 +570,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8E9E2E86084FA7E400599965</string>
+				<string>8EFC6CC70853721700C67D06</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>8E9E2E87084FA7E400599965</string>
+				<string>8EFC6CC80853721700C67D06</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -642,10 +707,11 @@
 	<key>WindowOrderList</key>
 	<array>
 		<string>1C0AD2B3069F1EA900FABCE6</string>
+		<string>8EF6FAA6082DA951006F7BE6</string>
 		<string>/Users/xugg/Projects/Cog/Cog.xcode</string>
 	</array>
 	<key>WindowString</key>
-	<string>1 122 1024 624 0 0 1024 746 </string>
+	<string>2 122 1024 624 0 0 1024 746 </string>
 	<key>WindowTools</key>
 	<array>
 		<dict>
@@ -661,14 +727,12 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>MusepackFile.m</string>
+								<string>AACFile.m</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -685,6 +749,8 @@
 							<string>342pt</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
@@ -726,7 +792,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>8EF6FAA6082DA951006F7BE6</string>
-				<string>8E2BC808084F8A05004518D1</string>
+				<string>8EFC6CE5085372F200C67D06</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -1038,8 +1104,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {493, 168}}</string>
-											<string>{{0, 173}, {493, 270}}</string>
+											<string>{{0, 0}, {367, 168}}</string>
+											<string>{{0, 173}, {367, 270}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@@ -1065,7 +1131,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {1024, 583}}</string>
 								<key>RubberWindowFrame</key>
-								<string>0 123 1024 623 0 0 1024 746 </string>
+								<string>4 123 1024 623 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXRunSessionModule</string>
@@ -1088,14 +1154,14 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C0AD2B3069F1EA900FABCE6</string>
-				<string>8E9E2E7D084FA1E200599965</string>
+				<string>8EFC6CFB0853745400C67D06</string>
 				<string>1CD0528B0623707200166675</string>
-				<string>8E9E2E7E084FA1E200599965</string>
+				<string>8EFC6CFC0853745400C67D06</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.run</string>
 			<key>WindowString</key>
-			<string>0 123 1024 623 0 0 1024 746 </string>
+			<string>4 123 1024 623 0 0 1024 746 </string>
 			<key>WindowToolGUID</key>
 			<string>1C0AD2B3069F1EA900FABCE6</string>
 			<key>WindowToolIsVisible</key>
diff --git a/Cog.xcode/xugg.pbxuser b/Cog.xcode/xugg.pbxuser
index 64113d6cd..4b54596b1 100644
--- a/Cog.xcode/xugg.pbxuser
+++ b/Cog.xcode/xugg.pbxuser
@@ -81,14 +81,13 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 139436466;
-			PBXWorkspaceStateSaveDate = 139436466;
+			PBXPerProjectTemplateStateSaveDate = 139686401;
+			PBXWorkspaceStateSaveDate = 139686401;
 		};
 		perUserProjectItems = {
 			8E0EBF58084BAA56003A6E64 = 8E0EBF58084BAA56003A6E64;
 			8E0EBF59084BAA56003A6E64 = 8E0EBF59084BAA56003A6E64;
 			8E10DC00084BBE490013815C = 8E10DC00084BBE490013815C;
-			8E10DC01084BBE490013815C = 8E10DC01084BBE490013815C;
 			8E10DC02084BBE490013815C = 8E10DC02084BBE490013815C;
 			8E10DC08084BBE490013815C = 8E10DC08084BBE490013815C;
 			8E14E4A5084D089100246BCC = 8E14E4A5084D089100246BCC;
@@ -99,7 +98,6 @@
 			8E14E4B3084D089100246BCC = 8E14E4B3084D089100246BCC;
 			8E14E4B4084D089100246BCC = 8E14E4B4084D089100246BCC;
 			8E14E4B5084D089100246BCC = 8E14E4B5084D089100246BCC;
-			8E14E4CB084D089100246BCC = 8E14E4CB084D089100246BCC;
 			8E1A1826083806B700AEA302 = 8E1A1826083806B700AEA302;
 			8E1A182C083806B700AEA302 = 8E1A182C083806B700AEA302;
 			8E1BDA7908430E7700A08868 = 8E1BDA7908430E7700A08868;
@@ -112,11 +110,12 @@
 			8E267D940837F963004ACBC5 = 8E267D940837F963004ACBC5;
 			8E267DA00837FA6E004ACBC5 = 8E267DA00837FA6E004ACBC5;
 			8E267DDB0837FE5F004ACBC5 = 8E267DDB0837FE5F004ACBC5;
-			8E267E0008380176004ACBC5 = 8E267E0008380176004ACBC5;
 			8E267E0308380176004ACBC5 = 8E267E0308380176004ACBC5;
 			8E267E1A083801D8004ACBC5 = 8E267E1A083801D8004ACBC5;
+			8E2752B70850A92E001618CD = 8E2752B70850A92E001618CD;
 			8E287164083695080013CE39 = 8E287164083695080013CE39;
 			8E297910083D892800F2C55A = 8E297910083D892800F2C55A;
+			8E2BC83D0850F56200BEAC36 = 8E2BC83D0850F56200BEAC36;
 			8E4521C408327F4C00F8BA7C = 8E4521C408327F4C00F8BA7C;
 			8E4522A608329C9B00F8BA7C = 8E4522A608329C9B00F8BA7C;
 			8E4522AF08329C9B00F8BA7C = 8E4522AF08329C9B00F8BA7C;
@@ -132,7 +131,6 @@
 			8E4721E108319EFC001F89FA = 8E4721E108319EFC001F89FA;
 			8E4721E508319EFC001F89FA = 8E4721E508319EFC001F89FA;
 			8E5A8EA4084CB19900AE6D62 = 8E5A8EA4084CB19900AE6D62;
-			8E5A9054084CB7FE00AE6D62 = 8E5A9054084CB7FE00AE6D62;
 			8E5A90B7084CC25900AE6D62 = 8E5A90B7084CC25900AE6D62;
 			8E5A90B8084CC25900AE6D62 = 8E5A90B8084CC25900AE6D62;
 			8E5A90BB084CC25900AE6D62 = 8E5A90BB084CC25900AE6D62;
@@ -145,13 +143,13 @@
 			8E652A39083E1A7900A7AF1B = 8E652A39083E1A7900A7AF1B;
 			8E652A3A083E1A7900A7AF1B = 8E652A3A083E1A7900A7AF1B;
 			8E6F2A2708480D900011F126 = 8E6F2A2708480D900011F126;
-			8E6F2A2808480D900011F126 = 8E6F2A2808480D900011F126;
+			8E72BC630851408F00E34F1D = 8E72BC630851408F00E34F1D;
+			8E72BC640851408F00E34F1D = 8E72BC640851408F00E34F1D;
+			8E72BC650851408F00E34F1D = 8E72BC650851408F00E34F1D;
+			8E72BC690851408F00E34F1D = 8E72BC690851408F00E34F1D;
 			8E74C915084D451C00DF47F3 = 8E74C915084D451C00DF47F3;
 			8E74C916084D451C00DF47F3 = 8E74C916084D451C00DF47F3;
 			8E74C919084D451C00DF47F3 = 8E74C919084D451C00DF47F3;
-			8E74C91A084D451C00DF47F3 = 8E74C91A084D451C00DF47F3;
-			8E74C91B084D451C00DF47F3 = 8E74C91B084D451C00DF47F3;
-			8E94D973084BE3D1007F0AEB = 8E94D973084BE3D1007F0AEB;
 			8E94D9D2084BEA32007F0AEB = 8E94D9D2084BEA32007F0AEB;
 			8E94D9D3084BEA32007F0AEB = 8E94D9D3084BEA32007F0AEB;
 			8E94DA67084BF01F007F0AEB = 8E94DA67084BF01F007F0AEB;
@@ -161,27 +159,22 @@
 			8E9E2E7F084FA7E400599965 = 8E9E2E7F084FA7E400599965;
 			8E9E2E80084FA7E400599965 = 8E9E2E80084FA7E400599965;
 			8E9E2E81084FA7E400599965 = 8E9E2E81084FA7E400599965;
-			8E9E2E82084FA7E400599965 = 8E9E2E82084FA7E400599965;
-			8E9E2E83084FA7E400599965 = 8E9E2E83084FA7E400599965;
-			8E9E2E84084FA7E400599965 = 8E9E2E84084FA7E400599965;
-			8E9E2E85084FA7E400599965 = 8E9E2E85084FA7E400599965;
 			8EA0A215084CC43F008DFEC9 = 8EA0A215084CC43F008DFEC9;
 			8EA0A216084CC43F008DFEC9 = 8EA0A216084CC43F008DFEC9;
-			8EA0A217084CC43F008DFEC9 = 8EA0A217084CC43F008DFEC9;
 			8EA0A218084CC43F008DFEC9 = 8EA0A218084CC43F008DFEC9;
 			8EA0A21A084CC43F008DFEC9 = 8EA0A21A084CC43F008DFEC9;
+			8EBA6E040852AAA900CC7940 = 8EBA6E040852AAA900CC7940;
+			8EC156F4084FEB8900BB24E8 = 8EC156F4084FEB8900BB24E8;
+			8EC156F5084FEB8900BB24E8 = 8EC156F5084FEB8900BB24E8;
+			8EC156F9084FEB8900BB24E8 = 8EC156F9084FEB8900BB24E8;
 			8EC18D9D084E3D8200AE0BA9 = 8EC18D9D084E3D8200AE0BA9;
-			8EC18D9E084E3D8200AE0BA9 = 8EC18D9E084E3D8200AE0BA9;
 			8EC18D9F084E3D8200AE0BA9 = 8EC18D9F084E3D8200AE0BA9;
 			8EC18DDB084E403100AE0BA9 = 8EC18DDB084E403100AE0BA9;
-			8EC18EA5084E55A800AE0BA9 = 8EC18EA5084E55A800AE0BA9;
-			8EC18EAA084E55A800AE0BA9 = 8EC18EAA084E55A800AE0BA9;
 			8EC18EB8084E57D500AE0BA9 = 8EC18EB8084E57D500AE0BA9;
 			8EC18EBD084E57D500AE0BA9 = 8EC18EBD084E57D500AE0BA9;
 			8EC7DA89084E672F00A079A7 = 8EC7DA89084E672F00A079A7;
 			8EC7DA8A084E672F00A079A7 = 8EC7DA8A084E672F00A079A7;
 			8EC8FBD20842932A00DF2C98 = 8EC8FBD20842932A00DF2C98;
-			8ED3C9B1084915CE00BB7797 = 8ED3C9B1084915CE00BB7797;
 			8ED833CD08457E6B0033CDBD = 8ED833CD08457E6B0033CDBD;
 			8EDC88A90842F8DE007D1532 = 8EDC88A90842F8DE007D1532;
 			8EDC88B50842F936007D1532 = 8EDC88B50842F936007D1532;
@@ -189,6 +182,8 @@
 			8EDCBDDC084061E500F5C7E3 = 8EDCBDDC084061E500F5C7E3;
 			8EDCBEF40840FA2200F5C7E3 = 8EDCBEF40840FA2200F5C7E3;
 			8EDE0CCC08369EB200EABFE4 = 8EDE0CCC08369EB200EABFE4;
+			8EE2A5B808511A1800367489 = 8EE2A5B808511A1800367489;
+			8EE2A5B908511A1800367489 = 8EE2A5B908511A1800367489;
 			8EE4A6C3082E6F6100415456 = 8EE4A6C3082E6F6100415456;
 			8EE4A6C8082E6F6100415456 = 8EE4A6C8082E6F6100415456;
 			8EE4A6FE082E704E00415456 = 8EE4A6FE082E704E00415456;
@@ -207,6 +202,154 @@
 			8EF6FAE1082DAA2B006F7BE6 = 8EF6FAE1082DAA2B006F7BE6;
 			8EF6FAEF082DAA2B006F7BE6 = 8EF6FAEF082DAA2B006F7BE6;
 			8EF6FAF3082DAA2B006F7BE6 = 8EF6FAF3082DAA2B006F7BE6;
+			8EFC6CC00853721700C67D06 = 8EFC6CC00853721700C67D06;
+			8EFC6CC10853721700C67D06 = 8EFC6CC10853721700C67D06;
+			8EFC6CC20853721700C67D06 = 8EFC6CC20853721700C67D06;
+			8EFC6CC30853721700C67D06 = 8EFC6CC30853721700C67D06;
+			8EFC6CC40853721700C67D06 = 8EFC6CC40853721700C67D06;
+			8EFC6CC50853721700C67D06 = 8EFC6CC50853721700C67D06;
+			8EFC6CC60853721700C67D06 = 8EFC6CC60853721700C67D06;
+			8EFC6CD3085372A800C67D06 = 8EFC6CD3085372A800C67D06;
+			8EFC6CD4085372A800C67D06 = 8EFC6CD4085372A800C67D06;
+			8EFC6CD5085372A800C67D06 = 8EFC6CD5085372A800C67D06;
+			8EFC6CD6085372A800C67D06 = 8EFC6CD6085372A800C67D06;
+			8EFC6CD7085372A800C67D06 = 8EFC6CD7085372A800C67D06;
+			8EFC6CE3085372F200C67D06 = 8EFC6CE3085372F200C67D06;
+			8EFC6CE4085372F200C67D06 = 8EFC6CE4085372F200C67D06;
+			8EFC6CEA0853732D00C67D06 = 8EFC6CEA0853732D00C67D06;
+			8EFC6CEB0853732D00C67D06 = 8EFC6CEB0853732D00C67D06;
+			8EFC6CFA0853745400C67D06 = 8EFC6CFA0853745400C67D06;
+			8EFC6D0D0853760900C67D06 = 8EFC6D0D0853760900C67D06;
+			8EFC6D100853768500C67D06 = 8EFC6D100853768500C67D06;
+			8EFC6D130853769900C67D06 = 8EFC6D130853769900C67D06;
+			8EFC6D16085376C100C67D06 = 8EFC6D16085376C100C67D06;
+			8EFC6D18085376D100C67D06 = 8EFC6D18085376D100C67D06;
+			8EFC6D19085376D100C67D06 = 8EFC6D19085376D100C67D06;
+			8EFC6D1A085376D100C67D06 = 8EFC6D1A085376D100C67D06;
+			8EFC6D1B085376D100C67D06 = 8EFC6D1B085376D100C67D06;
+			8EFC6D1C085376D100C67D06 = 8EFC6D1C085376D100C67D06;
+			8EFC6D1D085376D100C67D06 = 8EFC6D1D085376D100C67D06;
+			8EFC6D1E085376D100C67D06 = 8EFC6D1E085376D100C67D06;
+			8EFC6D1F085376D100C67D06 = 8EFC6D1F085376D100C67D06;
+			8EFC6D20085376D100C67D06 = 8EFC6D20085376D100C67D06;
+			8EFC6D21085376D100C67D06 = 8EFC6D21085376D100C67D06;
+			8EFC6D22085376D100C67D06 = 8EFC6D22085376D100C67D06;
+			8EFC6D23085376D100C67D06 = 8EFC6D23085376D100C67D06;
+			8EFC6D24085376D100C67D06 = 8EFC6D24085376D100C67D06;
+			8EFC6D25085376D100C67D06 = 8EFC6D25085376D100C67D06;
+			8EFC6D26085376D100C67D06 = 8EFC6D26085376D100C67D06;
+			8EFC6D27085376D100C67D06 = 8EFC6D27085376D100C67D06;
+			8EFC6D28085376D100C67D06 = 8EFC6D28085376D100C67D06;
+			8EFC6D29085376D100C67D06 = 8EFC6D29085376D100C67D06;
+			8EFC6D2A085376D100C67D06 = 8EFC6D2A085376D100C67D06;
+			8EFC6D2B085376D100C67D06 = 8EFC6D2B085376D100C67D06;
+			8EFC6D2C085376D100C67D06 = 8EFC6D2C085376D100C67D06;
+			8EFC6D2D085376D100C67D06 = 8EFC6D2D085376D100C67D06;
+			8EFC6D2E085376D100C67D06 = 8EFC6D2E085376D100C67D06;
+			8EFC6D2F085376D100C67D06 = 8EFC6D2F085376D100C67D06;
+			8EFC6D30085376D100C67D06 = 8EFC6D30085376D100C67D06;
+			8EFC6D31085376D100C67D06 = 8EFC6D31085376D100C67D06;
+			8EFC6D32085376D100C67D06 = 8EFC6D32085376D100C67D06;
+			8EFC6D33085376D100C67D06 = 8EFC6D33085376D100C67D06;
+			8EFC6D34085376D100C67D06 = 8EFC6D34085376D100C67D06;
+			8EFC6D35085376D100C67D06 = 8EFC6D35085376D100C67D06;
+			8EFC6D36085376D100C67D06 = 8EFC6D36085376D100C67D06;
+			8EFC6D37085376D100C67D06 = 8EFC6D37085376D100C67D06;
+			8EFC6D38085376D100C67D06 = 8EFC6D38085376D100C67D06;
+			8EFC6D39085376D100C67D06 = 8EFC6D39085376D100C67D06;
+			8EFC6D3A085376D100C67D06 = 8EFC6D3A085376D100C67D06;
+			8EFC6D3B085376D100C67D06 = 8EFC6D3B085376D100C67D06;
+			8EFC6D3C085376D100C67D06 = 8EFC6D3C085376D100C67D06;
+			8EFC6D3D085376D100C67D06 = 8EFC6D3D085376D100C67D06;
+			8EFC6D3E085376D100C67D06 = 8EFC6D3E085376D100C67D06;
+			8EFC6D3F085376D100C67D06 = 8EFC6D3F085376D100C67D06;
+			8EFC6D440853772000C67D06 = 8EFC6D440853772000C67D06;
+			8EFC6D47085377A400C67D06 = 8EFC6D47085377A400C67D06;
+			8EFC6D4A085377D900C67D06 = 8EFC6D4A085377D900C67D06;
+			8EFC6D4F0853786000C67D06 = 8EFC6D4F0853786000C67D06;
+			8EFC6D520853787100C67D06 = 8EFC6D520853787100C67D06;
+			8EFC6D570853791100C67D06 = 8EFC6D570853791100C67D06;
+			8EFC6D5A0853793800C67D06 = 8EFC6D5A0853793800C67D06;
+			8EFC6D5D0853798C00C67D06 = 8EFC6D5D0853798C00C67D06;
+			8EFC6D64085379E100C67D06 = 8EFC6D64085379E100C67D06;
+			8EFC6D67085379F000C67D06 = 8EFC6D67085379F000C67D06;
+			8EFC6D6A08537A1200C67D06 = 8EFC6D6A08537A1200C67D06;
+			8EFC6D7D08537A5D00C67D06 = 8EFC6D7D08537A5D00C67D06;
+			8EFC6D8008537A7700C67D06 = 8EFC6D8008537A7700C67D06;
+			8EFC6D8308537A9600C67D06 = 8EFC6D8308537A9600C67D06;
+			8EFC6D8608537AB100C67D06 = 8EFC6D8608537AB100C67D06;
+			8EFC6D9E08537CAE00C67D06 = 8EFC6D9E08537CAE00C67D06;
+			8EFC6DAD08537D1F00C67D06 = 8EFC6DAD08537D1F00C67D06;
+			8EFC6DB008537D4300C67D06 = 8EFC6DB008537D4300C67D06;
+			8EFC6DB308537D6700C67D06 = 8EFC6DB308537D6700C67D06;
+			8EFC6DB608537D9F00C67D06 = 8EFC6DB608537D9F00C67D06;
+			8EFC6DB908537DB700C67D06 = 8EFC6DB908537DB700C67D06;
+			8EFC6DBC08537DD400C67D06 = 8EFC6DBC08537DD400C67D06;
+			8EFC6DBF08537E1F00C67D06 = 8EFC6DBF08537E1F00C67D06;
+			8EFC6DC208537E7400C67D06 = 8EFC6DC208537E7400C67D06;
+			8EFC6DC508537ED200C67D06 = 8EFC6DC508537ED200C67D06;
+			8EFC6DC808537EEA00C67D06 = 8EFC6DC808537EEA00C67D06;
+			8EFC6DCB08537F0000C67D06 = 8EFC6DCB08537F0000C67D06;
+			8EFC6DCE08537F0D00C67D06 = 8EFC6DCE08537F0D00C67D06;
+			8EFC6DD108537F8D00C67D06 = 8EFC6DD108537F8D00C67D06;
+			8EFC6DD408537FB000C67D06 = 8EFC6DD408537FB000C67D06;
+			8EFC6DD708537FC200C67D06 = 8EFC6DD708537FC200C67D06;
+			8EFC6DDA08537FD200C67D06 = 8EFC6DDA08537FD200C67D06;
+			8EFC6DDD08537FE600C67D06 = 8EFC6DDD08537FE600C67D06;
+			8EFC6DE4085380B400C67D06 = 8EFC6DE4085380B400C67D06;
+			8EFC6DE7085380B800C67D06 = 8EFC6DE7085380B800C67D06;
+			8EFC6DE8085380B800C67D06 = 8EFC6DE8085380B800C67D06;
+			8EFC6DE9085380B800C67D06 = 8EFC6DE9085380B800C67D06;
+			8EFC6DEA085380B800C67D06 = 8EFC6DEA085380B800C67D06;
+			8EFC6DEB085380B800C67D06 = 8EFC6DEB085380B800C67D06;
+			8EFC6DEC085380B800C67D06 = 8EFC6DEC085380B800C67D06;
+			8EFC6DED085380B800C67D06 = 8EFC6DED085380B800C67D06;
+			8EFC6DEE085380B800C67D06 = 8EFC6DEE085380B800C67D06;
+			8EFC6DEF085380B800C67D06 = 8EFC6DEF085380B800C67D06;
+			8EFC6DF0085380B800C67D06 = 8EFC6DF0085380B800C67D06;
+			8EFC6DF1085380B800C67D06 = 8EFC6DF1085380B800C67D06;
+			8EFC6DF2085380B800C67D06 = 8EFC6DF2085380B800C67D06;
+			8EFC6DF3085380B800C67D06 = 8EFC6DF3085380B800C67D06;
+			8EFC6DF4085380B800C67D06 = 8EFC6DF4085380B800C67D06;
+			8EFC6DF5085380B800C67D06 = 8EFC6DF5085380B800C67D06;
+			8EFC6DF6085380B800C67D06 = 8EFC6DF6085380B800C67D06;
+			8EFC6DF7085380B800C67D06 = 8EFC6DF7085380B800C67D06;
+			8EFC6DF8085380B800C67D06 = 8EFC6DF8085380B800C67D06;
+			8EFC6DF9085380B800C67D06 = 8EFC6DF9085380B800C67D06;
+			8EFC6DFA085380B800C67D06 = 8EFC6DFA085380B800C67D06;
+			8EFC6DFB085380B800C67D06 = 8EFC6DFB085380B800C67D06;
+			8EFC6DFC085380B800C67D06 = 8EFC6DFC085380B800C67D06;
+			8EFC6DFD085380B800C67D06 = 8EFC6DFD085380B800C67D06;
+			8EFC6DFE085380B800C67D06 = 8EFC6DFE085380B800C67D06;
+			8EFC6DFF085380B800C67D06 = 8EFC6DFF085380B800C67D06;
+			8EFC6E00085380B800C67D06 = 8EFC6E00085380B800C67D06;
+			8EFC6E01085380B800C67D06 = 8EFC6E01085380B800C67D06;
+			8EFC6E02085380B800C67D06 = 8EFC6E02085380B800C67D06;
+			8EFC6E03085380B800C67D06 = 8EFC6E03085380B800C67D06;
+			8EFC6E04085380B800C67D06 = 8EFC6E04085380B800C67D06;
+			8EFC6E05085380B800C67D06 = 8EFC6E05085380B800C67D06;
+			8EFC6E06085380B800C67D06 = 8EFC6E06085380B800C67D06;
+			8EFC6E07085380B800C67D06 = 8EFC6E07085380B800C67D06;
+			8EFC6E08085380B800C67D06 = 8EFC6E08085380B800C67D06;
+			8EFC6E09085380B800C67D06 = 8EFC6E09085380B800C67D06;
+			8EFC6E0A085380B800C67D06 = 8EFC6E0A085380B800C67D06;
+			8EFC6E0B085380B800C67D06 = 8EFC6E0B085380B800C67D06;
+			8EFC6E0C085380B800C67D06 = 8EFC6E0C085380B800C67D06;
+			8EFC6E0D085380B800C67D06 = 8EFC6E0D085380B800C67D06;
+			8EFC6E0E085380B800C67D06 = 8EFC6E0E085380B800C67D06;
+			8EFC6E0F085380B800C67D06 = 8EFC6E0F085380B800C67D06;
+			8EFC6E10085380B800C67D06 = 8EFC6E10085380B800C67D06;
+			8EFC6E11085380B800C67D06 = 8EFC6E11085380B800C67D06;
+			8EFC6E12085380B800C67D06 = 8EFC6E12085380B800C67D06;
+			8EFC6E13085380B800C67D06 = 8EFC6E13085380B800C67D06;
+			8EFC6E14085380B800C67D06 = 8EFC6E14085380B800C67D06;
+			8EFC6E15085380B800C67D06 = 8EFC6E15085380B800C67D06;
+			8EFC6E16085380B800C67D06 = 8EFC6E16085380B800C67D06;
+			8EFC6E17085380B800C67D06 = 8EFC6E17085380B800C67D06;
+			8EFC6E18085380B800C67D06 = 8EFC6E18085380B800C67D06;
+			8EFC6E19085380B800C67D06 = 8EFC6E19085380B800C67D06;
+			8EFC6E1A085380B800C67D06 = 8EFC6E1A085380B800C67D06;
+			8EFC6E1B085380B800C67D06 = 8EFC6E1B085380B800C67D06;
 		};
 		sourceControlManager = 8EB77466082DA402005891CA;
 		userBuildSettings = {
@@ -230,7 +373,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {775, 1274}}";
 			sepNavSelRange = "{501, 0}";
-			sepNavVisRect = "{{0, 20}, {775, 372}}";
+			sepNavVisRect = "{{0, 14}, {775, 372}}";
 			sepNavWindowFrame = "{{15, 61}, {500, 680}}";
 		};
 	};
@@ -285,16 +428,6 @@
 		vrLen = 119;
 		vrLoc = 0;
 	};
-	8E10DC01084BBE490013815C = {
-		fRef = 8D1107310486CEB800E47090;
-		isa = PBXTextBookmark;
-		name = "Info.plist: 18";
-		rLen = 0;
-		rLoc = 501;
-		rType = 0;
-		vrLen = 677;
-		vrLoc = 39;
-	};
 	8E10DC02084BBE490013815C = {
 		fRef = 8E10DBEF084BBCF00013815C;
 		isa = PBXTextBookmark;
@@ -317,16 +450,16 @@
 	};
 	8E14E479084CF1A200246BCC = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {775, 434}}";
-			sepNavSelRange = "{406, 0}";
-			sepNavVisRect = "{{0, 0}, {775, 372}}";
+			sepNavIntBoundsRect = "{{0, 0}, {775, 476}}";
+			sepNavSelRange = "{554, 0}";
+			sepNavVisRect = "{{0, 90}, {775, 372}}";
 		};
 	};
 	8E14E47A084CF1A200246BCC = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {775, 1960}}";
-			sepNavSelRange = "{182, 0}";
-			sepNavVisRect = "{{0, 28}, {775, 372}}";
+			sepNavIntBoundsRect = "{{0, 0}, {775, 2436}}";
+			sepNavSelRange = "{3595, 0}";
+			sepNavVisRect = "{{0, 2050}, {775, 372}}";
 		};
 	};
 	8E14E4A5084D089100246BCC = {
@@ -359,14 +492,6 @@
 		vrLen = 803;
 		vrLoc = 464;
 	};
-	8E14E4AA084D089100246BCC = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.c;
-		name = libmp4.c;
-		path = /Users/xugg/Desktop/faad2.1/plugins/xmms/src/libmp4.c;
-		refType = 0;
-		sourceTree = "<absolute>";
-	};
 	8E14E4AD084D089100246BCC = {
 		fRef = 8EF6FA69082DA526006F7BE6;
 		isa = PBXTextBookmark;
@@ -417,24 +542,6 @@
 		vrLen = 188;
 		vrLoc = 0;
 	};
-	8E14E4CB084D089100246BCC = {
-		fRef = 8E14E4CC084D089100246BCC;
-		isa = PBXTextBookmark;
-		name = "(null): 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 578;
-		vrLoc = 0;
-	};
-	8E14E4CC084D089100246BCC = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.c;
-		name = libmp4.c;
-		path = /Users/xugg/Desktop/faad2.1/plugins/xmms/src/libmp4.c;
-		refType = 0;
-		sourceTree = "<absolute>";
-	};
 	8E1A1826083806B700AEA302 = {
 		fRef = 8E1A1827083806B700AEA302;
 		isa = PBXTextBookmark;
@@ -500,9 +607,9 @@
 	};
 	8E267D050837F7A6004ACBC5 = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {920, 1050}}";
-			sepNavSelRange = "{471, 0}";
-			sepNavVisRect = "{{0, 241}, {775, 372}}";
+			sepNavIntBoundsRect = "{{0, 0}, {914, 1106}}";
+			sepNavSelRange = "{1300, 0}";
+			sepNavVisRect = "{{0, 588}, {775, 372}}";
 		};
 	};
 	8E267D060837F7A6004ACBC5 = {
@@ -514,9 +621,9 @@
 	};
 	8E267D070837F7A6004ACBC5 = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {983, 1848}}";
-			sepNavSelRange = "{999, 0}";
-			sepNavVisRect = "{{0, 314}, {983, 310}}";
+			sepNavIntBoundsRect = "{{0, 0}, {824, 1848}}";
+			sepNavSelRange = "{1544, 0}";
+			sepNavVisRect = "{{0, 1476}, {775, 372}}";
 		};
 	};
 	8E267D090837F7A6004ACBC5 = {
@@ -528,9 +635,9 @@
 	};
 	8E267D0A0837F7A6004ACBC5 = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {740, 5600}}";
+			sepNavIntBoundsRect = "{{0, 0}, {775, 5600}}";
 			sepNavSelRange = "{7208, 5}";
-			sepNavVisRect = "{{0, 3039}, {740, 180}}";
+			sepNavVisRect = "{{0, 2943}, {775, 372}}";
 		};
 	};
 	8E267D0B0837F7A6004ACBC5 = {
@@ -544,7 +651,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1022, 2366}}";
 			sepNavSelRange = "{2945, 0}";
-			sepNavVisRect = "{{0, 1455}, {775, 372}}";
+			sepNavVisRect = "{{0, 1460}, {775, 372}}";
 		};
 	};
 	8E267D8C0837F963004ACBC5 = {
@@ -627,16 +734,6 @@
 		vrLen = 495;
 		vrLoc = 0;
 	};
-	8E267E0008380176004ACBC5 = {
-		fRef = 8E267D070837F7A6004ACBC5;
-		isa = PBXTextBookmark;
-		name = "FeedbackSocket.m: 30";
-		rLen = 0;
-		rLoc = 818;
-		rType = 0;
-		vrLen = 1440;
-		vrLoc = 139;
-	};
 	8E267E0308380176004ACBC5 = {
 		fRef = 8D1107310486CEB800E47090;
 		isa = PBXTextBookmark;
@@ -657,6 +754,16 @@
 		vrLen = 112;
 		vrLoc = 0;
 	};
+	8E2752B70850A92E001618CD = {
+		fRef = 8E267D070837F7A6004ACBC5;
+		isa = PBXTextBookmark;
+		name = "FeedbackSocket.m: 45";
+		rLen = 0;
+		rLoc = 1544;
+		rType = 0;
+		vrLen = 258;
+		vrLoc = 3429;
+	};
 	8E2871080836934A0013CE39 = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {4550, 1246}}";
@@ -707,6 +814,16 @@
 		vrLen = 65;
 		vrLoc = 0;
 	};
+	8E2BC83D0850F56200BEAC36 = {
+		fRef = 8E267D050837F7A6004ACBC5;
+		isa = PBXTextBookmark;
+		name = "FeedbackController.m: 53";
+		rLen = 0;
+		rLoc = 1300;
+		rType = 0;
+		vrLen = 877;
+		vrLoc = 942;
+	};
 	8E3851EC084CEC0200D715B8 = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.h;
@@ -728,16 +845,16 @@
 	8E45227A0832898A00F8BA7C = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {860, 1792}}";
-			sepNavSelRange = "{1555, 0}";
-			sepNavVisRect = "{{0, 790}, {775, 372}}";
+			sepNavSelRange = "{1056, 7}";
+			sepNavVisRect = "{{0, 591}, {775, 372}}";
 			sepNavWindowFrame = "{{15, 61}, {702, 680}}";
 		};
 	};
 	8E45227B0832898A00F8BA7C = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1208, 9352}}";
-			sepNavSelRange = "{2206, 0}";
-			sepNavVisRect = "{{0, 798}, {983, 342}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1208, 9562}}";
+			sepNavSelRange = "{9218, 0}";
+			sepNavVisRect = "{{0, 4329}, {775, 372}}";
 			sepNavWindowFrame = "{{15, 66}, {702, 680}}";
 		};
 	};
@@ -756,7 +873,7 @@
 		isa = PBXTextBookmark;
 		name = "Sound.m: 15";
 		rLen = 0;
-		rLoc = 17822;
+		rLoc = 18163;
 		rType = 0;
 		vrLen = 182;
 		vrLoc = 0;
@@ -785,15 +902,15 @@
 	8E47218808318D7A001F89FA = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {818, 6958}}";
-			sepNavSelRange = "{747, 0}";
-			sepNavVisRect = "{{0, 185}, {775, 372}}";
+			sepNavSelRange = "{272, 0}";
+			sepNavVisRect = "{{0, 3332}, {775, 372}}";
 		};
 	};
 	8E47218908318D7A001F89FA = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {775, 952}}";
 			sepNavSelRange = "{374, 0}";
-			sepNavVisRect = "{{0, 214}, {775, 372}}";
+			sepNavVisRect = "{{0, 210}, {775, 372}}";
 		};
 	};
 	8E47218A08318D7A001F89FA = {
@@ -900,16 +1017,16 @@
 	};
 	8E4721D108319294001F89FA = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {775, 392}}";
-			sepNavSelRange = "{231, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {775, 546}}";
+			sepNavSelRange = "{233, 290}";
 			sepNavVisRect = "{{0, 0}, {775, 372}}";
 		};
 	};
 	8E4721D208319294001F89FA = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1340, 2002}}";
-			sepNavSelRange = "{1400, 0}";
-			sepNavVisRect = "{{0, 1599}, {775, 372}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1340, 2156}}";
+			sepNavSelRange = "{1676, 0}";
+			sepNavVisRect = "{{0, 756}, {775, 372}}";
 		};
 	};
 	8E4721D4083192C2001F89FA = {
@@ -967,16 +1084,6 @@
 		vrLen = 767;
 		vrLoc = 3530;
 	};
-	8E5A9054084CB7FE00AE6D62 = {
-		fRef = 8E47218908318D7A001F89FA;
-		isa = PBXTextBookmark;
-		name = "PlaylistEntry.h: track";
-		rLen = 0;
-		rLoc = 374;
-		rType = 0;
-		vrLen = 410;
-		vrLoc = 266;
-	};
 	8E5A90B7084CC25900AE6D62 = {
 		fRef = 8E5A90B0084CBC2F00AE6D62;
 		isa = PBXTextBookmark;
@@ -1111,15 +1218,45 @@
 		vrLen = 967;
 		vrLoc = 0;
 	};
-	8E6F2A2808480D900011F126 = {
-		fRef = 8E267D050837F7A6004ACBC5;
+	8E72BC630851408F00E34F1D = {
+		fRef = 8E4721D208319294001F89FA;
 		isa = PBXTextBookmark;
-		name = "FeedbackController.m: openFeedbackWindow:";
+		name = "AppController.m: 65";
 		rLen = 0;
-		rLoc = 471;
+		rLoc = 1676;
 		rType = 0;
-		vrLen = 782;
-		vrLoc = 325;
+		vrLen = 897;
+		vrLoc = 1378;
+	};
+	8E72BC640851408F00E34F1D = {
+		fRef = 8E47218908318D7A001F89FA;
+		isa = PBXTextBookmark;
+		name = "PlaylistEntry.h: track";
+		rLen = 0;
+		rLoc = 374;
+		rType = 0;
+		vrLen = 410;
+		vrLoc = 266;
+	};
+	8E72BC650851408F00E34F1D = {
+		fRef = 8E47218708318D7A001F89FA;
+		isa = PBXTextBookmark;
+		name = "- (NSArray *)acceptablePlaylistTypes;";
+		rLen = 38;
+		rLoc = 1643;
+		rType = 0;
+		vrLen = 595;
+		vrLoc = 1271;
+	};
+	8E72BC690851408F00E34F1D = {
+		fRef = 8E47218808318D7A001F89FA;
+		isa = PBXTextBookmark;
+		name = "PlaylistController.m: initWithCoder:";
+		rLen = 0;
+		rLoc = 272;
+		rType = 0;
+		vrLen = 418;
+		vrLoc = 5449;
 	};
 	8E74C915084D451C00DF47F3 = {
 		fRef = 8EF6FA66082DA526006F7BE6;
@@ -1146,41 +1283,11 @@
 		isa = PBXTextBookmark;
 		name = "SoundFile.m: 83";
 		rLen = 0;
-		rLoc = 1676;
+		rLoc = 1751;
 		rType = 0;
 		vrLen = 591;
 		vrLoc = 1140;
 	};
-	8E74C91A084D451C00DF47F3 = {
-		fRef = 8E47218708318D7A001F89FA;
-		isa = PBXTextBookmark;
-		name = "- (NSArray *)acceptablePlaylistTypes;";
-		rLen = 38;
-		rLoc = 1643;
-		rType = 0;
-		vrLen = 595;
-		vrLoc = 1271;
-	};
-	8E74C91B084D451C00DF47F3 = {
-		fRef = 8E47218808318D7A001F89FA;
-		isa = PBXTextBookmark;
-		name = "PlaylistController.m: 33";
-		rLen = 0;
-		rLoc = 747;
-		rType = 0;
-		vrLen = 668;
-		vrLoc = 238;
-	};
-	8E94D973084BE3D1007F0AEB = {
-		fRef = 8E4721D108319294001F89FA;
-		isa = PBXTextBookmark;
-		name = "AppController.h: 12";
-		rLen = 0;
-		rLoc = 231;
-		rType = 0;
-		vrLen = 839;
-		vrLoc = 0;
-	};
 	8E94D9D2084BEA32007F0AEB = {
 		fRef = 8E0EBF0D084BA776003A6E64;
 		isa = PBXTextBookmark;
@@ -1264,7 +1371,7 @@
 		isa = PBXTextBookmark;
 		name = "AACFile.m: 13";
 		rLen = 0;
-		rLoc = 182;
+		rLoc = 207;
 		rType = 0;
 		vrLen = 637;
 		vrLoc = 17;
@@ -1279,46 +1386,6 @@
 		vrLen = 681;
 		vrLoc = 363;
 	};
-	8E9E2E82084FA7E400599965 = {
-		fRef = 8EF6FA65082DA526006F7BE6;
-		isa = PBXTextBookmark;
-		name = "FlacFile.h: SAMPLE_BUFFER_SIZE";
-		rLen = 0;
-		rLoc = 342;
-		rType = 0;
-		vrLen = 617;
-		vrLoc = 0;
-	};
-	8E9E2E83084FA7E400599965 = {
-		fRef = 8E14E47A084CF1A200246BCC;
-		isa = PBXTextBookmark;
-		name = "AACFile.m: 13";
-		rLen = 0;
-		rLoc = 182;
-		rType = 0;
-		vrLen = 637;
-		vrLoc = 17;
-	};
-	8E9E2E84084FA7E400599965 = {
-		fRef = 8E267D0B0837F7A6004ACBC5;
-		isa = PBXTextBookmark;
-		name = "UpdateController.h: takeBoolFromObject:";
-		rLen = 0;
-		rLoc = 998;
-		rType = 0;
-		vrLen = 681;
-		vrLoc = 363;
-	};
-	8E9E2E85084FA7E400599965 = {
-		fRef = 8E267D0C0837F7A6004ACBC5;
-		isa = PBXTextBookmark;
-		name = "UpdateController.m: 118";
-		rLen = 0;
-		rLoc = 2945;
-		rType = 0;
-		vrLen = 1100;
-		vrLoc = 2338;
-	};
 	8EA0A215084CC43F008DFEC9 = {
 		fRef = 8E2871080836934A0013CE39;
 		isa = PBXTextBookmark;
@@ -1339,16 +1406,6 @@
 		vrLen = 671;
 		vrLoc = 367;
 	};
-	8EA0A217084CC43F008DFEC9 = {
-		fRef = 8E4721D208319294001F89FA;
-		isa = PBXTextBookmark;
-		name = "AppController.m: 56";
-		rLen = 0;
-		rLoc = 1400;
-		rType = 0;
-		vrLen = 648;
-		vrLoc = 2995;
-	};
 	8EA0A218084CC43F008DFEC9 = {
 		fRef = 8E45227A0832898A00F8BA7C;
 		isa = PBXTextBookmark;
@@ -2035,6 +2092,46 @@
 		indexTemplatePath = "";
 		isa = PBXCodeSenseManager;
 	};
+	8EBA6E040852AAA900CC7940 = {
+		fRef = 8E47218808318D7A001F89FA;
+		isa = PBXTextBookmark;
+		name = "PlaylistController.m: initWithCoder:";
+		rLen = 0;
+		rLoc = 272;
+		rType = 0;
+		vrLen = 509;
+		vrLoc = 5018;
+	};
+	8EC156F4084FEB8900BB24E8 = {
+		fRef = 8E267D0C0837F7A6004ACBC5;
+		isa = PBXTextBookmark;
+		name = "UpdateController.m: 118";
+		rLen = 0;
+		rLoc = 2945;
+		rType = 0;
+		vrLen = 1079;
+		vrLoc = 2359;
+	};
+	8EC156F5084FEB8900BB24E8 = {
+		fRef = 8E267D0A0837F7A6004ACBC5;
+		isa = PBXTextBookmark;
+		name = DBLog;
+		rLen = 5;
+		rLoc = 7208;
+		rType = 0;
+		vrLen = 957;
+		vrLoc = 6740;
+	};
+	8EC156F9084FEB8900BB24E8 = {
+		fRef = 8E267D0A0837F7A6004ACBC5;
+		isa = PBXTextBookmark;
+		name = DBLog;
+		rLen = 5;
+		rLoc = 7208;
+		rType = 0;
+		vrLen = 957;
+		vrLoc = 6740;
+	};
 	8EC18D9D084E3D8200AE0BA9 = {
 		fRef = 8E45227B0832898A00F8BA7C;
 		isa = PBXTextBookmark;
@@ -2045,16 +2142,6 @@
 		vrLen = 515;
 		vrLoc = 4427;
 	};
-	8EC18D9E084E3D8200AE0BA9 = {
-		fRef = 8E14E4AA084D089100246BCC;
-		isa = PBXTextBookmark;
-		name = "libmp4.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 578;
-		vrLoc = 0;
-	};
 	8EC18D9F084E3D8200AE0BA9 = {
 		fRef = 8E47218A08318D7A001F89FA;
 		isa = PBXTextBookmark;
@@ -2075,42 +2162,6 @@
 		vrLen = 564;
 		vrLoc = 35;
 	};
-	8EC18EA5084E55A800AE0BA9 = {
-		fRef = 8EC18EA6084E55A800AE0BA9;
-		isa = PBXTextBookmark;
-		name = "(null): 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1165;
-		vrLoc = 0;
-	};
-	8EC18EA6084E55A800AE0BA9 = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.c;
-		name = in_mp4.c;
-		path = /Users/xugg/Desktop/faad2.1/plugins/in_mp4/in_mp4.c;
-		refType = 0;
-		sourceTree = "<absolute>";
-	};
-	8EC18EAA084E55A800AE0BA9 = {
-		fRef = 8EC18EAB084E55A800AE0BA9;
-		isa = PBXTextBookmark;
-		name = "(null): 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1165;
-		vrLoc = 0;
-	};
-	8EC18EAB084E55A800AE0BA9 = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.c;
-		name = in_mp4.c;
-		path = /Users/xugg/Desktop/faad2.1/plugins/in_mp4/in_mp4.c;
-		refType = 0;
-		sourceTree = "<absolute>";
-	};
 	8EC18EB8084E57D500AE0BA9 = {
 		fRef = 8EC18EB9084E57D500AE0BA9;
 		isa = PBXTextBookmark;
@@ -2128,6 +2179,12 @@
 		path = /Users/xugg/Desktop/faad2/plugins/xmms/src/libmp4.c;
 		refType = 0;
 		sourceTree = "<absolute>";
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {775, 7476}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRect = "{{0, 0}, {775, 372}}";
+			sepNavWindowFrame = "{{15, 72}, {1017, 669}}";
+		};
 	};
 	8EC18EBD084E57D500AE0BA9 = {
 		fRef = 8EC18EBE084E57D500AE0BA9;
@@ -2162,7 +2219,7 @@
 		isa = PBXTextBookmark;
 		name = "AACFile.h: buffer";
 		rLen = 0;
-		rLoc = 406;
+		rLoc = 457;
 		rType = 0;
 		vrLen = 501;
 		vrLoc = 0;
@@ -2177,16 +2234,6 @@
 		vrLen = 365;
 		vrLoc = 0;
 	};
-	8ED3C9B1084915CE00BB7797 = {
-		fRef = 8E267D0C0837F7A6004ACBC5;
-		isa = PBXTextBookmark;
-		name = "UpdateController.m: 34";
-		rLen = 0;
-		rLoc = 818;
-		rType = 0;
-		vrLen = 725;
-		vrLoc = 171;
-	};
 	8ED833CD08457E6B0033CDBD = {
 		fRef = 8E47218608318D7A001F89FA;
 		isa = PBXTextBookmark;
@@ -2201,7 +2248,7 @@
 		fileReference = 8EF6FA6E082DA526006F7BE6;
 		functionName = "+readInfo:";
 		isa = PBXFileBreakpoint;
-		lineNumber = 113;
+		lineNumber = 114;
 		state = 2;
 	};
 	8EDC88A90842F8DE007D1532 = {
@@ -2278,6 +2325,26 @@
 		vrLen = 1069;
 		vrLoc = 3336;
 	};
+	8EE2A5B808511A1800367489 = {
+		fRef = 8D1107310486CEB800E47090;
+		isa = PBXTextBookmark;
+		name = "Info.plist: 18";
+		rLen = 0;
+		rLoc = 501;
+		rType = 0;
+		vrLen = 677;
+		vrLoc = 39;
+	};
+	8EE2A5B908511A1800367489 = {
+		fRef = 8E4721D108319294001F89FA;
+		isa = PBXTextBookmark;
+		name = "AppController.h: playButton";
+		rLen = 290;
+		rLoc = 233;
+		rType = 0;
+		vrLen = 665;
+		vrLoc = 0;
+	};
 	8EE4A6C3082E6F6100415456 = {
 		fRef = 8EF6FA6A082DA526006F7BE6;
 		isa = PBXTextBookmark;
@@ -2341,9 +2408,9 @@
 	};
 	8EF6FA66082DA526006F7BE6 = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1130, 2562}}";
-			sepNavSelRange = "{1625, 0}";
-			sepNavVisRect = "{{0, 574}, {775, 372}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1130, 2646}}";
+			sepNavSelRange = "{4219, 0}";
+			sepNavVisRect = "{{0, 2078}, {775, 372}}";
 		};
 	};
 	8EF6FA67082DA526006F7BE6 = {
@@ -2355,9 +2422,9 @@
 	};
 	8EF6FA68082DA526006F7BE6 = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {775, 1218}}";
-			sepNavSelRange = "{343, 0}";
-			sepNavVisRect = "{{0, 684}, {775, 372}}";
+			sepNavIntBoundsRect = "{{0, 0}, {775, 1246}}";
+			sepNavSelRange = "{1738, 0}";
+			sepNavVisRect = "{{0, 832}, {775, 372}}";
 		};
 	};
 	8EF6FA69082DA526006F7BE6 = {
@@ -2369,9 +2436,9 @@
 	};
 	8EF6FA6A082DA526006F7BE6 = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {775, 1484}}";
-			sepNavSelRange = "{893, 0}";
-			sepNavVisRect = "{{0, 370}, {775, 372}}";
+			sepNavIntBoundsRect = "{{0, 0}, {775, 1540}}";
+			sepNavSelRange = "{2209, 0}";
+			sepNavVisRect = "{{0, 1140}, {775, 372}}";
 		};
 	};
 	8EF6FA6B082DA526006F7BE6 = {
@@ -2383,24 +2450,24 @@
 	};
 	8EF6FA6C082DA526006F7BE6 = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {983, 2954}}";
-			sepNavSelRange = "{1113, 42}";
-			sepNavVisRect = "{{0, 678}, {983, 310}}";
+			sepNavIntBoundsRect = "{{0, 0}, {775, 2982}}";
+			sepNavSelRange = "{4116, 0}";
+			sepNavVisRect = "{{0, 2425}, {775, 372}}";
 		};
 	};
 	8EF6FA6D082DA526006F7BE6 = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {775, 826}}";
-			sepNavSelRange = "{358, 0}";
-			sepNavVisRect = "{{0, 0}, {775, 372}}";
+			sepNavSelRange = "{1030, 0}";
+			sepNavVisRect = "{{0, 352}, {775, 372}}";
 			sepNavWindowFrame = "{{15, 61}, {1016, 680}}";
 		};
 	};
 	8EF6FA6E082DA526006F7BE6 = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {775, 2884}}";
-			sepNavSelRange = "{2876, 0}";
-			sepNavVisRect = "{{0, 1770}, {775, 372}}";
+			sepNavIntBoundsRect = "{{0, 0}, {775, 2898}}";
+			sepNavSelRange = "{2052, 0}";
+			sepNavVisRect = "{{0, 1317}, {775, 372}}";
 			sepNavWindowFrame = "{{15, 61}, {750, 680}}";
 		};
 	};
@@ -2413,9 +2480,9 @@
 	};
 	8EF6FA70082DA526006F7BE6 = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {983, 1092}}";
-			sepNavSelRange = "{402, 0}";
-			sepNavVisRect = "{{0, 370}, {983, 310}}";
+			sepNavIntBoundsRect = "{{0, 0}, {775, 1120}}";
+			sepNavSelRange = "{1416, 0}";
+			sepNavVisRect = "{{0, 720}, {775, 372}}";
 		};
 	};
 	8EF6FA71082DA526006F7BE6 = {
@@ -2427,9 +2494,9 @@
 	};
 	8EF6FA72082DA526006F7BE6 = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {782, 1708}}";
-			sepNavSelRange = "{1865, 0}";
-			sepNavVisRect = "{{0, 1137}, {775, 372}}";
+			sepNavIntBoundsRect = "{{0, 0}, {782, 1736}}";
+			sepNavSelRange = "{2003, 0}";
+			sepNavVisRect = "{{0, 1336}, {775, 372}}";
 		};
 	};
 	8EF6FACD082DAA2B006F7BE6 = {
@@ -2604,4 +2671,1480 @@
 		refType = 0;
 		sourceTree = "<absolute>";
 	};
+	8EFC6CC00853721700C67D06 = {
+		fRef = 8E47218808318D7A001F89FA;
+		isa = PBXTextBookmark;
+		name = "PlaylistController.m: initWithCoder:";
+		rLen = 0;
+		rLoc = 272;
+		rType = 0;
+		vrLen = 509;
+		vrLoc = 5018;
+	};
+	8EFC6CC10853721700C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 13";
+		rLen = 0;
+		rLoc = 207;
+		rType = 0;
+		vrLen = 637;
+		vrLoc = 17;
+	};
+	8EFC6CC20853721700C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: buffer";
+		rLen = 0;
+		rLoc = 457;
+		rType = 0;
+		vrLen = 501;
+		vrLoc = 0;
+	};
+	8EFC6CC30853721700C67D06 = {
+		fRef = 8E47218808318D7A001F89FA;
+		isa = PBXTextBookmark;
+		name = "PlaylistController.m: initWithCoder:";
+		rLen = 0;
+		rLoc = 272;
+		rType = 0;
+		vrLen = 509;
+		vrLoc = 5018;
+	};
+	8EFC6CC40853721700C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: buffer";
+		rLen = 0;
+		rLoc = 457;
+		rType = 0;
+		vrLen = 501;
+		vrLoc = 0;
+	};
+	8EFC6CC50853721700C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 13";
+		rLen = 0;
+		rLoc = 207;
+		rType = 0;
+		vrLen = 637;
+		vrLoc = 17;
+	};
+	8EFC6CC60853721700C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: buffer";
+		rLen = 0;
+		rLoc = 416;
+		rType = 0;
+		vrLen = 454;
+		vrLoc = 0;
+	};
+	8EFC6CD3085372A800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 42";
+		rLen = 0;
+		rLoc = 246;
+		rType = 0;
+		vrLen = 622;
+		vrLoc = 629;
+	};
+	8EFC6CD4085372A800C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 25";
+		rLen = 0;
+		rLoc = 440;
+		rType = 0;
+		vrLen = 428;
+		vrLoc = 132;
+	};
+	8EFC6CD5085372A800C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 25";
+		rLen = 0;
+		rLoc = 440;
+		rType = 0;
+		vrLen = 428;
+		vrLoc = 132;
+	};
+	8EFC6CD6085372A800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 42";
+		rLen = 0;
+		rLoc = 246;
+		rType = 0;
+		vrLen = 622;
+		vrLoc = 629;
+	};
+	8EFC6CD7085372A800C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 25";
+		rLen = 0;
+		rLoc = 439;
+		rType = 0;
+		vrLen = 425;
+		vrLoc = 132;
+	};
+	8EFC6CE3085372F200C67D06 = {
+		comments = "error: too few arguments to function 'get_AAC_format'";
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		rLen = 0;
+		rLoc = 15;
+		rType = 1;
+	};
+	8EFC6CE4085372F200C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 40";
+		rLen = 0;
+		rLoc = 246;
+		rType = 0;
+		vrLen = 570;
+		vrLoc = 629;
+	};
+	8EFC6CEA0853732D00C67D06 = {
+		comments = "warning: unused variable 'cap'";
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		rLen = 0;
+		rLoc = 15;
+		rType = 1;
+	};
+	8EFC6CEB0853732D00C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "unsigned long cap = NeAACDecGetCapabilities();";
+		rLen = 0;
+		rLoc = 246;
+		rType = 0;
+		vrLen = 563;
+		vrLoc = 28;
+	};
+	8EFC6CFA0853745400C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "unsigned long cap = NeAACDecGetCapabilities();";
+		rLen = 0;
+		rLoc = 246;
+		rType = 0;
+		vrLen = 559;
+		vrLoc = 28;
+	};
+	8EFC6D0D0853760900C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D100853768500C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D130853769900C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D16085376C100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D18085376D100C67D06 = {
+		fRef = 8EF6FA69082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MPEGFile.h: 14";
+		rLen = 0;
+		rLoc = 245;
+		rType = 0;
+		vrLen = 272;
+		vrLoc = 0;
+	};
+	8EFC6D19085376D100C67D06 = {
+		fRef = 8EF6FA68082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MonkeysFile.m: 30";
+		rLen = 0;
+		rLoc = 571;
+		rType = 0;
+		vrLen = 627;
+		vrLoc = 219;
+	};
+	8EFC6D1A085376D100C67D06 = {
+		fRef = 8EF6FA65082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.h: SAMPLE_BUFFER_SIZE";
+		rLen = 0;
+		rLoc = 342;
+		rType = 0;
+		vrLen = 617;
+		vrLoc = 0;
+	};
+	8EFC6D1B085376D100C67D06 = {
+		fRef = 8EF6FA6C082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MusepackFile.m: 83";
+		rLen = 0;
+		rLoc = 1593;
+		rType = 0;
+		vrLen = 506;
+		vrLoc = 1274;
+	};
+	8EFC6D1C085376D100C67D06 = {
+		fRef = 8EF6FA6B082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MusepackFile.h: buffer";
+		rLen = 0;
+		rLoc = 383;
+		rType = 0;
+		vrLen = 564;
+		vrLoc = 35;
+	};
+	8EFC6D1D085376D100C67D06 = {
+		fRef = 8EF6FA6A082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = return;
+		rLen = 6;
+		rLoc = 1584;
+		rType = 0;
+		vrLen = 652;
+		vrLoc = 1199;
+	};
+	8EFC6D1E085376D100C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 32";
+		rLen = 0;
+		rLoc = 554;
+		rType = 0;
+		vrLen = 425;
+		vrLoc = 135;
+	};
+	8EFC6D1F085376D100C67D06 = {
+		fRef = 8EF6FA66082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.m: close";
+		rLen = 44;
+		rLoc = 4065;
+		rType = 0;
+		vrLen = 365;
+		vrLoc = 3928;
+	};
+	8EFC6D20085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 60";
+		rLen = 0;
+		rLoc = 1418;
+		rType = 0;
+		vrLen = 599;
+		vrLoc = 1291;
+	};
+	8EFC6D21085376D100C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: info";
+		rLen = 0;
+		rLoc = 439;
+		rType = 0;
+		vrLen = 442;
+		vrLoc = 132;
+	};
+	8EFC6D22085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 10";
+		rLen = 0;
+		rLoc = 181;
+		rType = 0;
+		vrLen = 591;
+		vrLoc = 0;
+	};
+	8EFC6D23085376D100C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 13";
+		rLen = 0;
+		rLoc = 184;
+		rType = 0;
+		vrLen = 524;
+		vrLoc = 73;
+	};
+	8EFC6D24085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 34";
+		rLen = 0;
+		rLoc = 246;
+		rType = 0;
+		vrLen = 766;
+		vrLoc = 591;
+	};
+	8EFC6D25085376D100C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 12";
+		rLen = 0;
+		rLoc = 184;
+		rType = 0;
+		vrLen = 500;
+		vrLoc = 73;
+	};
+	8EFC6D26085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 10";
+		rLen = 0;
+		rLoc = 181;
+		rType = 0;
+		vrLen = 616;
+		vrLoc = 0;
+	};
+	8EFC6D27085376D100C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 12";
+		rLen = 0;
+		rLoc = 184;
+		rType = 0;
+		vrLen = 500;
+		vrLoc = 73;
+	};
+	8EFC6D28085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 10";
+		rLen = 0;
+		rLoc = 181;
+		rType = 0;
+		vrLen = 616;
+		vrLoc = 0;
+	};
+	8EFC6D29085376D100C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 25";
+		rLen = 0;
+		rLoc = 439;
+		rType = 0;
+		vrLen = 482;
+		vrLoc = 73;
+	};
+	8EFC6D2A085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 246;
+		rType = 0;
+		vrLen = 567;
+		vrLoc = 1207;
+	};
+	8EFC6D2B085376D100C67D06 = {
+		fRef = 8EF6FA69082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MPEGFile.h: 14";
+		rLen = 0;
+		rLoc = 245;
+		rType = 0;
+		vrLen = 272;
+		vrLoc = 0;
+	};
+	8EFC6D2C085376D100C67D06 = {
+		fRef = 8EF6FA6A082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "totalSize = (long int)(duration*(double)frequency/1000.0*channels*bitsPerSample/8);";
+		rLen = 85;
+		rLoc = 829;
+		rType = 0;
+		vrLen = 813;
+		vrLoc = 464;
+	};
+	8EFC6D2D085376D100C67D06 = {
+		fRef = 8EF6FA66082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.m: 48";
+		rLen = 0;
+		rLoc = 1625;
+		rType = 0;
+		vrLen = 994;
+		vrLoc = 1134;
+	};
+	8EFC6D2E085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 65";
+		rLen = 0;
+		rLoc = 246;
+		rType = 0;
+		vrLen = 629;
+		vrLoc = 1207;
+	};
+	8EFC6D2F085376D100C67D06 = {
+		fRef = 8EF6FA65082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.h: SAMPLE_BUFFER_SIZE";
+		rLen = 0;
+		rLoc = 342;
+		rType = 0;
+		vrLen = 617;
+		vrLoc = 0;
+	};
+	8EFC6D30085376D100C67D06 = {
+		fRef = 8EF6FA66082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.m: open:";
+		rLen = 42;
+		rLoc = 2633;
+		rType = 0;
+		vrLen = 628;
+		vrLoc = 2420;
+	};
+	8EFC6D31085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "- (BOOL)readInfo";
+		rLen = 40;
+		rLoc = 1593;
+		rType = 0;
+		vrLen = 441;
+		vrLoc = 135;
+	};
+	8EFC6D32085376D100C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: readInfo";
+		rLen = 0;
+		rLoc = 554;
+		rType = 0;
+		vrLen = 439;
+		vrLoc = 135;
+	};
+	8EFC6D33085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 17";
+		rLen = 0;
+		rLoc = 247;
+		rType = 0;
+		vrLen = 552;
+		vrLoc = 183;
+	};
+	8EFC6D34085376D100C67D06 = {
+		fRef = 8EF6FA68082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MonkeysFile.m: 30";
+		rLen = 0;
+		rLoc = 571;
+		rType = 0;
+		vrLen = 627;
+		vrLoc = 219;
+	};
+	8EFC6D35085376D100C67D06 = {
+		fRef = 8EF6FA65082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.h: SAMPLE_BUFFER_SIZE";
+		rLen = 0;
+		rLoc = 342;
+		rType = 0;
+		vrLen = 617;
+		vrLoc = 0;
+	};
+	8EFC6D36085376D100C67D06 = {
+		fRef = 8EF6FA66082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.m: 106";
+		rLen = 0;
+		rLoc = 3034;
+		rType = 0;
+		vrLen = 560;
+		vrLoc = 2595;
+	};
+	8EFC6D37085376D100C67D06 = {
+		fRef = 8EF6FA6A082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MPEGFile.m: 72";
+		rLen = 0;
+		rLoc = 1639;
+		rType = 0;
+		vrLen = 604;
+		vrLoc = 1159;
+	};
+	8EFC6D38085376D100C67D06 = {
+		fRef = 8EF6FA6C082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MusepackFile.m: 83";
+		rLen = 0;
+		rLoc = 1593;
+		rType = 0;
+		vrLen = 506;
+		vrLoc = 1274;
+	};
+	8EFC6D39085376D100C67D06 = {
+		fRef = 8EF6FA6B082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MusepackFile.h: buffer";
+		rLen = 0;
+		rLoc = 383;
+		rType = 0;
+		vrLen = 564;
+		vrLoc = 35;
+	};
+	8EFC6D3A085376D100C67D06 = {
+		fRef = 8EF6FA6A082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = return;
+		rLen = 6;
+		rLoc = 1584;
+		rType = 0;
+		vrLen = 652;
+		vrLoc = 1199;
+	};
+	8EFC6D3B085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 73";
+		rLen = 0;
+		rLoc = 1708;
+		rType = 0;
+		vrLen = 599;
+		vrLoc = 1291;
+	};
+	8EFC6D3C085376D100C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 32";
+		rLen = 0;
+		rLoc = 554;
+		rType = 0;
+		vrLen = 425;
+		vrLoc = 135;
+	};
+	8EFC6D3D085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 60";
+		rLen = 0;
+		rLoc = 1418;
+		rType = 0;
+		vrLen = 599;
+		vrLoc = 1291;
+	};
+	8EFC6D3E085376D100C67D06 = {
+		fRef = 8EF6FA66082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.m: close";
+		rLen = 44;
+		rLoc = 4065;
+		rType = 0;
+		vrLen = 365;
+		vrLoc = 3928;
+	};
+	8EFC6D3F085376D100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 150";
+		rLen = 0;
+		rLoc = 3839;
+		rType = 0;
+		vrLen = 436;
+		vrLoc = 3238;
+	};
+	8EFC6D440853772000C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D47085377A400C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D4A085377D900C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D4F0853786000C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D520853787100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D570853791100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D5A0853793800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D5D0853798C00C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D64085379E100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D67085379F000C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D6A08537A1200C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D7D08537A5D00C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D8008537A7700C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D8308537A9600C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D8608537AB100C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6D9E08537CAE00C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DAD08537D1F00C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DB008537D4300C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DB308537D6700C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DB608537D9F00C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DB908537DB700C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DBC08537DD400C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DBF08537E1F00C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DC208537E7400C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DC508537ED200C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DC808537EEA00C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DCB08537F0000C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DCE08537F0D00C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DD108537F8D00C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DD408537FB000C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DD708537FC200C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DDA08537FD200C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DDD08537FE600C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DE4085380B400C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 67";
+		rLen = 0;
+		rLoc = 1590;
+		rType = 0;
+		vrLen = 467;
+		vrLoc = 28;
+	};
+	8EFC6DE7085380B800C67D06 = {
+		fRef = 8EC18EB9084E57D500AE0BA9;
+		isa = PBXTextBookmark;
+		name = "libmp4.c: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 578;
+		vrLoc = 0;
+	};
+	8EFC6DE8085380B800C67D06 = {
+		fRef = 8EF6FA6B082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MusepackFile.h: buffer";
+		rLen = 0;
+		rLoc = 383;
+		rType = 0;
+		vrLen = 564;
+		vrLoc = 35;
+	};
+	8EFC6DE9085380B800C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 32";
+		rLen = 0;
+		rLoc = 554;
+		rType = 0;
+		vrLen = 428;
+		vrLoc = 132;
+	};
+	8EFC6DEA085380B800C67D06 = {
+		fRef = 8EF6FA6D082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "SoundFile.h: seekToTime:";
+		rLen = 0;
+		rLoc = 1030;
+		rType = 0;
+		vrLen = 670;
+		vrLoc = 461;
+	};
+	8EFC6DEB085380B800C67D06 = {
+		fRef = 8EF6FA6A082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MPEGFile.m: close";
+		rLen = 0;
+		rLoc = 2209;
+		rType = 0;
+		vrLen = 455;
+		vrLoc = 1874;
+	};
+	8EFC6DEC085380B800C67D06 = {
+		fRef = 8EF6FA68082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MonkeysFile.m: close";
+		rLen = 0;
+		rLoc = 1738;
+		rType = 0;
+		vrLen = 475;
+		vrLoc = 1471;
+	};
+	8EFC6DED085380B800C67D06 = {
+		fRef = 8EF6FA66082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.m: 166";
+		rLen = 0;
+		rLoc = 4219;
+		rType = 0;
+		vrLen = 367;
+		vrLoc = 3928;
+	};
+	8EFC6DEE085380B800C67D06 = {
+		fRef = 8EF6FA6C082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MusepackFile.m: 197";
+		rLen = 0;
+		rLoc = 4116;
+		rType = 0;
+		vrLen = 508;
+		vrLoc = 3624;
+	};
+	8EFC6DEF085380B800C67D06 = {
+		fRef = 8EF6FA70082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "VorbisFile.m: 75";
+		rLen = 0;
+		rLoc = 1416;
+		rType = 0;
+		vrLen = 520;
+		vrLoc = 901;
+	};
+	8EFC6DF0085380B800C67D06 = {
+		fRef = 8EF6FA71082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "WaveFile.h: readInfo";
+		rLen = 0;
+		rLoc = 302;
+		rType = 0;
+		vrLen = 309;
+		vrLoc = 0;
+	};
+	8EFC6DF1085380B800C67D06 = {
+		fRef = 8EF6FA72082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "WaveFile.m: close";
+		rLen = 0;
+		rLoc = 2003;
+		rType = 0;
+		vrLen = 393;
+		vrLoc = 1742;
+	};
+	8EFC6DF2085380B800C67D06 = {
+		fRef = 8EF6FA6E082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "SoundFile.m: open:";
+		rLen = 0;
+		rLoc = 2052;
+		rType = 0;
+		vrLen = 446;
+		vrLoc = 1850;
+	};
+	8EFC6DF3085380B800C67D06 = {
+		fRef = 8E45227A0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = current;
+		rLen = 7;
+		rLoc = 1056;
+		rType = 0;
+		vrLen = 629;
+		vrLoc = 780;
+	};
+	8EFC6DF4085380B800C67D06 = {
+		fRef = 8E45227B0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = "Sound.m: 332";
+		rLen = 0;
+		rLoc = 9218;
+		rType = 0;
+		vrLen = 630;
+		vrLoc = 8684;
+	};
+	8EFC6DF5085380B800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 161";
+		rLen = 0;
+		rLoc = 3862;
+		rType = 0;
+		vrLen = 502;
+		vrLoc = 3503;
+	};
+	8EFC6DF6085380B800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 150";
+		rLen = 0;
+		rLoc = 3839;
+		rType = 0;
+		vrLen = 436;
+		vrLoc = 3238;
+	};
+	8EFC6DF7085380B800C67D06 = {
+		fRef = 8EC18EB9084E57D500AE0BA9;
+		isa = PBXTextBookmark;
+		name = "libmp4.c: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 578;
+		vrLoc = 0;
+	};
+	8EFC6DF8085380B800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 151";
+		rLen = 0;
+		rLoc = 3820;
+		rType = 0;
+		vrLen = 521;
+		vrLoc = 3238;
+	};
+	8EFC6DF9085380B800C67D06 = {
+		fRef = 8E45227B0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = "Sound.m: 557";
+		rLen = 201;
+		rLoc = 15780;
+		rType = 0;
+		vrLen = 695;
+		vrLoc = 15168;
+	};
+	8EFC6DFA085380B800C67D06 = {
+		fRef = 8EF6FA71082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "WaveFile.h: readInfo";
+		rLen = 0;
+		rLoc = 302;
+		rType = 0;
+		vrLen = 309;
+		vrLoc = 0;
+	};
+	8EFC6DFB085380B800C67D06 = {
+		fRef = 8EF6FA6B082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MusepackFile.h: buffer";
+		rLen = 0;
+		rLoc = 383;
+		rType = 0;
+		vrLen = 564;
+		vrLoc = 35;
+	};
+	8EFC6DFC085380B800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 153";
+		rLen = 0;
+		rLoc = 3608;
+		rType = 0;
+		vrLen = 527;
+		vrLoc = 3429;
+	};
+	8EFC6DFD085380B800C67D06 = {
+		fRef = 8EF6FA6D082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "SoundFile.h: seek:";
+		rLen = 0;
+		rLoc = 992;
+		rType = 0;
+		vrLen = 668;
+		vrLoc = 461;
+	};
+	8EFC6DFE085380B800C67D06 = {
+		fRef = 8EF6FA6E082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "SoundFile.m: 25";
+		rLen = 0;
+		rLoc = 490;
+		rType = 0;
+		vrLen = 508;
+		vrLoc = 0;
+	};
+	8EFC6DFF085380B800C67D06 = {
+		fRef = 8E45227B0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = "Sound.m: 313";
+		rLen = 0;
+		rLoc = 8808;
+		rType = 0;
+		vrLen = 657;
+		vrLoc = 8484;
+	};
+	8EFC6E00085380B800C67D06 = {
+		fRef = 8EF6FA6D082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "SoundFile.h: 47";
+		rLen = 0;
+		rLoc = 985;
+		rType = 0;
+		vrLen = 670;
+		vrLoc = 461;
+	};
+	8EFC6E01085380B800C67D06 = {
+		fRef = 8EF6FA6E082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "SoundFile.m: 123";
+		rLen = 0;
+		rLoc = 2319;
+		rType = 0;
+		vrLen = 538;
+		vrLoc = 2085;
+	};
+	8EFC6E02085380B800C67D06 = {
+		fRef = 8EF6FA6D082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "SoundFile.h: seekToTime:";
+		rLen = 0;
+		rLoc = 1030;
+		rType = 0;
+		vrLen = 670;
+		vrLoc = 461;
+	};
+	8EFC6E03085380B800C67D06 = {
+		fRef = 8E14E479084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.h: 32";
+		rLen = 0;
+		rLoc = 554;
+		rType = 0;
+		vrLen = 428;
+		vrLoc = 132;
+	};
+	8EFC6E04085380B800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 153";
+		rLen = 0;
+		rLoc = 3605;
+		rType = 0;
+		vrLen = 580;
+		vrLoc = 3429;
+	};
+	8EFC6E05085380B800C67D06 = {
+		fRef = 8EF6FA6D082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "SoundFile.h: seekToTime:";
+		rLen = 0;
+		rLoc = 1030;
+		rType = 0;
+		vrLen = 670;
+		vrLoc = 461;
+	};
+	8EFC6E06085380B800C67D06 = {
+		fRef = 8EF6FA72082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "WaveFile.m: readInfo";
+		rLen = 0;
+		rLoc = 1534;
+		rType = 0;
+		vrLen = 460;
+		vrLoc = 1194;
+	};
+	8EFC6E07085380B800C67D06 = {
+		fRef = 8EF6FA6E082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "SoundFile.m: open:";
+		rLen = 0;
+		rLoc = 2052;
+		rType = 0;
+		vrLen = 446;
+		vrLoc = 1850;
+	};
+	8EFC6E08085380B800C67D06 = {
+		fRef = 8E45227B0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = "Sound.m: 313";
+		rLen = 0;
+		rLoc = 8746;
+		rType = 0;
+		vrLen = 675;
+		vrLoc = 8666;
+	};
+	8EFC6E09085380B800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 153";
+		rLen = 0;
+		rLoc = 3605;
+		rType = 0;
+		vrLen = 590;
+		vrLoc = 3429;
+	};
+	8EFC6E0A085380B800C67D06 = {
+		fRef = 8EF6FA66082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.m: 166";
+		rLen = 0;
+		rLoc = 4219;
+		rType = 0;
+		vrLen = 367;
+		vrLoc = 3928;
+	};
+	8EFC6E0B085380B800C67D06 = {
+		fRef = 8EF6FA68082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MonkeysFile.m: 85";
+		rLen = 0;
+		rLoc = 1943;
+		rType = 0;
+		vrLen = 448;
+		vrLoc = 1497;
+	};
+	8EFC6E0C085380B800C67D06 = {
+		fRef = 8EF6FA6A082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MPEGFile.m: close";
+		rLen = 0;
+		rLoc = 2209;
+		rType = 0;
+		vrLen = 455;
+		vrLoc = 1874;
+	};
+	8EFC6E0D085380B800C67D06 = {
+		fRef = 8EF6FA68082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MonkeysFile.m: close";
+		rLen = 0;
+		rLoc = 1738;
+		rType = 0;
+		vrLen = 475;
+		vrLoc = 1471;
+	};
+	8EFC6E0E085380B800C67D06 = {
+		fRef = 8EF6FA66082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "FlacFile.m: 166";
+		rLen = 0;
+		rLoc = 4219;
+		rType = 0;
+		vrLen = 367;
+		vrLoc = 3928;
+	};
+	8EFC6E0F085380B800C67D06 = {
+		fRef = 8EF6FA6C082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "MusepackFile.m: 197";
+		rLen = 0;
+		rLoc = 4116;
+		rType = 0;
+		vrLen = 508;
+		vrLoc = 3624;
+	};
+	8EFC6E10085380B800C67D06 = {
+		fRef = 8EF6FA70082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "VorbisFile.m: 75";
+		rLen = 0;
+		rLoc = 1416;
+		rType = 0;
+		vrLen = 520;
+		vrLoc = 901;
+	};
+	8EFC6E11085380B800C67D06 = {
+		fRef = 8EF6FA71082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "WaveFile.h: readInfo";
+		rLen = 0;
+		rLoc = 302;
+		rType = 0;
+		vrLen = 309;
+		vrLoc = 0;
+	};
+	8EFC6E12085380B800C67D06 = {
+		fRef = 8EF6FA72082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "WaveFile.m: close";
+		rLen = 0;
+		rLoc = 2003;
+		rType = 0;
+		vrLen = 393;
+		vrLoc = 1742;
+	};
+	8EFC6E13085380B800C67D06 = {
+		fRef = 8EF6FA6E082DA526006F7BE6;
+		isa = PBXTextBookmark;
+		name = "SoundFile.m: open:";
+		rLen = 0;
+		rLoc = 2052;
+		rType = 0;
+		vrLen = 446;
+		vrLoc = 1850;
+	};
+	8EFC6E14085380B800C67D06 = {
+		fRef = 8E45227B0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = "Sound.m: 327";
+		rLen = 0;
+		rLoc = 9217;
+		rType = 0;
+		vrLen = 591;
+		vrLoc = 8666;
+	};
+	8EFC6E15085380B800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 161";
+		rLen = 0;
+		rLoc = 3862;
+		rType = 0;
+		vrLen = 489;
+		vrLoc = 3516;
+	};
+	8EFC6E16085380B800C67D06 = {
+		fRef = 8E45227B0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = "Sound.m: 332";
+		rLen = 0;
+		rLoc = 9217;
+		rType = 0;
+		vrLen = 567;
+		vrLoc = 8666;
+	};
+	8EFC6E17085380B800C67D06 = {
+		fRef = 8E45227A0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = current;
+		rLen = 7;
+		rLoc = 1056;
+		rType = 0;
+		vrLen = 629;
+		vrLoc = 780;
+	};
+	8EFC6E18085380B800C67D06 = {
+		fRef = 8E45227B0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = "Sound.m: 332";
+		rLen = 0;
+		rLoc = 9217;
+		rType = 0;
+		vrLen = 567;
+		vrLoc = 8666;
+	};
+	8EFC6E19085380B800C67D06 = {
+		fRef = 8E45227A0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = current;
+		rLen = 7;
+		rLoc = 1056;
+		rType = 0;
+		vrLen = 629;
+		vrLoc = 780;
+	};
+	8EFC6E1A085380B800C67D06 = {
+		fRef = 8E45227B0832898A00F8BA7C;
+		isa = PBXTextBookmark;
+		name = "Sound.m: 332";
+		rLen = 0;
+		rLoc = 9218;
+		rType = 0;
+		vrLen = 630;
+		vrLoc = 8684;
+	};
+	8EFC6E1B085380B800C67D06 = {
+		fRef = 8E14E47A084CF1A200246BCC;
+		isa = PBXTextBookmark;
+		name = "AACFile.m: 152";
+		rLen = 0;
+		rLoc = 3595;
+		rType = 0;
+		vrLen = 492;
+		vrLoc = 3503;
+	};
 }
diff --git a/English.lproj/MainMenu.nib/classes.nib b/English.lproj/MainMenu.nib/classes.nib
index 7f8d579a7..976e35619 100644
--- a/English.lproj/MainMenu.nib/classes.nib
+++ b/English.lproj/MainMenu.nib/classes.nib
@@ -12,9 +12,18 @@
             CLASS = AppController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                addButton = NSButton; 
+                infoButton = NSButton; 
                 infoPanel = NSPanel; 
                 mainWindow = NSWindow; 
+                nextButton = NSButton; 
+                playButton = NSButton; 
                 playlistController = PlaylistController; 
+                prevButton = NSButton; 
+                remButton = NSButton; 
+                repeatButton = NSButton; 
+                shuffleButton = NSButton; 
+                stopButton = NSButton; 
             }; 
             SUPERCLASS = NSObject; 
         }, 
diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib
index c6c863b06..1dd2768ca 100644
--- a/English.lproj/MainMenu.nib/info.nib
+++ b/English.lproj/MainMenu.nib/info.nib
@@ -13,8 +13,8 @@
 	<string>437.0</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>21</integer>
 		<integer>29</integer>
+		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8B15</string>
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index 108d28166..e456168ac 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/Feedback/FeedbackController.m b/Feedback/FeedbackController.m
index 28c82114b..1876128b4 100644
--- a/Feedback/FeedbackController.m
+++ b/Feedback/FeedbackController.m
@@ -23,7 +23,11 @@
 
 - (void)alertDidEnd:(NSAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo
 {
-	[feedbackWindow close];
+	NSLog(@"CONTEXT: %i", contextInfo);
+	if (contextInfo == YES)
+	{
+		[feedbackWindow close];
+	}
 }
 
 - (void)FeedbackErrorOccurred:(NSNotification *)aNotification
@@ -36,7 +40,7 @@
 	[alert setMessageText:@"Failed"];
 	[alert setInformativeText:@"Feedback failed to send."];
 	
-	[alert beginSheetModalForWindow:feedbackWindow modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:NULL];
+	[alert beginSheetModalForWindow:feedbackWindow modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:NO];
 }
 
 - (void)FeedbackSent:(NSNotification *)aNotification
@@ -49,7 +53,7 @@
 	[alert setMessageText:@"Success"];
 	[alert setInformativeText:@"Feedback successfully sent!"];
 
-	[alert beginSheetModalForWindow:feedbackWindow modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:NULL];
+	[alert beginSheetModalForWindow:feedbackWindow modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:YES];
 }
 
 
diff --git a/Feedback/FeedbackSocket.m b/Feedback/FeedbackSocket.m
index 29bebd955..74a3b9d41 100644
--- a/Feedback/FeedbackSocket.m
+++ b/Feedback/FeedbackSocket.m
@@ -42,7 +42,7 @@ NSString *encodeForURL(NSString *s)
 	NSURLResponse* response;
 	NSData* resultData = [NSURLConnection sendSynchronousRequest:post returningResponse:&response error:&error];
 	NSString *resultString = [[[NSString alloc] initWithData:resultData encoding:NSASCIIStringEncoding] autorelease];
-	
+	NSLog(@"RESULT: %@", resultString);
 	if ([resultString caseInsensitiveCompare:@"SUCCESS"] == NSOrderedSame)
 	{
 		[self performSelectorOnMainThread:@selector(returnSuccess:) withObject:nil waitUntilDone:NO];
diff --git a/Libraries/FAAD2/FAAD2.xcode/project.pbxproj b/Libraries/FAAD2/FAAD2.xcode/project.pbxproj
index 2f0e328eb..2a3d3c3c7 100644
--- a/Libraries/FAAD2/FAAD2.xcode/project.pbxproj
+++ b/Libraries/FAAD2/FAAD2.xcode/project.pbxproj
@@ -42,6 +42,7 @@
 		};
 		0867D691FE84028FC02AAC07 = {
 			children = (
+				8E64758F08536C4B007B91CB,
 				8E3852DB084CEC6A00D715B8,
 				08FB77ACFE841707C02AAC07,
 				089C1665FE841158C02AAC07,
@@ -243,7 +244,7 @@
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
-				HEADER_SEARCH_PATHS = Files/libfaad/;
+				HEADER_SEARCH_PATHS = "Files/libfaad/ Files/common/faad";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				LIBRARY_STYLE = DYNAMIC;
@@ -327,6 +328,7 @@
 				8E3852DF084CEC7B00D715B8,
 				8E3852E0084CEC7B00D715B8,
 				8E3852ED084CED5500D715B8,
+				8EFC6C1E08536C9D00C67D06,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -386,6 +388,7 @@
 				8E3852D3084CEC6200D715B8,
 				8E3852D6084CEC6200D715B8,
 				8E3852D8084CEC6200D715B8,
+				8EFC6C1D08536C9D00C67D06,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1986,6 +1989,238 @@
 			settings = {
 			};
 		};
+		8E64758F08536C4B007B91CB = {
+			children = (
+				8EFC6BFF08536C9D00C67D06,
+				8EFC6C0808536C9D00C67D06,
+			);
+			isa = PBXGroup;
+			name = Common;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6BFF08536C9D00C67D06 = {
+			children = (
+				8EFC6C0008536C9D00C67D06,
+				8EFC6C0108536C9D00C67D06,
+				8EFC6C0208536C9D00C67D06,
+				8EFC6C0308536C9D00C67D06,
+				8EFC6C0408536C9D00C67D06,
+				8EFC6C0508536C9D00C67D06,
+				8EFC6C0608536C9D00C67D06,
+				8EFC6C0708536C9D00C67D06,
+			);
+			isa = PBXGroup;
+			name = faad;
+			path = Files/common/faad;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C0008536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = aacinfo.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C0108536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = aacinfo.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C0208536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = filestream.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C0308536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = filestream.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C0408536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = getopt.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C0508536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = getopt.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C0608536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = id3v2tag.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C0708536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = id3v2tag.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C0808536C9D00C67D06 = {
+			children = (
+				8EFC6C0908536C9D00C67D06,
+				8EFC6C1108536C9D00C67D06,
+				8EFC6C1208536C9D00C67D06,
+				8EFC6C1308536C9D00C67D06,
+				8EFC6C1408536C9D00C67D06,
+				8EFC6C1508536C9D00C67D06,
+				8EFC6C1608536C9D00C67D06,
+				8EFC6C1708536C9D00C67D06,
+				8EFC6C1808536C9D00C67D06,
+				8EFC6C1908536C9D00C67D06,
+				8EFC6C1A08536C9D00C67D06,
+				8EFC6C1B08536C9D00C67D06,
+				8EFC6C1C08536C9D00C67D06,
+			);
+			isa = PBXGroup;
+			name = mp4ff;
+			path = Files/common/mp4ff;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C0908536C9D00C67D06 = {
+			children = (
+			);
+			isa = PBXGroup;
+			path = .deps;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1108536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = drms.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1208536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = drms.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1308536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = drmstables.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1408536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = mp4atom.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1508536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = mp4ff.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1608536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = mp4ff.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1708536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = mp4ff_int_types.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1808536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = mp4ffint.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1908536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = mp4meta.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1A08536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = mp4sample.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1B08536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = mp4tagupdate.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1C08536C9D00C67D06 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = mp4util.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		8EFC6C1D08536C9D00C67D06 = {
+			fileRef = 8EFC6C0008536C9D00C67D06;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		8EFC6C1E08536C9D00C67D06 = {
+			fileRef = 8EFC6C0108536C9D00C67D06;
+			isa = PBXBuildFile;
+			settings = {
+				ATTRIBUTES = (
+					Public,
+				);
+			};
+		};
 	};
 	rootObject = 0867D690FE84028FC02AAC07;
 }
diff --git a/Libraries/FAAD2/FAAD2.xcode/xugg.mode1 b/Libraries/FAAD2/FAAD2.xcode/xugg.mode1
index 3dffa4d7f..1699ea2a6 100644
--- a/Libraries/FAAD2/FAAD2.xcode/xugg.mode1
+++ b/Libraries/FAAD2/FAAD2.xcode/xugg.mode1
@@ -166,7 +166,7 @@
 	<key>FavBarConfig</key>
 	<dict>
 		<key>PBXProjectModuleGUID</key>
-		<string>8E3852EB084CECAD00D715B8</string>
+		<string>8EFC6C4708536D2500C67D06</string>
 		<key>XCBarModuleItemNames</key>
 		<dict/>
 		<key>XCBarModuleItems</key>
@@ -254,19 +254,22 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
 							<array>
 								<string>0867D691FE84028FC02AAC07</string>
-								<string>034768DDFF38A45A11DB9C8B</string>
-								<string>8D07F2C80486CC7A007CD1D0</string>
+								<string>8E64758F08536C4B007B91CB</string>
+								<string>8EFC6BFF08536C9D00C67D06</string>
 								<string>1C37FBAC04509CD000000102</string>
 								<string>1C37FABC05509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
+									<integer>3</integer>
+									<integer>2</integer>
+									<integer>1</integer>
 									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {186, 338}}</string>
+							<string>{{0, 0}, {186, 567}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -278,14 +281,14 @@
 					<key>GeometryConfiguration</key>
 					<dict>
 						<key>Frame</key>
-						<string>{{0, 0}, {203, 356}}</string>
+						<string>{{0, 0}, {203, 585}}</string>
 						<key>GroupTreeTableConfiguration</key>
 						<array>
 							<string>MainColumn</string>
 							<real>186</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>167 339 690 397 0 0 1024 746 </string>
+						<string>-1 120 1024 626 0 0 1024 746 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -296,12 +299,14 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>MyNewFile14.java</string>
+								<string>aacinfo.c</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -309,7 +314,25 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>MyNewFile14.java</string>
+										<string>aacinfo.c</string>
+										<key>_historyCapacity</key>
+										<integer>0</integer>
+										<key>bookmark</key>
+										<string>8EFC6D8908537AB900C67D06</string>
+										<key>history</key>
+										<array>
+											<string>8EFC6C7308536F3A00C67D06</string>
+											<string>8EFC6D6F08537A5300C67D06</string>
+											<string>8EFC6D7008537A5300C67D06</string>
+											<string>8EFC6D7908537A5300C67D06</string>
+										</array>
+										<key>prevStack</key>
+										<array>
+											<string>8EFC6C4208536D2500C67D06</string>
+											<string>8EFC6C4308536D2500C67D06</string>
+											<string>8EFC6C7708536F3A00C67D06</string>
+											<string>8EFC6D7308537A5300C67D06</string>
+										</array>
 									</dict>
 									<key>SplitCount</key>
 									<string>1</string>
@@ -320,18 +343,16 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {482, 0}}</string>
+								<string>{{0, 0}, {816, 406}}</string>
 								<key>RubberWindowFrame</key>
-								<string>167 339 690 397 0 0 1024 746 </string>
+								<string>-1 120 1024 626 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>0pt</string>
+							<string>406pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -342,18 +363,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 5}, {482, 351}}</string>
+								<string>{{0, 411}, {816, 174}}</string>
 								<key>RubberWindowFrame</key>
-								<string>167 339 690 397 0 0 1024 746 </string>
+								<string>-1 120 1024 626 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>351pt</string>
+							<string>174pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>482pt</string>
+					<string>816pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
@@ -368,9 +389,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8ED1CC1B084F86C700771E1E</string>
+				<string>8EFC6D8A08537AB900C67D06</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>8ED1CC1C084F86C700771E1E</string>
+				<string>8EFC6D8B08537AB900C67D06</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -507,7 +528,7 @@
 		<string>/Users/xugg/Projects/Cog/Libraries/FAAD2/FAAD2.xcode</string>
 	</array>
 	<key>WindowString</key>
-	<string>167 339 690 397 0 0 1024 746 </string>
+	<string>-1 120 1024 626 0 0 1024 746 </string>
 	<key>WindowTools</key>
 	<array>
 		<dict>
@@ -523,30 +544,30 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>huffman.c</string>
+								<string>mp4ff.c</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {1024, 343}}</string>
+								<string>{{0, 0}, {500, 218}}</string>
 								<key>RubberWindowFrame</key>
-								<string>0 121 1024 625 0 0 1024 746 </string>
+								<string>31 223 500 500 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>343pt</string>
+							<string>218pt</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -561,9 +582,9 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 348}, {1024, 236}}</string>
+								<string>{{0, 223}, {500, 236}}</string>
 								<key>RubberWindowFrame</key>
-								<string>0 121 1024 625 0 0 1024 746 </string>
+								<string>31 223 500 500 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXBuildResultsModule</string>
@@ -572,7 +593,7 @@
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>584pt</string>
+					<string>459pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
@@ -585,17 +606,17 @@
 			<true/>
 			<key>TableOfContents</key>
 			<array>
-				<string>8E3852E7084CECAC00D715B8</string>
-				<string>8E45D7BA084E82EF00867D39</string>
+				<string>8EFC6C5508536DA800C67D06</string>
+				<string>8EFC6C5608536DA800C67D06</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.build</string>
 			<key>WindowString</key>
-			<string>0 121 1024 625 0 0 1024 746 </string>
+			<string>31 223 500 500 0 0 1024 746 </string>
 			<key>WindowToolGUID</key>
-			<string>8E3852E7084CECAC00D715B8</string>
+			<string>8EFC6C5508536DA800C67D06</string>
 			<key>WindowToolIsVisible</key>
 			<false/>
 		</dict>
@@ -702,12 +723,8 @@
 			<integer>0</integer>
 		</dict>
 		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
 			<key>Identifier</key>
 			<string>windowTool.find</string>
-			<key>IsVertical</key>
-			<true/>
 			<key>Layout</key>
 			<array>
 				<dict>
@@ -722,16 +739,26 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CDD528C0622207200134675</string>
 										<key>PBXProjectModuleLabel</key>
-										<string></string>
+										<string>&lt;No Editor&gt;</string>
+										<key>PBXSplitModuleInNavigatorKey</key>
+										<dict>
+											<key>Split0</key>
+											<dict>
+												<key>PBXProjectModuleGUID</key>
+												<string>1CD0528D0623707200166675</string>
+											</dict>
+											<key>SplitCount</key>
+											<string>1</string>
+										</dict>
 										<key>StatusBarVisibility</key>
-										<true/>
+										<integer>1</integer>
 									</dict>
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{0, 0}, {781, 212}}</string>
+										<string>{{0, 0}, {781, 167}}</string>
 										<key>RubberWindowFrame</key>
-										<string>188 243 781 470 0 0 1024 746 </string>
+										<string>62 385 781 470 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXNavigatorGroup</string>
@@ -740,9 +767,11 @@
 								</dict>
 							</array>
 							<key>Proportion</key>
-							<string>212pt</string>
+							<string>50%</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<integer>1</integer>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -753,18 +782,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 217}, {781, 212}}</string>
+								<string>{{8, 0}, {773, 254}}</string>
 								<key>RubberWindowFrame</key>
-								<string>188 243 781 470 0 0 1024 746 </string>
+								<string>62 385 781 470 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXProjectFindModule</string>
 							<key>Proportion</key>
-							<string>212pt</string>
+							<string>50%</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>429pt</string>
+					<string>428pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
@@ -774,21 +803,23 @@
 				<string>PBXProjectFindModule</string>
 			</array>
 			<key>StatusbarIsVisible</key>
-			<true/>
+			<integer>1</integer>
 			<key>TableOfContents</key>
 			<array>
 				<string>1C530D57069F1CE1000CFCEE</string>
-				<string>8E146003084CEE5800DB7064</string>
-				<string>8E146004084CEE5800DB7064</string>
+				<string>1C530D58069F1CE1000CFCEE</string>
+				<string>1C530D59069F1CE1000CFCEE</string>
 				<string>1CDD528C0622207200134675</string>
+				<string>1C530D5A069F1CE1000CFCEE</string>
+				<string>1CE0B1FE06471DED0097A5F4</string>
 				<string>1CD0528E0623707200166675</string>
 			</array>
 			<key>WindowString</key>
-			<string>188 243 781 470 0 0 1024 746 </string>
+			<string>62 385 781 470 0 0 1440 878 </string>
 			<key>WindowToolGUID</key>
 			<string>1C530D57069F1CE1000CFCEE</string>
 			<key>WindowToolIsVisible</key>
-			<false/>
+			<integer>0</integer>
 		</dict>
 		<dict>
 			<key>Identifier</key>
@@ -847,8 +878,12 @@
 			<string>650 41 440 400 0 0 1280 1002 </string>
 		</dict>
 		<dict>
+			<key>FirstTimeWindowDisplayed</key>
+			<false/>
 			<key>Identifier</key>
 			<string>windowTool.run</string>
+			<key>IsVertical</key>
+			<true/>
 			<key>Layout</key>
 			<array>
 				<dict>
@@ -877,8 +912,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {493, 167}}</string>
-											<string>{{0, 176}, {493, 267}}</string>
+											<string>{{0, 0}, {493, 168}}</string>
+											<string>{{0, 173}, {493, 270}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@@ -893,8 +928,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {405, 443}}</string>
-											<string>{{414, 0}, {514, 443}}</string>
+											<string>{{0, 0}, {406, 443}}</string>
+											<string>{{411, 0}, {517, 443}}</string>
 										</array>
 									</dict>
 								</dict>
@@ -902,9 +937,9 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {460, 159}}</string>
+								<string>{{0, 0}, {459, 159}}</string>
 								<key>RubberWindowFrame</key>
-								<string>316 696 459 200 0 0 1280 1002 </string>
+								<string>41 523 459 200 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXRunSessionModule</string>
@@ -923,22 +958,22 @@
 				<string>PBXRunSessionModule</string>
 			</array>
 			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
+			<true/>
 			<key>TableOfContents</key>
 			<array>
 				<string>1C0AD2B3069F1EA900FABCE6</string>
-				<string>1C0AD2B4069F1EA900FABCE6</string>
+				<string>8EFC6C7108536F2C00C67D06</string>
 				<string>1CD0528B0623707200166675</string>
-				<string>1C0AD2B5069F1EA900FABCE6</string>
+				<string>8EFC6C7208536F2C00C67D06</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.run</string>
 			<key>WindowString</key>
-			<string>316 696 459 200 0 0 1280 1002 </string>
+			<string>41 523 459 200 0 0 1024 746 </string>
 			<key>WindowToolGUID</key>
 			<string>1C0AD2B3069F1EA900FABCE6</string>
 			<key>WindowToolIsVisible</key>
-			<integer>0</integer>
+			<false/>
 		</dict>
 		<dict>
 			<key>Identifier</key>
diff --git a/Libraries/FAAD2/FAAD2.xcode/xugg.pbxuser b/Libraries/FAAD2/FAAD2.xcode/xugg.pbxuser
index bb1d2dccb..4a6ba1c88 100644
--- a/Libraries/FAAD2/FAAD2.xcode/xugg.pbxuser
+++ b/Libraries/FAAD2/FAAD2.xcode/xugg.pbxuser
@@ -1,19 +1,21 @@
 // !$*UTF8*$!
 {
 	0867D690FE84028FC02AAC07 = {
-		activeBuildStyle = 4F0BB7ED011F40E904CA0E50;
+		activeBuildStyle = 4F0BB7EC011F40E904CA0E50;
 		activeTarget = 8D07F2BC0486CC7A007CD1D0;
 		addToTargets = (
 			8D07F2BC0486CC7A007CD1D0,
 		);
-		codeSenseManager = 8E3851F6084CEC2000D715B8;
+		breakpoints = (
+		);
+		codeSenseManager = 8EFC6C3908536C9D00C67D06;
 		perUserDictionary = {
 			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
 				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
 				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
 				PBXFileTableDataSourceColumnWidthsKey = (
 					20,
-					243,
+					577,
 					20,
 					48,
 					43,
@@ -52,17 +54,57 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 139429230;
-			PBXWorkspaceStateSaveDate = 139429230;
+			PBXPerProjectTemplateStateSaveDate = 139688536;
+			PBXWorkspaceStateSaveDate = 139688536;
 		};
-		sourceControlManager = 8E3851F5084CEC2000D715B8;
+		perUserProjectItems = {
+			8EFC6C4208536D2500C67D06 = 8EFC6C4208536D2500C67D06;
+			8EFC6C4308536D2500C67D06 = 8EFC6C4308536D2500C67D06;
+			8EFC6C7308536F3A00C67D06 = 8EFC6C7308536F3A00C67D06;
+			8EFC6C7708536F3A00C67D06 = 8EFC6C7708536F3A00C67D06;
+			8EFC6D6F08537A5300C67D06 = 8EFC6D6F08537A5300C67D06;
+			8EFC6D7008537A5300C67D06 = 8EFC6D7008537A5300C67D06;
+			8EFC6D7308537A5300C67D06 = 8EFC6D7308537A5300C67D06;
+			8EFC6D7908537A5300C67D06 = 8EFC6D7908537A5300C67D06;
+			8EFC6D8908537AB900C67D06 = 8EFC6D8908537AB900C67D06;
+		};
+		sourceControlManager = 8EFC6C3808536C9D00C67D06;
 		userBuildSettings = {
 		};
 	};
 	8D07F2BC0486CC7A007CD1D0 = {
 		activeExec = 0;
 	};
-	8E3851F5084CEC2000D715B8 = {
+	8EFC6C0008536C9D00C67D06 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {775, 5124}}";
+			sepNavSelRange = "{4791, 0}";
+			sepNavVisRect = "{{0, 1880}, {775, 374}}";
+		};
+	};
+	8EFC6C0108536C9D00C67D06 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {775, 770}}";
+			sepNavSelRange = "{1285, 0}";
+			sepNavVisRect = "{{0, 382}, {775, 374}}";
+			sepNavWindowFrame = "{{15, 72}, {1017, 669}}";
+		};
+	};
+	8EFC6C0308536C9D00C67D06 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {775, 798}}";
+			sepNavSelRange = "{1983, 0}";
+			sepNavVisRect = "{{0, 250}, {775, 548}}";
+		};
+	};
+	8EFC6C1508536C9D00C67D06 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {710, 6650}}";
+			sepNavSelRange = "{3042, 0}";
+			sepNavVisRect = "{{0, 1356}, {459, 186}}";
+		};
+	};
+	8EFC6C3808536C9D00C67D06 = {
 		fallbackIsa = XCSourceControlManager;
 		isSCMEnabled = 0;
 		isa = PBXSourceControlManager;
@@ -70,29 +112,98 @@
 		};
 		scmType = "";
 	};
-	8E3851F6084CEC2000D715B8 = {
+	8EFC6C3908536C9D00C67D06 = {
 		indexTemplatePath = "";
 		isa = PBXCodeSenseManager;
 	};
-	8E3851FC084CEC6100D715B8 = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {983, 2996}}";
-			sepNavSelRange = "{1209, 0}";
-			sepNavVisRect = "{{0, 272}, {983, 311}}";
-		};
+	8EFC6C4208536D2500C67D06 = {
+		fRef = 8EFC6C0008536C9D00C67D06;
+		isa = PBXTextBookmark;
+		name = "aacinfo.c: read_ADTS_header";
+		rLen = 0;
+		rLoc = 2624;
+		rType = 0;
+		vrLen = 254;
+		vrLoc = 9592;
 	};
-	8E385210084CEC6100D715B8 = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {983, 5964}}";
-			sepNavSelRange = "{1253, 13}";
-			sepNavVisRect = "{{0, 291}, {983, 311}}";
-		};
+	8EFC6C4308536D2500C67D06 = {
+		fRef = 8EFC6C0108536C9D00C67D06;
+		isa = PBXTextBookmark;
+		name = "aacinfo.h: 20";
+		rLen = 0;
+		rLoc = 961;
+		rType = 0;
+		vrLen = 1250;
+		vrLoc = 658;
 	};
-	8E38521D084CEC6100D715B8 = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {983, 7798}}";
-			sepNavSelRange = "{8543, 47}";
-			sepNavVisRect = "{{0, 4192}, {983, 311}}";
-		};
+	8EFC6C7308536F3A00C67D06 = {
+		fRef = 8EFC6C0308536C9D00C67D06;
+		isa = PBXTextBookmark;
+		name = "filestream.h: 57";
+		rLen = 0;
+		rLoc = 1983;
+		rType = 0;
+		vrLen = 1114;
+		vrLoc = 869;
+	};
+	8EFC6C7708536F3A00C67D06 = {
+		fRef = 8EFC6C0308536C9D00C67D06;
+		isa = PBXTextBookmark;
+		name = "filestream.h: 57";
+		rLen = 0;
+		rLoc = 1983;
+		rType = 0;
+		vrLen = 1114;
+		vrLoc = 869;
+	};
+	8EFC6D6F08537A5300C67D06 = {
+		fRef = 8EFC6C1508536C9D00C67D06;
+		isa = PBXTextBookmark;
+		name = "{";
+		rLen = 2;
+		rLoc = 3056;
+		rType = 0;
+		vrLen = 465;
+		vrLoc = 2873;
+	};
+	8EFC6D7008537A5300C67D06 = {
+		fRef = 8EFC6C0108536C9D00C67D06;
+		isa = PBXTextBookmark;
+		name = "aacinfo.h: 35";
+		rLen = 0;
+		rLoc = 1285;
+		rType = 0;
+		vrLen = 746;
+		vrLoc = 1165;
+	};
+	8EFC6D7308537A5300C67D06 = {
+		fRef = 8EFC6C1508536C9D00C67D06;
+		isa = PBXTextBookmark;
+		name = "{";
+		rLen = 2;
+		rLoc = 3056;
+		rType = 0;
+		vrLen = 465;
+		vrLoc = 2873;
+	};
+	8EFC6D7908537A5300C67D06 = {
+		fRef = 8EFC6C0008536C9D00C67D06;
+		isa = PBXTextBookmark;
+		name = "aacinfo.c: 152";
+		rLen = 0;
+		rLoc = 4787;
+		rType = 0;
+		vrLen = 822;
+		vrLoc = 4290;
+	};
+	8EFC6D8908537AB900C67D06 = {
+		fRef = 8EFC6C0008536C9D00C67D06;
+		isa = PBXTextBookmark;
+		name = "aacinfo.c: 152";
+		rLen = 0;
+		rLoc = 4791;
+		rType = 0;
+		vrLen = 826;
+		vrLoc = 4290;
 	};
 }
diff --git a/Libraries/MAC/MAC.xcode/xugg.mode1 b/Libraries/MAC/MAC.xcode/xugg.mode1
index 60b7f629f..8204b0fc8 100644
--- a/Libraries/MAC/MAC.xcode/xugg.mode1
+++ b/Libraries/MAC/MAC.xcode/xugg.mode1
@@ -218,6 +218,8 @@
 			<key>Layout</key>
 			<array>
 				<dict>
+					<key>BecomeActive</key>
+					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -263,12 +265,11 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>69</integer>
-									<integer>68</integer>
+									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 760}, {231, 566}}</string>
+							<string>{{0, 0}, {231, 566}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -315,7 +316,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>8E2BC800084F898E004518D1</string>
+										<string>8EFC6BF608536C8300C67D06</string>
 										<key>history</key>
 										<array>
 											<string>8EEBC7F2084F5C3C009FE5BE</string>
@@ -338,7 +339,7 @@
 											<string>8E2BC7F7084F898E004518D1</string>
 											<string>8E2BC7F8084F898E004518D1</string>
 											<string>8E2BC7F9084F898E004518D1</string>
-											<string>8E65785D084F5EDB00F28C07</string>
+											<string>8E2BC800084F898E004518D1</string>
 										</array>
 										<key>prevStack</key>
 										<array>
@@ -363,9 +364,6 @@
 											<string>8E2BC7FA084F898E004518D1</string>
 											<string>8E2BC7FB084F898E004518D1</string>
 											<string>8E2BC7FC084F898E004518D1</string>
-											<string>8E2BC7FD084F898E004518D1</string>
-											<string>8E2BC7FE084F898E004518D1</string>
-											<string>8E2BC7FF084F898E004518D1</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -387,8 +385,6 @@
 							<string>109pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -425,9 +421,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>8E2BC801084F898E004518D1</string>
+				<string>8EFC6BF708536C8300C67D06</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>8E2BC802084F898E004518D1</string>
+				<string>8EFC6BF808536C8300C67D06</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
diff --git a/Libraries/MAC/MAC.xcode/xugg.pbxuser b/Libraries/MAC/MAC.xcode/xugg.pbxuser
index e262d62b4..210eedad2 100644
--- a/Libraries/MAC/MAC.xcode/xugg.pbxuser
+++ b/Libraries/MAC/MAC.xcode/xugg.pbxuser
@@ -80,8 +80,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 139430228;
-			PBXWorkspaceStateSaveDate = 139430228;
+			PBXPerProjectTemplateStateSaveDate = 139684956;
+			PBXWorkspaceStateSaveDate = 139684956;
 		};
 		perUserProjectItems = {
 			8E2BC7F4084F898E004518D1 = 8E2BC7F4084F898E004518D1;
@@ -93,11 +93,7 @@
 			8E2BC7FA084F898E004518D1 = 8E2BC7FA084F898E004518D1;
 			8E2BC7FB084F898E004518D1 = 8E2BC7FB084F898E004518D1;
 			8E2BC7FC084F898E004518D1 = 8E2BC7FC084F898E004518D1;
-			8E2BC7FD084F898E004518D1 = 8E2BC7FD084F898E004518D1;
-			8E2BC7FE084F898E004518D1 = 8E2BC7FE084F898E004518D1;
-			8E2BC7FF084F898E004518D1 = 8E2BC7FF084F898E004518D1;
 			8E2BC800084F898E004518D1 = 8E2BC800084F898E004518D1;
-			8E65785D084F5EDB00F28C07 = 8E65785D084F5EDB00F28C07;
 			8E65785E084F5EDB00F28C07 = 8E65785E084F5EDB00F28C07;
 			8E65785F084F5EDB00F28C07 = 8E65785F084F5EDB00F28C07;
 			8E657860084F5EDB00F28C07 = 8E657860084F5EDB00F28C07;
@@ -130,6 +126,7 @@
 			8EEBC7FE084F5C3C009FE5BE = 8EEBC7FE084F5C3C009FE5BE;
 			8EEBC7FF084F5C3C009FE5BE = 8EEBC7FF084F5C3C009FE5BE;
 			8EEBC800084F5C3C009FE5BE = 8EEBC800084F5C3C009FE5BE;
+			8EFC6BF608536C8300C67D06 = 8EFC6BF608536C8300C67D06;
 		};
 		sourceControlManager = 8E4DD23C082DCA1B004B6830;
 		userBuildSettings = {
@@ -228,36 +225,6 @@
 		vrLen = 195;
 		vrLoc = 0;
 	};
-	8E2BC7FD084F898E004518D1 = {
-		fRef = 8EEBC75D084F5AF9009FE5BE;
-		isa = PBXTextBookmark;
-		name = "m_spIO.Assign(new IO_CLASS_NAME);";
-		rLen = 39;
-		rLoc = 783;
-		rType = 0;
-		vrLen = 162;
-		vrLoc = 709;
-	};
-	8E2BC7FE084F898E004518D1 = {
-		fRef = 8EEBC797084F5B65009FE5BE;
-		isa = PBXTextBookmark;
-		name = "APEInfo.h: 79";
-		rLen = 0;
-		rLoc = 4830;
-		rType = 0;
-		vrLen = 86;
-		vrLoc = 1090;
-	};
-	8E2BC7FF084F898E004518D1 = {
-		fRef = 8EEBC787084F5B30009FE5BE;
-		isa = PBXTextBookmark;
-		name = "APETag.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 152;
-		vrLoc = 0;
-	};
 	8E2BC800084F898E004518D1 = {
 		fRef = 8EEBC788084F5B30009FE5BE;
 		isa = PBXTextBookmark;
@@ -280,16 +247,6 @@
 		indexTemplatePath = "";
 		isa = PBXCodeSenseManager;
 	};
-	8E65785D084F5EDB00F28C07 = {
-		fRef = 8EEBC788084F5B30009FE5BE;
-		isa = PBXTextBookmark;
-		name = "virtual int Open(const wchar_t * pName) = 0;";
-		rLen = 50;
-		rLoc = 351;
-		rType = 0;
-		vrLen = 669;
-		vrLoc = 0;
-	};
 	8E65785E084F5EDB00F28C07 = {
 		fRef = 8EEBC7C5084F5BB3009FE5BE;
 		isa = PBXTextBookmark;
@@ -611,7 +568,7 @@
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {730, 700}}";
 			sepNavSelRange = "{351, 50}";
-			sepNavVisRect = "{{0, 371}, {730, 77}}";
+			sepNavVisRect = "{{0, 364}, {730, 77}}";
 		};
 	};
 	8EEBC78B084F5B30009FE5BE = {
@@ -771,4 +728,14 @@
 		vrLen = 648;
 		vrLoc = 0;
 	};
+	8EFC6BF608536C8300C67D06 = {
+		fRef = 8EEBC788084F5B30009FE5BE;
+		isa = PBXTextBookmark;
+		name = "virtual int Open(const wchar_t * pName) = 0;";
+		rLen = 50;
+		rLoc = 351;
+		rType = 0;
+		vrLen = 268;
+		vrLoc = 401;
+	};
 }
diff --git a/PLANNED b/PLANNED
index e58af686b..49944d6d7 100644
--- a/PLANNED
+++ b/PLANNED
@@ -1,10 +1,14 @@
+0.0.2
+mpeg4 support (FAAD)
+shorten support
+hotkeys for next/prev/stop/shuffle/repeat & info window
+
+0.0.3
+Stream support for shoutcast/oggcast, or just opening files via URL.
+
+0.0.4+
 A queue system, in which a user can option+click a song, and it will be placed
   in a queue, whcih will pick the next song.
-Stream support for shoutcast/oggcast, or just opening via URL.
 Audioscrobbler.
-Improved tag reading.
-mpeg4 support (FAAD)
 look into realplayer (cook in mplayer) and wma
-find better ape decoder
 visualizer? (libvisualizer perhaps?)
-hotkeys for next/prev/stop/shuffle/repeat & info window
diff --git a/Sound.m b/Sound.m
index 8073c2d17..d1e3bca59 100644
--- a/Sound.m
+++ b/Sound.m
@@ -306,15 +306,30 @@ static OSStatus Sound_Renderer(void *inRefCon,  AudioUnitRenderActionFlags *ioAc
 		NSArray* components = [portMessage components];
 		NSData *data = [components objectAtIndex:0];
 		double time;
+		double newTime;
 		unsigned long pos;
+		
 		time = (*(double *)[data bytes]);
 		pos = [self calculatePos:time];
 		
-		[soundFile seekToTime:time];
-		[self resetBuffer];
-		[readLock lock];
-		currentPosition = pos;
-		[readLock unlock];
+		newTime = [soundFile seekToTime:time];
+		if (newTime >= 0)
+		{
+			[self resetBuffer];
+			
+			pos = [self calculatePos:newTime];
+
+			[readLock lock];
+			currentPosition = pos;
+			[readLock unlock];
+		}
+		else
+		{
+			newTime = [self calculateTime:currentPosition];
+		}
+		//send a message with newTime
+		DBLog(@"RESETING TIME TO: %f", newTime);
+		[self sendPortMessage:kCogPositionUpdateMessage withData:&newTime ofSize:(sizeof(double))];
 	}
 	else if (msgid == kCogEndOfPlaylistMessage)
 	{
diff --git a/SoundFile/AACFile.h b/SoundFile/AACFile.h
index 8d52810ab..3cb1d2ea3 100644
--- a/SoundFile/AACFile.h
+++ b/SoundFile/AACFile.h
@@ -20,6 +20,9 @@
 	NeAACDecHandle hAac;
 	NeAACDecFrameInfo hInfo;
 
+	unsigned long *seekTable;
+	int seekTableLength;
+	
 	char buffer[SAMPLE_BUFFER_SIZE];
 	int bufferAmount;
 	
diff --git a/SoundFile/AACFile.m b/SoundFile/AACFile.m
index aa0b95985..0e788ef9e 100644
--- a/SoundFile/AACFile.m
+++ b/SoundFile/AACFile.m
@@ -7,38 +7,41 @@
 //
 
 #import "AACFile.h"
-
+#import <FAAD2/aacinfo.h>
 
 @implementation AACFile
 
 - (BOOL)open:(const char *)filename
 {
-	unsigned long cap = NeAACDecGetCapabilities();
+	faadAACInfo info;
+	//	unsigned long cap = NeAACDecGetCapabilities();
 	//Check if decoder has the needed capabilities
 	
+	inFd = fopen(filename, "r");
+	if (!inFd)
+		return NO;
+	
 	//Open the library
 	hAac = NeAACDecOpen();
 	
 	//Get the current config
 	NeAACDecConfigurationPtr conf = NeAACDecGetCurrentConfiguration(hAac);
 	
-//	conf->useOldADTSFormat = 1;
-	DBLog(@"CONFIG: %i", conf->useOldADTSFormat);
-	//if needed, change some of the values in conf
 	conf->outputFormat = FAAD_FMT_32BIT;
-//	conf->downMatrix = 1;
-//	channels = 1;
 	bitsPerSample = 32;
-
+	
 	//set the new configuration
 	NeAACDecSetConfiguration(hAac, conf);
 	
-	inFd = fopen(filename, "r");
-	if (!inFd)
-		return NO;
+	get_AAC_format(inFd, &info, &seekTable, &seekTableLength, 1);
+	DBLog(@"INFO TIME");
+	DBLog(@"---------");
+	DBLog(@"%i %i %i %i %i", info.bitrate, info.channels, info.length, info.sampling_rate, info.version);
+	DBLog(@"");
+	fseek(inFd, 0, SEEK_SET);
 	
 	inputAmount = fread(inputBuffer, 1, INPUT_BUFFER_SIZE, inFd);
-
+	
 	unsigned long samplerate;
 	unsigned char c;
 	//Initialize the library using one of the initalization functions
@@ -49,18 +52,25 @@
 		DBLog(@"AAC ERRROR");
 		return NO;
 	}
-	
 	inputAmount -= err;
 	memmove(inputBuffer, &inputBuffer[err], inputAmount);
-
+	
 	frequency = (int)samplerate;
 	channels = c;
-
+	
+	bitRate = (int)((float)info.bitrate/1000.0);
+	totalSize = (long int)(info.length*(double)frequency/1000.0*channels*bitsPerSample/8);
+	
 	isBigEndian = YES;
 	
 	return YES;
 }
 
+- (BOOL)readInfo:(const char *)filename
+{
+	return [self open:filename]; //they both would do the same damn thing
+}
+
 - (int)fillBuffer:(void *)buf ofSize:(UInt32)size
 {
 	int numread = bufferAmount;
@@ -132,8 +142,34 @@
 	return count + numread;
 }
 
+- (double)seekToTime:(double)milliseconds
+{
+	int second;
+	int i;
+	unsigned long pos;
+	unsigned long length;
+	
+	if (seekTableLength <= 1)
+		return -1;
+	
+	length = (unsigned long)(totalSize /(frequency * channels*(bitsPerSample/8)));
+
+	second = (int)(milliseconds/1000.0);
+	i = (int)(((float)second/length)*seekTableLength);
+	DBLog(@"SEEKING TO: %i %i", seekTable, seekTableLength);
+	pos = seekTable[i];
+	
+	fseek(inFd, pos, SEEK_SET);
+	inputAmount = 0;
+	NeAACDecPostSeekReset(hAac, -1);
+
+	return second*1000.0;
+}
+
 - (void)close
 {
+	NeAACDecClose(hAac);
+	fclose(inFd);
 }
 
 @end
diff --git a/SoundFile/FlacFile.m b/SoundFile/FlacFile.m
index 4fb8606ec..b5fe2e119 100644
--- a/SoundFile/FlacFile.m
+++ b/SoundFile/FlacFile.m
@@ -159,9 +159,11 @@ void ErrorProc(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus
 	
 }
 
-- (void)seekToTime:(double)milliseconds
+- (double)seekToTime:(double)milliseconds
 {
 	FLAC__file_decoder_seek_absolute(decoder, frequency * ((double)milliseconds/1000.0));
+	
+	return milliseconds;
 }
 
 //bs methods
diff --git a/SoundFile/MPEGFile.m b/SoundFile/MPEGFile.m
index 05e2f4d91..a7bd0734f 100644
--- a/SoundFile/MPEGFile.m
+++ b/SoundFile/MPEGFile.m
@@ -99,9 +99,11 @@
 	decoder = NULL;
 }
 
-- (void)seekToTime:(double)milliseconds
+- (double)seekToTime:(double)milliseconds
 {
 	DecMPA_SeekToTime(decoder, (unsigned long)milliseconds);
+	
+	return milliseconds;
 }
 
 @end
diff --git a/SoundFile/MonkeysFile.m b/SoundFile/MonkeysFile.m
index 110d11252..491236da6 100644
--- a/SoundFile/MonkeysFile.m
+++ b/SoundFile/MonkeysFile.m
@@ -76,11 +76,13 @@
 	decompress = NULL;
 }
 
-- (void)seekToTime:(double)milliseconds
+- (double)seekToTime:(double)milliseconds
 {
 	int r;
 //	DBLog(@"HELLO: %i", int(frequency*((double)milliseconds/1000.0)));
 	r = decompress->Seek(int(frequency*((double)milliseconds/1000.0)));
+	
+	return milliseconds;
 }
 
 @end
diff --git a/SoundFile/MusepackFile.m b/SoundFile/MusepackFile.m
index 438fc0d8e..08653c9b8 100644
--- a/SoundFile/MusepackFile.m
+++ b/SoundFile/MusepackFile.m
@@ -184,7 +184,7 @@ BOOL CanSeekProc(void *data)
 	fclose(inFd);
 }
 
-- (void)seekToTime:(double)milliseconds
+- (double)seekToTime:(double)milliseconds
 {
 	BOOL r;
 //	double n = milliseconds;
@@ -193,6 +193,8 @@ BOOL CanSeekProc(void *data)
 	
 	r = mpc_decoder_seek_sample(&decoder, frequency*((double)milliseconds/1000.0));
 //	DBLog(@"SEEK RESULT: %i", r);
+	
+	return milliseconds;
 }
 
 //accessors
diff --git a/SoundFile/SoundFile.h b/SoundFile/SoundFile.h
index a4c0a5454..8d9c34cf0 100644
--- a/SoundFile/SoundFile.h
+++ b/SoundFile/SoundFile.h
@@ -44,8 +44,8 @@
 
 - (UInt32)fillBuffer:(void *)buf ofSize:(UInt32)size;
 
-- (void)seek:(unsigned long)position;
-- (void)seekToTime:(double)milliseconds;
+//- (BOOL)seek:(unsigned long)position;
+- (double)seekToTime:(double)milliseconds;
 - (void)close;
 - (void)reset; //START AGAIN
 
diff --git a/SoundFile/SoundFile.m b/SoundFile/SoundFile.m
index 83e9e2edd..1a20f4340 100644
--- a/SoundFile/SoundFile.m
+++ b/SoundFile/SoundFile.m
@@ -11,7 +11,7 @@
 
 @implementation SoundFile
 
-- (void)seek:(unsigned long)position
+/*- (void)seek:(unsigned long)position
 {
 	unsigned long time;
 	unsigned long frame;
@@ -21,9 +21,10 @@
 
 	currentPosition = position;
 	
-	[self seekToTime:time];
+	time = [self seekToTime:time];
+	position = time * (frequency/1000.0)*chanels*(bitsPerSample/8)
 }
-
+*/
 - (double)length
 {
 	return (totalSize/channels/(bitsPerSample/8)/(frequency/1000.0));
@@ -119,7 +120,7 @@
 
 - (void)reset
 {
-	[self seek:0];
+	[self seekToTime:0.0];
 }
 
 - (void)getFormat:(AudioStreamBasicDescription *)sourceStreamFormat
diff --git a/SoundFile/VorbisFile.m b/SoundFile/VorbisFile.m
index f77fa74e8..6454aa909 100644
--- a/SoundFile/VorbisFile.m
+++ b/SoundFile/VorbisFile.m
@@ -71,6 +71,8 @@
 - (void)seekToTime:(double)milliseconds
 {
 	ov_time_seek(&vorbisRef, (double)milliseconds/1000.0);
+	
+	return milliseconds;
 }
 
 
diff --git a/SoundFile/WaveFile.m b/SoundFile/WaveFile.m
index f21f892c8..aaa9134ab 100644
--- a/SoundFile/WaveFile.m
+++ b/SoundFile/WaveFile.m
@@ -113,9 +113,11 @@
 	sndFile = NULL;
 }
 
-- (void)seekToTime:(double)milliseconds
+- (double)seekToTime:(double)milliseconds
 {
 	sf_seek(sndFile, frequency*((double)milliseconds/1000.0), SEEK_SET);
+	
+	return milliseconds;
 }
 
 @end