diff --git a/Cog.xcode/xugg.mode1 b/Cog.xcode/xugg.mode1 index e18018171..2b8c469d3 100644 --- a/Cog.xcode/xugg.mode1 +++ b/Cog.xcode/xugg.mode1 @@ -254,19 +254,14 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey 29B97314FDCFA39411CA2CEA - 080E96DDFE201D6D7F000001 - 8EF6FA64082DA525006F7BE6 1C37FBAC04509CD000000102 - 8EFC6D17085376D100C67D06 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey 7 - 5 - 1 - 0 + 6 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey @@ -307,7 +302,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - AACFile.m + PlaylistController.m PBXSplitModuleInNavigatorKey Split0 @@ -315,11 +310,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - AACFile.m + PlaylistController.m _historyCapacity 0 bookmark - 8EFC6E1B085380B800C67D06 + 8EA0943E0854080700EBC193 history 8EF6FACD082DAA2B006F7BE6 @@ -362,12 +357,9 @@ 8E72BC630851408F00E34F1D 8E72BC640851408F00E34F1D 8E72BC650851408F00E34F1D - 8EFC6CC00853721700C67D06 8EFC6D18085376D100C67D06 - 8EFC6D1A085376D100C67D06 8EFC6DE7085380B800C67D06 8EFC6DE8085380B800C67D06 - 8EFC6DE9085380B800C67D06 8EFC6DEA085380B800C67D06 8EFC6DEB085380B800C67D06 8EFC6DEC085380B800C67D06 @@ -379,7 +371,10 @@ 8EFC6DF2085380B800C67D06 8EFC6DF3085380B800C67D06 8EFC6DF4085380B800C67D06 - 8EFC6DF5085380B800C67D06 + 8EFC6E29085386CE00C67D06 + 8EFC6E2A085386CE00C67D06 + 8EA094320853FC4600EBC193 + 8EA0942E0853FC4200EBC193 prevStack @@ -441,78 +436,7 @@ 8E14E4B5084D089100246BCC 8EC18EBD084E57D500AE0BA9 8EC156F9084FEB8900BB24E8 - 8EFC6CC30853721700C67D06 - 8EFC6CC40853721700C67D06 - 8EFC6CC50853721700C67D06 - 8EFC6CD5085372A800C67D06 - 8EFC6CD6085372A800C67D06 - 8EFC6D21085376D100C67D06 - 8EFC6D22085376D100C67D06 - 8EFC6D23085376D100C67D06 - 8EFC6D24085376D100C67D06 - 8EFC6D25085376D100C67D06 - 8EFC6D26085376D100C67D06 - 8EFC6D27085376D100C67D06 - 8EFC6D28085376D100C67D06 - 8EFC6D29085376D100C67D06 - 8EFC6D2A085376D100C67D06 - 8EFC6D2B085376D100C67D06 - 8EFC6D2C085376D100C67D06 - 8EFC6D2D085376D100C67D06 - 8EFC6D2E085376D100C67D06 - 8EFC6D2F085376D100C67D06 - 8EFC6D30085376D100C67D06 - 8EFC6D31085376D100C67D06 - 8EFC6D32085376D100C67D06 - 8EFC6D33085376D100C67D06 - 8EFC6D34085376D100C67D06 - 8EFC6D35085376D100C67D06 - 8EFC6D36085376D100C67D06 - 8EFC6D37085376D100C67D06 - 8EFC6D38085376D100C67D06 - 8EFC6D39085376D100C67D06 - 8EFC6D3A085376D100C67D06 - 8EFC6D3B085376D100C67D06 - 8EFC6D3C085376D100C67D06 - 8EFC6D3D085376D100C67D06 - 8EFC6D3E085376D100C67D06 - 8EFC6DF6085380B800C67D06 - 8EFC6DF7085380B800C67D06 - 8EFC6DF8085380B800C67D06 - 8EFC6DF9085380B800C67D06 - 8EFC6DFA085380B800C67D06 - 8EFC6DFB085380B800C67D06 - 8EFC6DFC085380B800C67D06 - 8EFC6DFD085380B800C67D06 - 8EFC6DFE085380B800C67D06 - 8EFC6DFF085380B800C67D06 - 8EFC6E00085380B800C67D06 - 8EFC6E01085380B800C67D06 - 8EFC6E02085380B800C67D06 - 8EFC6E03085380B800C67D06 - 8EFC6E04085380B800C67D06 - 8EFC6E05085380B800C67D06 - 8EFC6E06085380B800C67D06 - 8EFC6E07085380B800C67D06 - 8EFC6E08085380B800C67D06 - 8EFC6E09085380B800C67D06 - 8EFC6E0A085380B800C67D06 - 8EFC6E0B085380B800C67D06 - 8EFC6E0C085380B800C67D06 - 8EFC6E0D085380B800C67D06 - 8EFC6E0E085380B800C67D06 - 8EFC6E0F085380B800C67D06 - 8EFC6E10085380B800C67D06 - 8EFC6E11085380B800C67D06 - 8EFC6E12085380B800C67D06 - 8EFC6E13085380B800C67D06 - 8EFC6E14085380B800C67D06 - 8EFC6E15085380B800C67D06 - 8EFC6E16085380B800C67D06 - 8EFC6E17085380B800C67D06 - 8EFC6E18085380B800C67D06 - 8EFC6E19085380B800C67D06 - 8EFC6E1A085380B800C67D06 + 8EA094330853FC4600EBC193 SplitCount @@ -570,9 +494,9 @@ TableOfContents - 8EFC6CC70853721700C67D06 + 8EA094280853F7B900EBC193 1CE0B1FE06471DED0097A5F4 - 8EFC6CC80853721700C67D06 + 8EA094290853F7B900EBC193 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -707,7 +631,7 @@ WindowOrderList 1C0AD2B3069F1EA900FABCE6 - 8EF6FAA6082DA951006F7BE6 + 1C530D57069F1CE1000CFCEE /Users/xugg/Projects/Cog/Cog.xcode WindowString @@ -939,7 +863,7 @@ PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - Sound.m + PlaylistController.m StatusBarVisibility @@ -995,8 +919,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 8E50FC75084E14FC0048349E - 8E50FC76084E14FC0048349E + 8EA094300853FC4200EBC193 + 8EA094310853FC4200EBC193 1CDD528C0622207200134675 1CD0528E0623707200166675 @@ -1104,8 +1028,8 @@ yes sizes - {{0, 0}, {367, 168}} - {{0, 173}, {367, 270}} + {{0, 0}, {491, 168}} + {{0, 173}, {491, 270}} VerticalSplitView @@ -1154,9 +1078,9 @@ TableOfContents 1C0AD2B3069F1EA900FABCE6 - 8EFC6CFB0853745400C67D06 + 8EA094380853FDEB00EBC193 1CD0528B0623707200166675 - 8EFC6CFC0853745400C67D06 + 8EA094390853FDEB00EBC193 ToolbarConfiguration xcode.toolbar.config.run diff --git a/Cog.xcode/xugg.pbxuser b/Cog.xcode/xugg.pbxuser index 4b54596b1..2ec331a76 100644 --- a/Cog.xcode/xugg.pbxuser +++ b/Cog.xcode/xugg.pbxuser @@ -9,7 +9,7 @@ }; }; 29B97313FDCFA39411CA2CEA = { - activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA; + activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA; activeExecutable = 8EB77455082DA3EB005891CA; activeTarget = 8D1107260486CEB800E47090; addToTargets = ( @@ -25,6 +25,20 @@ 8EB77455082DA3EB005891CA, ); perUserDictionary = { + PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID; + PBXFileTableDataSourceColumnWidthsKey = ( + 22, + 300, + 400, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXExecutablesDataSource_ActiveFlagID, + PBXExecutablesDataSource_NameID, + PBXExecutablesDataSource_CommentsID, + ); + }; PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Target_ColumnID; @@ -81,8 +95,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 139686401; - PBXWorkspaceStateSaveDate = 139686401; + PBXPerProjectTemplateStateSaveDate = 139720622; + PBXWorkspaceStateSaveDate = 139720622; }; perUserProjectItems = { 8E0EBF58084BAA56003A6E64 = 8E0EBF58084BAA56003A6E64; @@ -91,16 +105,11 @@ 8E10DC02084BBE490013815C = 8E10DC02084BBE490013815C; 8E10DC08084BBE490013815C = 8E10DC08084BBE490013815C; 8E14E4A5084D089100246BCC = 8E14E4A5084D089100246BCC; - 8E14E4A6084D089100246BCC = 8E14E4A6084D089100246BCC; - 8E14E4A7084D089100246BCC = 8E14E4A7084D089100246BCC; - 8E14E4AD084D089100246BCC = 8E14E4AD084D089100246BCC; - 8E14E4B0084D089100246BCC = 8E14E4B0084D089100246BCC; 8E14E4B3084D089100246BCC = 8E14E4B3084D089100246BCC; 8E14E4B4084D089100246BCC = 8E14E4B4084D089100246BCC; 8E14E4B5084D089100246BCC = 8E14E4B5084D089100246BCC; 8E1A1826083806B700AEA302 = 8E1A1826083806B700AEA302; 8E1A182C083806B700AEA302 = 8E1A182C083806B700AEA302; - 8E1BDA7908430E7700A08868 = 8E1BDA7908430E7700A08868; 8E25B5E5083CDD4A0064353E = 8E25B5E5083CDD4A0064353E; 8E267D8C0837F963004ACBC5 = 8E267D8C0837F963004ACBC5; 8E267D8D0837F963004ACBC5 = 8E267D8D0837F963004ACBC5; @@ -146,34 +155,24 @@ 8E72BC630851408F00E34F1D = 8E72BC630851408F00E34F1D; 8E72BC640851408F00E34F1D = 8E72BC640851408F00E34F1D; 8E72BC650851408F00E34F1D = 8E72BC650851408F00E34F1D; - 8E72BC690851408F00E34F1D = 8E72BC690851408F00E34F1D; - 8E74C915084D451C00DF47F3 = 8E74C915084D451C00DF47F3; 8E74C916084D451C00DF47F3 = 8E74C916084D451C00DF47F3; - 8E74C919084D451C00DF47F3 = 8E74C919084D451C00DF47F3; 8E94D9D2084BEA32007F0AEB = 8E94D9D2084BEA32007F0AEB; 8E94D9D3084BEA32007F0AEB = 8E94D9D3084BEA32007F0AEB; - 8E94DA67084BF01F007F0AEB = 8E94DA67084BF01F007F0AEB; - 8E94DA68084BF01F007F0AEB = 8E94DA68084BF01F007F0AEB; 8E9BF08B082FB9DD00B26943 = 8E9BF08B082FB9DD00B26943; 8E9BF100082FEF6B00B26943 = 8E9BF100082FEF6B00B26943; - 8E9E2E7F084FA7E400599965 = 8E9E2E7F084FA7E400599965; - 8E9E2E80084FA7E400599965 = 8E9E2E80084FA7E400599965; 8E9E2E81084FA7E400599965 = 8E9E2E81084FA7E400599965; + 8EA0942E0853FC4200EBC193 = 8EA0942E0853FC4200EBC193; + 8EA094320853FC4600EBC193 = 8EA094320853FC4600EBC193; + 8EA094330853FC4600EBC193 = 8EA094330853FC4600EBC193; + 8EA0943E0854080700EBC193 = 8EA0943E0854080700EBC193; 8EA0A215084CC43F008DFEC9 = 8EA0A215084CC43F008DFEC9; 8EA0A216084CC43F008DFEC9 = 8EA0A216084CC43F008DFEC9; - 8EA0A218084CC43F008DFEC9 = 8EA0A218084CC43F008DFEC9; 8EA0A21A084CC43F008DFEC9 = 8EA0A21A084CC43F008DFEC9; - 8EBA6E040852AAA900CC7940 = 8EBA6E040852AAA900CC7940; 8EC156F4084FEB8900BB24E8 = 8EC156F4084FEB8900BB24E8; 8EC156F5084FEB8900BB24E8 = 8EC156F5084FEB8900BB24E8; 8EC156F9084FEB8900BB24E8 = 8EC156F9084FEB8900BB24E8; - 8EC18D9D084E3D8200AE0BA9 = 8EC18D9D084E3D8200AE0BA9; 8EC18D9F084E3D8200AE0BA9 = 8EC18D9F084E3D8200AE0BA9; - 8EC18DDB084E403100AE0BA9 = 8EC18DDB084E403100AE0BA9; - 8EC18EB8084E57D500AE0BA9 = 8EC18EB8084E57D500AE0BA9; 8EC18EBD084E57D500AE0BA9 = 8EC18EBD084E57D500AE0BA9; - 8EC7DA89084E672F00A079A7 = 8EC7DA89084E672F00A079A7; - 8EC7DA8A084E672F00A079A7 = 8EC7DA8A084E672F00A079A7; 8EC8FBD20842932A00DF2C98 = 8EC8FBD20842932A00DF2C98; 8ED833CD08457E6B0033CDBD = 8ED833CD08457E6B0033CDBD; 8EDC88A90842F8DE007D1532 = 8EDC88A90842F8DE007D1532; @@ -202,104 +201,9 @@ 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; @@ -311,45 +215,8 @@ 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; + 8EFC6E29085386CE00C67D06 = 8EFC6E29085386CE00C67D06; + 8EFC6E2A085386CE00C67D06 = 8EFC6E2A085386CE00C67D06; }; sourceControlManager = 8EB77466082DA402005891CA; userBuildSettings = { @@ -451,15 +318,15 @@ 8E14E479084CF1A200246BCC = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 476}}"; - sepNavSelRange = "{554, 0}"; - sepNavVisRect = "{{0, 90}, {775, 372}}"; + sepNavSelRange = "{206, 0}"; + sepNavVisRect = "{{0, 84}, {775, 372}}"; }; }; 8E14E47A084CF1A200246BCC = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 2436}}"; - sepNavSelRange = "{3595, 0}"; - sepNavVisRect = "{{0, 2050}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 2464}}"; + sepNavSelRange = "{3860, 0}"; + sepNavVisRect = "{{0, 2047}, {775, 372}}"; }; }; 8E14E4A5084D089100246BCC = { @@ -472,46 +339,6 @@ vrLen = 1096; vrLoc = 227; }; - 8E14E4A6084D089100246BCC = { - fRef = 8EF6FA68082DA526006F7BE6; - isa = PBXTextBookmark; - name = "MonkeysFile.m: 20"; - rLen = 0; - rLoc = 343; - rType = 0; - vrLen = 500; - vrLoc = 1226; - }; - 8E14E4A7084D089100246BCC = { - fRef = 8EF6FA6A082DA526006F7BE6; - isa = PBXTextBookmark; - name = "MPEGFile.m: 41"; - rLen = 0; - rLoc = 893; - rType = 0; - vrLen = 803; - vrLoc = 464; - }; - 8E14E4AD084D089100246BCC = { - fRef = 8EF6FA69082DA526006F7BE6; - isa = PBXTextBookmark; - name = "MPEGFile.h: 14"; - rLen = 0; - rLoc = 245; - rType = 0; - vrLen = 272; - vrLoc = 0; - }; - 8E14E4B0084D089100246BCC = { - fRef = 8EF6FA6D082DA526006F7BE6; - isa = PBXTextBookmark; - name = "SoundFile.h: channels"; - rLen = 0; - rLoc = 358; - rType = 0; - vrLen = 495; - vrLoc = 0; - }; 8E14E4B3084D089100246BCC = { fRef = 8E3851EC084CEC0200D715B8; isa = PBXTextBookmark; @@ -578,16 +405,6 @@ refType = 0; sourceTree = ""; }; - 8E1BDA7908430E7700A08868 = { - fRef = 8EF6FA70082DA526006F7BE6; - isa = PBXTextBookmark; - name = "VorbisFile.m: 31"; - rLen = 0; - rLoc = 470; - rType = 0; - vrLen = 475; - vrLoc = 230; - }; 8E25B5E5083CDD4A0064353E = { fRef = 8E47218508318D7A001F89FA; isa = PBXTextBookmark; @@ -901,9 +718,9 @@ }; 8E47218808318D7A001F89FA = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {818, 6958}}"; - sepNavSelRange = "{272, 0}"; - sepNavVisRect = "{{0, 3332}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {818, 7154}}"; + sepNavSelRange = "{5312, 0}"; + sepNavVisRect = "{{0, 3193}, {775, 372}}"; }; }; 8E47218908318D7A001F89FA = { @@ -1248,26 +1065,6 @@ 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; - isa = PBXTextBookmark; - name = "FlacFile.m: 48"; - rLen = 0; - rLoc = 1625; - rType = 0; - vrLen = 947; - vrLoc = 1156; - }; 8E74C916084D451C00DF47F3 = { fRef = 8EF6FA67082DA526006F7BE6; isa = PBXTextBookmark; @@ -1278,16 +1075,6 @@ vrLen = 308; vrLoc = 0; }; - 8E74C919084D451C00DF47F3 = { - fRef = 8EF6FA6E082DA526006F7BE6; - isa = PBXTextBookmark; - name = "SoundFile.m: 83"; - rLen = 0; - rLoc = 1751; - rType = 0; - vrLen = 591; - vrLoc = 1140; - }; 8E94D9D2084BEA32007F0AEB = { fRef = 8E0EBF0D084BA776003A6E64; isa = PBXTextBookmark; @@ -1308,26 +1095,6 @@ vrLen = 273; vrLoc = 0; }; - 8E94DA67084BF01F007F0AEB = { - fRef = 8EF6FA71082DA526006F7BE6; - isa = PBXTextBookmark; - name = "WaveFile.h: readInfo"; - rLen = 0; - rLoc = 302; - rType = 0; - vrLen = 309; - vrLoc = 0; - }; - 8E94DA68084BF01F007F0AEB = { - fRef = 8EF6FA72082DA526006F7BE6; - isa = PBXTextBookmark; - name = "WaveFile.m: readInfo"; - rLen = 0; - rLoc = 1534; - rType = 0; - vrLen = 460; - vrLoc = 1194; - }; 8E9BF08B082FB9DD00B26943 = { fRef = 8E9BF08C082FB9DD00B26943; isa = PBXTextBookmark; @@ -1356,26 +1123,6 @@ vrLen = 661; vrLoc = 2015; }; - 8E9E2E7F084FA7E400599965 = { - fRef = 8EF6FA65082DA526006F7BE6; - isa = PBXTextBookmark; - name = "FlacFile.h: SAMPLE_BUFFER_SIZE"; - rLen = 0; - rLoc = 342; - rType = 0; - vrLen = 617; - vrLoc = 0; - }; - 8E9E2E80084FA7E400599965 = { - fRef = 8E14E47A084CF1A200246BCC; - isa = PBXTextBookmark; - name = "AACFile.m: 13"; - rLen = 0; - rLoc = 207; - rType = 0; - vrLen = 637; - vrLoc = 17; - }; 8E9E2E81084FA7E400599965 = { fRef = 8E267D0B0837F7A6004ACBC5; isa = PBXTextBookmark; @@ -1386,6 +1133,43 @@ vrLen = 681; vrLoc = 363; }; + 8EA0942E0853FC4200EBC193 = { + fRef = 8E47218808318D7A001F89FA; + isa = PBXTextBookmark; + rLen = 16; + rLoc = 4628; + rType = 0; + }; + 8EA094320853FC4600EBC193 = { + fRef = 8E14E479084CF1A200246BCC; + isa = PBXTextBookmark; + name = "AACFile.h: 13"; + rLen = 0; + rLoc = 206; + rType = 0; + vrLen = 428; + vrLoc = 132; + }; + 8EA094330853FC4600EBC193 = { + fRef = 8E14E479084CF1A200246BCC; + isa = PBXTextBookmark; + name = "AACFile.h: 13"; + rLen = 0; + rLoc = 206; + rType = 0; + vrLen = 428; + vrLoc = 132; + }; + 8EA0943E0854080700EBC193 = { + fRef = 8E47218808318D7A001F89FA; + isa = PBXTextBookmark; + name = "PlaylistController.m: 245"; + rLen = 0; + rLoc = 5312; + rType = 0; + vrLen = 486; + vrLoc = 4941; + }; 8EA0A215084CC43F008DFEC9 = { fRef = 8E2871080836934A0013CE39; isa = PBXTextBookmark; @@ -1406,16 +1190,6 @@ vrLen = 671; vrLoc = 367; }; - 8EA0A218084CC43F008DFEC9 = { - fRef = 8E45227A0832898A00F8BA7C; - isa = PBXTextBookmark; - name = "Sound.h: 73"; - rLen = 0; - rLoc = 1555; - rType = 0; - vrLen = 914; - vrLoc = 1073; - }; 8EA0A21A084CC43F008DFEC9 = { fRef = 8E47218B08318D7A001F89FA; isa = PBXTextBookmark; @@ -2092,16 +1866,6 @@ 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; @@ -2132,16 +1896,6 @@ vrLen = 957; vrLoc = 6740; }; - 8EC18D9D084E3D8200AE0BA9 = { - fRef = 8E45227B0832898A00F8BA7C; - isa = PBXTextBookmark; - name = "Sound.m: 32"; - rLen = 0; - rLoc = 774; - rType = 0; - vrLen = 515; - vrLoc = 4427; - }; 8EC18D9F084E3D8200AE0BA9 = { fRef = 8E47218A08318D7A001F89FA; isa = PBXTextBookmark; @@ -2152,26 +1906,6 @@ vrLen = 244; vrLoc = 1652; }; - 8EC18DDB084E403100AE0BA9 = { - fRef = 8EF6FA6B082DA526006F7BE6; - isa = PBXTextBookmark; - name = "MusepackFile.h: buffer"; - rLen = 0; - rLoc = 383; - rType = 0; - vrLen = 564; - vrLoc = 35; - }; - 8EC18EB8084E57D500AE0BA9 = { - fRef = 8EC18EB9084E57D500AE0BA9; - isa = PBXTextBookmark; - name = "(null): 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 578; - vrLoc = 0; - }; 8EC18EB9084E57D500AE0BA9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; @@ -2179,12 +1913,6 @@ path = /Users/xugg/Desktop/faad2/plugins/xmms/src/libmp4.c; refType = 0; sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 7476}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {775, 372}}"; - sepNavWindowFrame = "{{15, 72}, {1017, 669}}"; - }; }; 8EC18EBD084E57D500AE0BA9 = { fRef = 8EC18EBE084E57D500AE0BA9; @@ -2204,26 +1932,6 @@ refType = 0; sourceTree = ""; }; - 8EC7DA89084E672F00A079A7 = { - fRef = 8EF6FA6C082DA526006F7BE6; - isa = PBXTextBookmark; - name = "MusepackFile.m: 106"; - rLen = 0; - rLoc = 2177; - rType = 0; - vrLen = 682; - vrLoc = 2425; - }; - 8EC7DA8A084E672F00A079A7 = { - fRef = 8E14E479084CF1A200246BCC; - isa = PBXTextBookmark; - name = "AACFile.h: buffer"; - rLen = 0; - rLoc = 457; - rType = 0; - vrLen = 501; - vrLoc = 0; - }; 8EC8FBD20842932A00DF2C98 = { fRef = 8EF6FA6F082DA526006F7BE6; isa = PBXTextBookmark; @@ -2396,7 +2104,7 @@ fileReference = 8E47218808318D7A001F89FA; functionName = "-currentEntry"; isa = PBXFileBreakpoint; - lineNumber = 372; + lineNumber = 386; state = 2; }; 8EF6FA65082DA526006F7BE6 = { @@ -2671,212 +2379,6 @@ refType = 0; sourceTree = ""; }; - 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; @@ -2887,736 +2389,6 @@ 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; @@ -3637,16 +2409,6 @@ 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; @@ -3757,394 +2519,24 @@ vrLen = 630; vrLoc = 8684; }; - 8EFC6DF5085380B800C67D06 = { - fRef = 8E14E47A084CF1A200246BCC; + 8EFC6E29085386CE00C67D06 = { + fRef = 8EF6FA65082DA526006F7BE6; isa = PBXTextBookmark; - name = "AACFile.m: 161"; + name = "FlacFile.h: SAMPLE_BUFFER_SIZE"; rLen = 0; - rLoc = 3862; + rLoc = 342; 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; + vrLen = 617; vrLoc = 0; }; - 8EFC6DF8085380B800C67D06 = { + 8EFC6E2A085386CE00C67D06 = { fRef = 8E14E47A084CF1A200246BCC; isa = PBXTextBookmark; - name = "AACFile.m: 151"; + name = "AACFile.m: 160"; rLen = 0; - rLoc = 3820; + rLoc = 3860; 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; + vrLen = 523; vrLoc = 3503; }; } diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib index 1dd2768ca..c6c863b06 100644 --- a/English.lproj/MainMenu.nib/info.nib +++ b/English.lproj/MainMenu.nib/info.nib @@ -13,8 +13,8 @@ 437.0 IBOpenObjects - 29 21 + 29 IBSystem Version 8B15 diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index e456168ac..eea101038 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Info.plist b/Info.plist index 6790e4a66..6b5a5988f 100644 --- a/Info.plist +++ b/Info.plist @@ -6,6 +6,20 @@ English CFBundleDocumentTypes + + CFBundleTypeExtensions + + * + + CFBundleTypeName + Folder + CFBundleTypeRole + Editor + LSTypeIsPackage + + NSPersistentStoreTypeKey + Binary + CFBundleTypeExtensions diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index 9354fbb46..b4fff28ec 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -200,7 +200,19 @@ - (void)removeObjectsAtArrangedObjectIndexes:(NSIndexSet *)indexes { - NSArray *a = [[self arrangedObjects] objectsAtIndexes:indexes]; + unsigned int *indexBuffer; + NSMutableArray *a = [[NSMutableArray alloc] init]; + int i; + + //10.3 fix + indexBuffer = malloc([indexes count]*sizeof(unsigned int)); + [indexes getIndexes:indexBuffer maxCount:[indexes count] inIndexRange:nil]; + for (i = 0; i < [indexes count]; i++) + { + [a addObject:[[self arrangedObjects] objectAtIndex:(indexBuffer[i])]]; + } + +// a = [[self arrangedObjects] objectsAtIndexes:indexes]; //10.4 only if ([a containsObject:currentEntry]) { @@ -214,6 +226,8 @@ [self generateShuffleList]; [history removeObjectsInArray:a]; + + [a release]; } - (IBAction)takeShuffleFromObject:(id)sender