From 013332edb1596feec73da271b1f40c2e80d3c012 Mon Sep 17 00:00:00 2001
From: vspader <unknown>
Date: Sun, 5 Jun 2005 18:52:35 +0000
Subject: [PATCH] Added AAC seeking. Basic AAC support is finished.

---
 AppController.h                             |   11 +
 AppController.m                             |   11 +
 Cog.xcode/project.pbxproj                   |    7 -
 Cog.xcode/xugg.mode1                        |  178 +-
 Cog.xcode/xugg.pbxuser                      | 2091 ++++++++++++++++---
 English.lproj/MainMenu.nib/classes.nib      |    9 +
 English.lproj/MainMenu.nib/info.nib         |    2 +-
 English.lproj/MainMenu.nib/keyedobjects.nib |  Bin 39818 -> 40568 bytes
 Feedback/FeedbackController.m               |   10 +-
 Feedback/FeedbackSocket.m                   |    2 +-
 Libraries/FAAD2/FAAD2.xcode/project.pbxproj |  237 ++-
 Libraries/FAAD2/FAAD2.xcode/xugg.mode1      |  159 +-
 Libraries/FAAD2/FAAD2.xcode/xugg.pbxuser    |  163 +-
 Libraries/MAC/MAC.xcode/xugg.mode1          |   20 +-
 Libraries/MAC/MAC.xcode/xugg.pbxuser        |   61 +-
 PLANNED                                     |   14 +-
 Sound.m                                     |   25 +-
 SoundFile/AACFile.h                         |    3 +
 SoundFile/AACFile.m                         |   66 +-
 SoundFile/FlacFile.m                        |    4 +-
 SoundFile/MPEGFile.m                        |    4 +-
 SoundFile/MonkeysFile.m                     |    4 +-
 SoundFile/MusepackFile.m                    |    4 +-
 SoundFile/SoundFile.h                       |    4 +-
 SoundFile/SoundFile.m                       |    9 +-
 SoundFile/VorbisFile.m                      |    2 +
 SoundFile/WaveFile.m                        |    4 +-
 27 files changed, 2578 insertions(+), 526 deletions(-)

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 108d281660500b6fe651123cbe887f38c98ef36c..e456168ac2708e855634d20884236359327c1a38 100644
GIT binary patch
delta 24253
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

delta 23313
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

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