From deb5d66f6d758fe326aab18039079e84fc4a83f6 Mon Sep 17 00:00:00 2001 From: vspader Date: Mon, 20 Jun 2005 18:09:19 +0000 Subject: [PATCH] Fixed crashing playlist bug --- Cog.xcodeproj/xugg.mode1 | 124 ++- Cog.xcodeproj/xugg.pbxuser | 932 +++++++++++--------- English.lproj/MainMenu.nib/info.nib | 2 +- English.lproj/MainMenu.nib/keyedobjects.nib | Bin 42554 -> 42547 bytes Libraries/MAC/.DS_Store | Bin 6148 -> 6148 bytes Libraries/SOURCES | 2 + Playlist/PlaylistController.m | 2 +- README | 18 +- Sound.m | 2 +- SoundFile/ShnFile.m | 3 + 10 files changed, 575 insertions(+), 510 deletions(-) diff --git a/Cog.xcodeproj/xugg.mode1 b/Cog.xcodeproj/xugg.mode1 index 29998fe02..26d5b3300 100644 --- a/Cog.xcodeproj/xugg.mode1 +++ b/Cog.xcodeproj/xugg.mode1 @@ -254,21 +254,19 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey 29B97314FDCFA39411CA2CEA - 080E96DDFE201D6D7F000001 - 8EF6FA64082DA525006F7BE6 29B97317FDCFA39411CA2CEA 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 36 - 1 + 7 + 3 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 438}, {186, 565}} + {{0, 0}, {186, 565}} PBXTopSmartGroupGIDs @@ -305,7 +303,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - Sound.m + Info.plist PBXSplitModuleInNavigatorKey Split0 @@ -313,11 +311,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - Sound.m + Info.plist _historyCapacity 0 bookmark - 8E6535B60856432F00E468D9 + 8EE558090866A24B009E7F50 history 8EF6FACD082DAA2B006F7BE6 @@ -335,13 +333,8 @@ 8ED833CD08457E6B0033CDBD 8E94D9D2084BEA32007F0AEB 8E94D9D3084BEA32007F0AEB - 8E14E4A5084D089100246BCC - 8EC156F5084FEB8900BB24E8 - 8E2752B70850A92E001618CD - 8EE2A5B808511A1800367489 8E72BC640851408F00E34F1D 8EFC6D18085376D100C67D06 - 8EFC6DE7085380B800C67D06 8EFC6DE8085380B800C67D06 8EFC6DF0085380B800C67D06 8EFC6E29085386CE00C67D06 @@ -360,11 +353,7 @@ 8EB30E1F0854C36A009EA87F 8E4D66E90854CD2C00816BEE 8E4D66EA0854CD2C00816BEE - 8E4D67210854D2E700816BEE 8E4D67D40854E7B100816BEE - 8E8F3F20085543D700BCF803 - 8E8F3F21085543D700BCF803 - 8E8F3F22085543D700BCF803 8E8F3F59085546B300BCF803 8E8F3F780855483300BCF803 8E8F3FA408554B8000BCF803 @@ -372,7 +361,6 @@ 8E287CDC0855D60A00562C66 8E287CDD0855D60A00562C66 8E287E7F0855F60E00562C66 - 8E287E830855F60E00562C66 8EAB7544085621B10021C2BF 8EAB7545085621B10021C2BF 8EAB7549085621B10021C2BF @@ -383,15 +371,29 @@ 8EABE7C308562FF3004DF882 8EABE7C408562FF3004DF882 8EABE7C508562FF3004DF882 - 8EABE7C608562FF3004DF882 8E5CC5020856316C00A299E0 8E98E5D308563D1B0078CAA1 8E65357F08563F6A00E468D9 8E65358008563F6A00E468D9 - 8E65358108563F6A00E468D9 - 8E65359D0856401D00E468D9 8E65359E0856401D00E468D9 - 8E65357E08563F6A00E468D9 + 8E5F6DB1085781B900A111D9 + 8E5F6DB2085781B900A111D9 + 8E63F6C808587FD400C79B72 + 8E63F6C908587FD400C79B72 + 8E63F6CA08587FD400C79B72 + 8E8C7BFB085E9CD50086DAC7 + 8E8C7C14085E9DA50086DAC7 + 8E8C7C7F085EA5E30086DAC7 + 8E8C7C81085EA5E30086DAC7 + 8E8C7C83085EA5E30086DAC7 + 8E8C7C85085EA5E30086DAC7 + 8E8C7D35085EAD460086DAC7 + 8E8C7D36085EAD460086DAC7 + 8E657299086085E400A0DAC4 + 8E65729A086085E400A0DAC4 + 8E94AFB2086639760038E585 + 8EE558070866A24B009E7F50 + 8E657298086085E400A0DAC4 prevStack @@ -448,10 +450,8 @@ 8E0EBF59084BAA56003A6E64 8E10DC08084BBE490013815C 8E5A90BB084CC25900AE6D62 - 8E14E4B3084D089100246BCC 8E14E4B4084D089100246BCC 8E14E4B5084D089100246BCC - 8EC18EBD084E57D500AE0BA9 8EC156F9084FEB8900BB24E8 8E8BAEB208548C9600E9F14D 8E8BAEB308548C9600E9F14D @@ -467,13 +467,13 @@ 8EAB755D085621B10021C2BF 8EABE78808562281004DF882 8EABE7CA08562FF3004DF882 - 8E65358208563F6A00E468D9 - 8E65358308563F6A00E468D9 - 8E65358408563F6A00E468D9 - 8E65358508563F6A00E468D9 - 8E65358608563F6A00E468D9 - 8E65359F0856401D00E468D9 - 8E6535A00856401D00E468D9 + 8E63F6CB08587FD400C79B72 + 8E8C7C8C085EA5E30086DAC7 + 8E8C7C8E085EA5E30086DAC7 + 8E8C7C90085EA5E30086DAC7 + 8E8C7C92085EA5E30086DAC7 + 8E8C7C98085EA5E30086DAC7 + 8EE558080866A24B009E7F50 SplitCount @@ -485,14 +485,14 @@ GeometryConfiguration Frame - {{0, 0}, {816, 578}} + {{0, 0}, {816, 405}} RubberWindowFrame 2 122 1024 624 0 0 1024 746 Module PBXNavigatorGroup Proportion - 578pt + 405pt ContentConfiguration @@ -505,14 +505,14 @@ GeometryConfiguration Frame - {{0, 583}, {816, 0}} + {{0, 410}, {816, 173}} RubberWindowFrame 2 122 1024 624 0 0 1024 746 Module XCDetailModule Proportion - 0pt + 173pt Proportion @@ -531,9 +531,9 @@ TableOfContents - 8E65358808563F6A00E468D9 + 8EE5580A0866A24B009E7F50 1CE0B1FE06471DED0097A5F4 - 8E65358908563F6A00E468D9 + 8EE5580B0866A24B009E7F50 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -667,12 +667,6 @@ 5 WindowOrderList - 8E65359208563F6A00E468D9 - 8E65359308563F6A00E468D9 - 8E7A9371083675B600771E14 - 1CD10A99069EF8BA00B06720 - 8E65359008563F6A00E468D9 - 1C0AD2B3069F1EA900FABCE6 /Users/xugg/Projects/Cog/Cog.xcodeproj WindowString @@ -797,8 +791,8 @@ yes sizes - {{0, 0}, {163, 194}} - {{163, 0}, {861, 194}} + {{0, 0}, {143, 190}} + {{143, 0}, {881, 190}} VerticalSplitView @@ -813,8 +807,8 @@ yes sizes - {{0, 0}, {1024, 194}} - {{0, 194}, {1024, 390}} + {{0, 0}, {1024, 190}} + {{0, 190}, {1024, 394}} @@ -861,14 +855,14 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 8E65358A08563F6A00E468D9 + 8EC12F0608566E3A00FC8AE7 1C162984064C10D400B95A72 - 8E65358B08563F6A00E468D9 - 8E65358C08563F6A00E468D9 - 8E65358D08563F6A00E468D9 - 8E65358E08563F6A00E468D9 - 8E65358F08563F6A00E468D9 - 8E65359008563F6A00E468D9 + 8EC12F0708566E3A00FC8AE7 + 8EC12F0808566E3A00FC8AE7 + 8EC12F0908566E3A00FC8AE7 + 8EC12F0A08566E3A00FC8AE7 + 8EC12F0B08566E3A00FC8AE7 + 8EC12F0C08566E3A00FC8AE7 ToolbarConfiguration xcode.toolbar.config.debug @@ -895,12 +889,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - DBLog.c + SoundController.m StatusBarVisibility @@ -921,8 +917,6 @@ 342pt - BecomeActive - ContentConfiguration PBXProjectModuleGUID @@ -958,8 +952,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 8E37C10A0856312D00A0FFA6 - 8E37C10B0856312D00A0FFA6 + 8E8C7C27085E9DC50086DAC7 + 8E8C7C28085E9DC50086DAC7 1CDD528C0622207200134675 1CD0528E0623707200166675 @@ -968,7 +962,7 @@ WindowToolGUID 1C530D57069F1CE1000CFCEE WindowToolIsVisible - + Identifier @@ -1022,7 +1016,7 @@ TableOfContents 8E7A9371083675B600771E14 - 8E65359108563F6A00E468D9 + 8EC12F0D08566E3A00FC8AE7 1C78EAAC065D492600B07095 WindowString @@ -1067,8 +1061,8 @@ yes sizes - {{0, 0}, {493, 168}} - {{0, 173}, {493, 270}} + {{0, 0}, {367, 168}} + {{0, 173}, {367, 270}} VerticalSplitView @@ -1117,9 +1111,9 @@ TableOfContents 1C0AD2B3069F1EA900FABCE6 - 8E65356C08563D5600E468D9 + 8E0914FC08661F200039FDAA 1CD0528B0623707200166675 - 8E65356D08563D5600E468D9 + 8E0914FD08661F200039FDAA ToolbarConfiguration xcode.toolbar.config.run diff --git a/Cog.xcodeproj/xugg.pbxuser b/Cog.xcodeproj/xugg.pbxuser index 63d44c503..65d229e09 100644 --- a/Cog.xcodeproj/xugg.pbxuser +++ b/Cog.xcodeproj/xugg.pbxuser @@ -111,162 +111,164 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 139869480; - PBXWorkspaceStateSaveDate = 139869480; + PBXPerProjectTemplateStateSaveDate = 140983470; + PBXWorkspaceStateSaveDate = 140983470; }; perUserProjectItems = { - 8E0EBF58084BAA56003A6E64 /* PBXTextBookmark */ = 8E0EBF58084BAA56003A6E64 /* PBXTextBookmark */; - 8E0EBF59084BAA56003A6E64 /* PBXTextBookmark */ = 8E0EBF59084BAA56003A6E64 /* PBXTextBookmark */; - 8E10DC08084BBE490013815C /* PBXTextBookmark */ = 8E10DC08084BBE490013815C /* PBXTextBookmark */; - 8E14E4A5084D089100246BCC /* PBXTextBookmark */ = 8E14E4A5084D089100246BCC /* PBXTextBookmark */; - 8E14E4B3084D089100246BCC /* PBXTextBookmark */ = 8E14E4B3084D089100246BCC /* PBXTextBookmark */; - 8E14E4B4084D089100246BCC /* PBXTextBookmark */ = 8E14E4B4084D089100246BCC /* PBXTextBookmark */; - 8E14E4B5084D089100246BCC /* PBXTextBookmark */ = 8E14E4B5084D089100246BCC /* PBXTextBookmark */; - 8E1A1826083806B700AEA302 /* PBXTextBookmark */ = 8E1A1826083806B700AEA302 /* PBXTextBookmark */; - 8E1A182C083806B700AEA302 /* PBXTextBookmark */ = 8E1A182C083806B700AEA302 /* PBXTextBookmark */; - 8E267D8C0837F963004ACBC5 /* PBXTextBookmark */ = 8E267D8C0837F963004ACBC5 /* PBXTextBookmark */; - 8E267D8D0837F963004ACBC5 /* PBXTextBookmark */ = 8E267D8D0837F963004ACBC5 /* PBXTextBookmark */; - 8E267D900837F963004ACBC5 /* PBXTextBookmark */ = 8E267D900837F963004ACBC5 /* PBXTextBookmark */; - 8E267D910837F963004ACBC5 /* PBXTextBookmark */ = 8E267D910837F963004ACBC5 /* PBXTextBookmark */; - 8E267D920837F963004ACBC5 /* PBXTextBookmark */ = 8E267D920837F963004ACBC5 /* PBXTextBookmark */; - 8E267D940837F963004ACBC5 /* PBXTextBookmark */ = 8E267D940837F963004ACBC5 /* PBXTextBookmark */; - 8E267DA00837FA6E004ACBC5 /* PBXTextBookmark */ = 8E267DA00837FA6E004ACBC5 /* PBXTextBookmark */; - 8E267DDB0837FE5F004ACBC5 /* PBXTextBookmark */ = 8E267DDB0837FE5F004ACBC5 /* PBXTextBookmark */; - 8E267E0308380176004ACBC5 /* PBXTextBookmark */ = 8E267E0308380176004ACBC5 /* PBXTextBookmark */; - 8E267E1A083801D8004ACBC5 /* PBXTextBookmark */ = 8E267E1A083801D8004ACBC5 /* PBXTextBookmark */; - 8E2752B70850A92E001618CD /* PBXTextBookmark */ = 8E2752B70850A92E001618CD /* PBXTextBookmark */; - 8E287164083695080013CE39 /* PBXTextBookmark */ = 8E287164083695080013CE39 /* PBXTextBookmark */; - 8E287CDC0855D60A00562C66 /* PBXTextBookmark */ = 8E287CDC0855D60A00562C66 /* PBXTextBookmark */; - 8E287CDD0855D60A00562C66 /* PBXTextBookmark */ = 8E287CDD0855D60A00562C66 /* PBXTextBookmark */; - 8E287E5D0855F35400562C66 /* PBXTextBookmark */ = 8E287E5D0855F35400562C66 /* PBXTextBookmark */; - 8E287E5E0855F35400562C66 /* PBXTextBookmark */ = 8E287E5E0855F35400562C66 /* PBXTextBookmark */; - 8E287E7F0855F60E00562C66 /* PBXTextBookmark */ = 8E287E7F0855F60E00562C66 /* PBXTextBookmark */; - 8E287E830855F60E00562C66 /* PBXTextBookmark */ = 8E287E830855F60E00562C66 /* PBXTextBookmark */; - 8E297910083D892800F2C55A /* PBXTextBookmark */ = 8E297910083D892800F2C55A /* PBXTextBookmark */; - 8E3EDBC9085477D0007C6A53 /* PBXTextBookmark */ = 8E3EDBC9085477D0007C6A53 /* PBXTextBookmark */; - 8E4521C408327F4C00F8BA7C /* PBXTextBookmark */ = 8E4521C408327F4C00F8BA7C /* PBXTextBookmark */; - 8E4522A608329C9B00F8BA7C /* PBXTextBookmark */ = 8E4522A608329C9B00F8BA7C /* PBXTextBookmark */; - 8E4522AF08329C9B00F8BA7C /* PBXTextBookmark */ = 8E4522AF08329C9B00F8BA7C /* PBXTextBookmark */; - 8E4721AE08318F3E001F89FA /* PBXTextBookmark */ = 8E4721AE08318F3E001F89FA /* PBXTextBookmark */; - 8E4721AF08318F3E001F89FA /* PBXTextBookmark */ = 8E4721AF08318F3E001F89FA /* PBXTextBookmark */; - 8E4721B008318F3E001F89FA /* PBXTextBookmark */ = 8E4721B008318F3E001F89FA /* PBXTextBookmark */; - 8E4721B108318F3E001F89FA /* PBXTextBookmark */ = 8E4721B108318F3E001F89FA /* PBXTextBookmark */; - 8E4721B208318F3E001F89FA /* PBXTextBookmark */ = 8E4721B208318F3E001F89FA /* PBXTextBookmark */; - 8E4721B308318F3E001F89FA /* PBXTextBookmark */ = 8E4721B308318F3E001F89FA /* PBXTextBookmark */; - 8E4721B908318F3E001F89FA /* PBXTextBookmark */ = 8E4721B908318F3E001F89FA /* PBXTextBookmark */; - 8E4721BA08318F3E001F89FA /* PBXTextBookmark */ = 8E4721BA08318F3E001F89FA /* PBXTextBookmark */; - 8E4721E008319EFC001F89FA /* PBXTextBookmark */ = 8E4721E008319EFC001F89FA /* PBXTextBookmark */; - 8E4721E108319EFC001F89FA /* PBXTextBookmark */ = 8E4721E108319EFC001F89FA /* PBXTextBookmark */; - 8E4721E508319EFC001F89FA /* PBXTextBookmark */ = 8E4721E508319EFC001F89FA /* PBXTextBookmark */; - 8E4D66E90854CD2C00816BEE /* PBXTextBookmark */ = 8E4D66E90854CD2C00816BEE /* PBXTextBookmark */; - 8E4D66EA0854CD2C00816BEE /* PBXTextBookmark */ = 8E4D66EA0854CD2C00816BEE /* PBXTextBookmark */; - 8E4D67210854D2E700816BEE /* PBXTextBookmark */ = 8E4D67210854D2E700816BEE /* PBXTextBookmark */; - 8E4D67D40854E7B100816BEE /* PBXTextBookmark */ = 8E4D67D40854E7B100816BEE /* PBXTextBookmark */; - 8E5A90BB084CC25900AE6D62 /* PBXTextBookmark */ = 8E5A90BB084CC25900AE6D62 /* PBXTextBookmark */; - 8E5CC5020856316C00A299E0 /* PBXTextBookmark */ = 8E5CC5020856316C00A299E0 /* PBXTextBookmark */; - 8E6082C7083920310017AECF /* PBXTextBookmark */ = 8E6082C7083920310017AECF /* PBXTextBookmark */; - 8E6529B5083D8D7F00A7AF1B /* PBXTextBookmark */ = 8E6529B5083D8D7F00A7AF1B /* PBXTextBookmark */; - 8E652A33083E1A7900A7AF1B /* PBXTextBookmark */ = 8E652A33083E1A7900A7AF1B /* PBXTextBookmark */; - 8E652A34083E1A7900A7AF1B /* PBXTextBookmark */ = 8E652A34083E1A7900A7AF1B /* PBXTextBookmark */; - 8E652A35083E1A7900A7AF1B /* PBXTextBookmark */ = 8E652A35083E1A7900A7AF1B /* PBXTextBookmark */; - 8E652A36083E1A7900A7AF1B /* PBXTextBookmark */ = 8E652A36083E1A7900A7AF1B /* PBXTextBookmark */; - 8E652A39083E1A7900A7AF1B /* PBXTextBookmark */ = 8E652A39083E1A7900A7AF1B /* PBXTextBookmark */; - 8E652A3A083E1A7900A7AF1B /* PBXTextBookmark */ = 8E652A3A083E1A7900A7AF1B /* PBXTextBookmark */; - 8E65357E08563F6A00E468D9 /* PBXTextBookmark */ = 8E65357E08563F6A00E468D9 /* PBXTextBookmark */; - 8E65357F08563F6A00E468D9 /* PBXTextBookmark */ = 8E65357F08563F6A00E468D9 /* PBXTextBookmark */; - 8E65358008563F6A00E468D9 /* PBXTextBookmark */ = 8E65358008563F6A00E468D9 /* PBXTextBookmark */; - 8E65358108563F6A00E468D9 /* PBXTextBookmark */ = 8E65358108563F6A00E468D9 /* PBXTextBookmark */; - 8E65358208563F6A00E468D9 /* PBXTextBookmark */ = 8E65358208563F6A00E468D9 /* PBXTextBookmark */; - 8E65358308563F6A00E468D9 /* PBXTextBookmark */ = 8E65358308563F6A00E468D9 /* PBXTextBookmark */; - 8E65358408563F6A00E468D9 /* PBXTextBookmark */ = 8E65358408563F6A00E468D9 /* PBXTextBookmark */; - 8E65358508563F6A00E468D9 /* PBXTextBookmark */ = 8E65358508563F6A00E468D9 /* PBXTextBookmark */; - 8E65358608563F6A00E468D9 /* PBXTextBookmark */ = 8E65358608563F6A00E468D9 /* PBXTextBookmark */; - 8E65359D0856401D00E468D9 /* PBXTextBookmark */ = 8E65359D0856401D00E468D9 /* PBXTextBookmark */; - 8E65359E0856401D00E468D9 /* PBXTextBookmark */ = 8E65359E0856401D00E468D9 /* PBXTextBookmark */; - 8E65359F0856401D00E468D9 /* PBXTextBookmark */ = 8E65359F0856401D00E468D9 /* PBXTextBookmark */; - 8E6535A00856401D00E468D9 /* PBXTextBookmark */ = 8E6535A00856401D00E468D9 /* PBXTextBookmark */; - 8E6535B60856432F00E468D9 /* PBXTextBookmark */ = 8E6535B60856432F00E468D9 /* PBXTextBookmark */; - 8E72BC640851408F00E34F1D /* PBXTextBookmark */ = 8E72BC640851408F00E34F1D /* PBXTextBookmark */; - 8E8BAEB208548C9600E9F14D /* PBXTextBookmark */ = 8E8BAEB208548C9600E9F14D /* PBXTextBookmark */; - 8E8BAEB308548C9600E9F14D /* PBXTextBookmark */ = 8E8BAEB308548C9600E9F14D /* PBXTextBookmark */; - 8E8BAEB708548C9600E9F14D /* PBXTextBookmark */ = 8E8BAEB708548C9600E9F14D /* PBXTextBookmark */; - 8E8BAF10085494E000E9F14D /* PBXTextBookmark */ = 8E8BAF10085494E000E9F14D /* PBXTextBookmark */; - 8E8BAF17085494E000E9F14D /* PBXTextBookmark */ = 8E8BAF17085494E000E9F14D /* PBXTextBookmark */; - 8E8BAF790854976A00E9F14D /* PBXTextBookmark */ = 8E8BAF790854976A00E9F14D /* PBXTextBookmark */; - 8E8F3F20085543D700BCF803 /* PBXTextBookmark */ = 8E8F3F20085543D700BCF803 /* PBXTextBookmark */; - 8E8F3F21085543D700BCF803 /* PBXTextBookmark */ = 8E8F3F21085543D700BCF803 /* PBXTextBookmark */; - 8E8F3F22085543D700BCF803 /* PBXTextBookmark */ = 8E8F3F22085543D700BCF803 /* PBXTextBookmark */; - 8E8F3F59085546B300BCF803 /* PBXTextBookmark */ = 8E8F3F59085546B300BCF803 /* PBXTextBookmark */; - 8E8F3F780855483300BCF803 /* PBXTextBookmark */ = 8E8F3F780855483300BCF803 /* PBXTextBookmark */; - 8E8F3FA408554B8000BCF803 /* PBXTextBookmark */ = 8E8F3FA408554B8000BCF803 /* PBXTextBookmark */; - 8E8F3FAE08554B8000BCF803 /* PBXTextBookmark */ = 8E8F3FAE08554B8000BCF803 /* PBXTextBookmark */; - 8E91CCEE08549FEE0055EC68 /* PBXTextBookmark */ = 8E91CCEE08549FEE0055EC68 /* PBXTextBookmark */; - 8E94D9D2084BEA32007F0AEB /* PBXTextBookmark */ = 8E94D9D2084BEA32007F0AEB /* PBXTextBookmark */; - 8E94D9D3084BEA32007F0AEB /* PBXTextBookmark */ = 8E94D9D3084BEA32007F0AEB /* PBXTextBookmark */; - 8E98E5D308563D1B0078CAA1 /* PBXTextBookmark */ = 8E98E5D308563D1B0078CAA1 /* PBXTextBookmark */; - 8E9BF08B082FB9DD00B26943 /* PBXTextBookmark */ = 8E9BF08B082FB9DD00B26943 /* PBXTextBookmark */; - 8E9BF100082FEF6B00B26943 /* PBXTextBookmark */ = 8E9BF100082FEF6B00B26943 /* PBXTextBookmark */; - 8EAB7544085621B10021C2BF /* PBXTextBookmark */ = 8EAB7544085621B10021C2BF /* PBXTextBookmark */; - 8EAB7545085621B10021C2BF /* PBXTextBookmark */ = 8EAB7545085621B10021C2BF /* PBXTextBookmark */; - 8EAB7549085621B10021C2BF /* PBXBookmark */ = 8EAB7549085621B10021C2BF /* PBXBookmark */; - 8EAB754A085621B10021C2BF /* PBXBookmark */ = 8EAB754A085621B10021C2BF /* PBXBookmark */; - 8EAB754B085621B10021C2BF /* PBXBookmark */ = 8EAB754B085621B10021C2BF /* PBXBookmark */; - 8EAB754C085621B10021C2BF /* PBXBookmark */ = 8EAB754C085621B10021C2BF /* PBXBookmark */; - 8EAB7553085621B10021C2BF /* PBXBookmark */ = 8EAB7553085621B10021C2BF /* PBXBookmark */; - 8EAB7554085621B10021C2BF /* PBXBookmark */ = 8EAB7554085621B10021C2BF /* PBXBookmark */; - 8EAB7555085621B10021C2BF /* PBXBookmark */ = 8EAB7555085621B10021C2BF /* PBXBookmark */; - 8EAB755D085621B10021C2BF /* PBXBookmark */ = 8EAB755D085621B10021C2BF /* PBXBookmark */; - 8EABE78408562281004DF882 /* PBXBookmark */ = 8EABE78408562281004DF882 /* PBXBookmark */; - 8EABE78808562281004DF882 /* PBXBookmark */ = 8EABE78808562281004DF882 /* PBXBookmark */; - 8EABE7C308562FF3004DF882 /* PBXBookmark */ = 8EABE7C308562FF3004DF882 /* PBXBookmark */; - 8EABE7C408562FF3004DF882 /* PBXTextBookmark */ = 8EABE7C408562FF3004DF882 /* PBXTextBookmark */; - 8EABE7C508562FF3004DF882 /* PBXTextBookmark */ = 8EABE7C508562FF3004DF882 /* PBXTextBookmark */; - 8EABE7C608562FF3004DF882 /* PBXTextBookmark */ = 8EABE7C608562FF3004DF882 /* PBXTextBookmark */; - 8EABE7CA08562FF3004DF882 /* PBXBookmark */ = 8EABE7CA08562FF3004DF882 /* PBXBookmark */; - 8EB30D8A0854BEF1009EA87F /* PBXTextBookmark */ = 8EB30D8A0854BEF1009EA87F /* PBXTextBookmark */; - 8EB30D990854BEF1009EA87F /* PBXTextBookmark */ = 8EB30D990854BEF1009EA87F /* PBXTextBookmark */; - 8EB30DAE0854BFEE009EA87F /* PBXTextBookmark */ = 8EB30DAE0854BFEE009EA87F /* PBXTextBookmark */; - 8EB30DDB0854C261009EA87F /* PBXTextBookmark */ = 8EB30DDB0854C261009EA87F /* PBXTextBookmark */; - 8EB30DDC0854C261009EA87F /* PBXTextBookmark */ = 8EB30DDC0854C261009EA87F /* PBXTextBookmark */; - 8EB30DDD0854C261009EA87F /* PBXTextBookmark */ = 8EB30DDD0854C261009EA87F /* PBXTextBookmark */; - 8EB30DDE0854C261009EA87F /* PBXTextBookmark */ = 8EB30DDE0854C261009EA87F /* PBXTextBookmark */; - 8EB30DDF0854C261009EA87F /* PBXTextBookmark */ = 8EB30DDF0854C261009EA87F /* PBXTextBookmark */; - 8EB30DE00854C261009EA87F /* PBXTextBookmark */ = 8EB30DE00854C261009EA87F /* PBXTextBookmark */; - 8EB30E1F0854C36A009EA87F /* PBXTextBookmark */ = 8EB30E1F0854C36A009EA87F /* PBXTextBookmark */; - 8EC156F5084FEB8900BB24E8 /* PBXTextBookmark */ = 8EC156F5084FEB8900BB24E8 /* PBXTextBookmark */; - 8EC156F9084FEB8900BB24E8 /* PBXTextBookmark */ = 8EC156F9084FEB8900BB24E8 /* PBXTextBookmark */; - 8EC18EBD084E57D500AE0BA9 /* PBXTextBookmark */ = 8EC18EBD084E57D500AE0BA9 /* PBXTextBookmark */; - 8ED833CD08457E6B0033CDBD /* PBXTextBookmark */ = 8ED833CD08457E6B0033CDBD /* PBXTextBookmark */; - 8EDC88A90842F8DE007D1532 /* PBXTextBookmark */ = 8EDC88A90842F8DE007D1532 /* PBXTextBookmark */; - 8EDC88B50842F936007D1532 /* PBXTextBookmark */ = 8EDC88B50842F936007D1532 /* PBXTextBookmark */; - 8EDCBDDB084061E500F5C7E3 /* PBXTextBookmark */ = 8EDCBDDB084061E500F5C7E3 /* PBXTextBookmark */; - 8EDCBDDC084061E500F5C7E3 /* PBXTextBookmark */ = 8EDCBDDC084061E500F5C7E3 /* PBXTextBookmark */; - 8EDE0CCC08369EB200EABFE4 /* PBXTextBookmark */ = 8EDE0CCC08369EB200EABFE4 /* PBXTextBookmark */; - 8EE2A5B808511A1800367489 /* PBXTextBookmark */ = 8EE2A5B808511A1800367489 /* PBXTextBookmark */; - 8EE4A6C3082E6F6100415456 /* PBXTextBookmark */ = 8EE4A6C3082E6F6100415456 /* PBXTextBookmark */; - 8EE4A6C8082E6F6100415456 /* PBXTextBookmark */ = 8EE4A6C8082E6F6100415456 /* PBXTextBookmark */; - 8EE4A6FE082E704E00415456 /* PBXTextBookmark */ = 8EE4A6FE082E704E00415456 /* PBXTextBookmark */; - 8EE4A799082E7D8700415456 /* PBXTextBookmark */ = 8EE4A799082E7D8700415456 /* PBXTextBookmark */; - 8EF45A7A08557C4D00D2D5D0 /* PBXTextBookmark */ = 8EF45A7A08557C4D00D2D5D0 /* PBXTextBookmark */; - 8EF6FACD082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FACD082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FAD1082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FAD1082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FAD5082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FAD5082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FAD6082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FAD6082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FAD7082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FAD7082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FAD8082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FAD8082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FADA082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FADA082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FADC082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FADC082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FADD082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FADD082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FADE082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FADE082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FADF082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FADF082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FAE1082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FAE1082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FAEF082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FAEF082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EF6FAF3082DAA2B006F7BE6 /* PBXTextBookmark */ = 8EF6FAF3082DAA2B006F7BE6 /* PBXTextBookmark */; - 8EFC6D18085376D100C67D06 /* PBXTextBookmark */ = 8EFC6D18085376D100C67D06 /* PBXTextBookmark */; - 8EFC6DE7085380B800C67D06 /* PBXTextBookmark */ = 8EFC6DE7085380B800C67D06 /* PBXTextBookmark */; - 8EFC6DE8085380B800C67D06 /* PBXTextBookmark */ = 8EFC6DE8085380B800C67D06 /* PBXTextBookmark */; - 8EFC6DF0085380B800C67D06 /* PBXTextBookmark */ = 8EFC6DF0085380B800C67D06 /* PBXTextBookmark */; - 8EFC6E29085386CE00C67D06 /* PBXTextBookmark */ = 8EFC6E29085386CE00C67D06 /* PBXTextBookmark */; + 8E0EBF58084BAA56003A6E64 = 8E0EBF58084BAA56003A6E64 /* PBXTextBookmark */; + 8E0EBF59084BAA56003A6E64 = 8E0EBF59084BAA56003A6E64 /* PBXTextBookmark */; + 8E10DC08084BBE490013815C = 8E10DC08084BBE490013815C /* PBXTextBookmark */; + 8E14E4B4084D089100246BCC = 8E14E4B4084D089100246BCC /* PBXTextBookmark */; + 8E14E4B5084D089100246BCC = 8E14E4B5084D089100246BCC /* PBXTextBookmark */; + 8E1A1826083806B700AEA302 = 8E1A1826083806B700AEA302 /* PBXTextBookmark */; + 8E1A182C083806B700AEA302 = 8E1A182C083806B700AEA302 /* PBXTextBookmark */; + 8E267D8C0837F963004ACBC5 = 8E267D8C0837F963004ACBC5 /* PBXTextBookmark */; + 8E267D8D0837F963004ACBC5 = 8E267D8D0837F963004ACBC5 /* PBXTextBookmark */; + 8E267D900837F963004ACBC5 = 8E267D900837F963004ACBC5 /* PBXTextBookmark */; + 8E267D910837F963004ACBC5 = 8E267D910837F963004ACBC5 /* PBXTextBookmark */; + 8E267D920837F963004ACBC5 = 8E267D920837F963004ACBC5 /* PBXTextBookmark */; + 8E267D940837F963004ACBC5 = 8E267D940837F963004ACBC5 /* PBXTextBookmark */; + 8E267DA00837FA6E004ACBC5 = 8E267DA00837FA6E004ACBC5 /* PBXTextBookmark */; + 8E267DDB0837FE5F004ACBC5 = 8E267DDB0837FE5F004ACBC5 /* PBXTextBookmark */; + 8E267E0308380176004ACBC5 = 8E267E0308380176004ACBC5 /* PBXTextBookmark */; + 8E267E1A083801D8004ACBC5 = 8E267E1A083801D8004ACBC5 /* PBXTextBookmark */; + 8E287164083695080013CE39 = 8E287164083695080013CE39 /* PBXTextBookmark */; + 8E287CDC0855D60A00562C66 = 8E287CDC0855D60A00562C66 /* PBXTextBookmark */; + 8E287CDD0855D60A00562C66 = 8E287CDD0855D60A00562C66 /* PBXTextBookmark */; + 8E287E5D0855F35400562C66 = 8E287E5D0855F35400562C66 /* PBXTextBookmark */; + 8E287E5E0855F35400562C66 = 8E287E5E0855F35400562C66 /* PBXTextBookmark */; + 8E287E7F0855F60E00562C66 = 8E287E7F0855F60E00562C66 /* PBXTextBookmark */; + 8E297910083D892800F2C55A = 8E297910083D892800F2C55A /* PBXTextBookmark */; + 8E3EDBC9085477D0007C6A53 = 8E3EDBC9085477D0007C6A53 /* PBXTextBookmark */; + 8E4521C408327F4C00F8BA7C = 8E4521C408327F4C00F8BA7C /* PBXTextBookmark */; + 8E4522A608329C9B00F8BA7C = 8E4522A608329C9B00F8BA7C /* PBXTextBookmark */; + 8E4522AF08329C9B00F8BA7C = 8E4522AF08329C9B00F8BA7C /* PBXTextBookmark */; + 8E4721AE08318F3E001F89FA = 8E4721AE08318F3E001F89FA /* PBXTextBookmark */; + 8E4721AF08318F3E001F89FA = 8E4721AF08318F3E001F89FA /* PBXTextBookmark */; + 8E4721B008318F3E001F89FA = 8E4721B008318F3E001F89FA /* PBXTextBookmark */; + 8E4721B108318F3E001F89FA = 8E4721B108318F3E001F89FA /* PBXTextBookmark */; + 8E4721B208318F3E001F89FA = 8E4721B208318F3E001F89FA /* PBXTextBookmark */; + 8E4721B308318F3E001F89FA = 8E4721B308318F3E001F89FA /* PBXTextBookmark */; + 8E4721B908318F3E001F89FA = 8E4721B908318F3E001F89FA /* PBXTextBookmark */; + 8E4721BA08318F3E001F89FA = 8E4721BA08318F3E001F89FA /* PBXTextBookmark */; + 8E4721E008319EFC001F89FA = 8E4721E008319EFC001F89FA /* PBXTextBookmark */; + 8E4721E108319EFC001F89FA = 8E4721E108319EFC001F89FA /* PBXTextBookmark */; + 8E4721E508319EFC001F89FA = 8E4721E508319EFC001F89FA /* PBXTextBookmark */; + 8E4D66E90854CD2C00816BEE = 8E4D66E90854CD2C00816BEE /* PBXTextBookmark */; + 8E4D66EA0854CD2C00816BEE = 8E4D66EA0854CD2C00816BEE /* PBXTextBookmark */; + 8E4D67D40854E7B100816BEE = 8E4D67D40854E7B100816BEE /* PBXTextBookmark */; + 8E5A90BB084CC25900AE6D62 = 8E5A90BB084CC25900AE6D62 /* PBXTextBookmark */; + 8E5CC5020856316C00A299E0 = 8E5CC5020856316C00A299E0 /* PBXTextBookmark */; + 8E5F6DB1085781B900A111D9 = 8E5F6DB1085781B900A111D9 /* PBXTextBookmark */; + 8E5F6DB2085781B900A111D9 = 8E5F6DB2085781B900A111D9 /* PBXTextBookmark */; + 8E6082C7083920310017AECF = 8E6082C7083920310017AECF /* PBXTextBookmark */; + 8E63F6C808587FD400C79B72 = 8E63F6C808587FD400C79B72 /* PBXTextBookmark */; + 8E63F6C908587FD400C79B72 = 8E63F6C908587FD400C79B72 /* PBXTextBookmark */; + 8E63F6CA08587FD400C79B72 = 8E63F6CA08587FD400C79B72 /* PBXTextBookmark */; + 8E63F6CB08587FD400C79B72 = 8E63F6CB08587FD400C79B72 /* PBXTextBookmark */; + 8E6529B5083D8D7F00A7AF1B = 8E6529B5083D8D7F00A7AF1B /* PBXTextBookmark */; + 8E652A33083E1A7900A7AF1B = 8E652A33083E1A7900A7AF1B /* PBXTextBookmark */; + 8E652A34083E1A7900A7AF1B = 8E652A34083E1A7900A7AF1B /* PBXTextBookmark */; + 8E652A35083E1A7900A7AF1B = 8E652A35083E1A7900A7AF1B /* PBXTextBookmark */; + 8E652A36083E1A7900A7AF1B = 8E652A36083E1A7900A7AF1B /* PBXTextBookmark */; + 8E652A39083E1A7900A7AF1B = 8E652A39083E1A7900A7AF1B /* PBXTextBookmark */; + 8E652A3A083E1A7900A7AF1B = 8E652A3A083E1A7900A7AF1B /* PBXTextBookmark */; + 8E65357F08563F6A00E468D9 = 8E65357F08563F6A00E468D9 /* PBXTextBookmark */; + 8E65358008563F6A00E468D9 = 8E65358008563F6A00E468D9 /* PBXTextBookmark */; + 8E65359E0856401D00E468D9 = 8E65359E0856401D00E468D9 /* PBXTextBookmark */; + 8E657298086085E400A0DAC4 = 8E657298086085E400A0DAC4 /* PBXTextBookmark */; + 8E657299086085E400A0DAC4 = 8E657299086085E400A0DAC4 /* PBXTextBookmark */; + 8E65729A086085E400A0DAC4 = 8E65729A086085E400A0DAC4 /* PBXTextBookmark */; + 8E72BC640851408F00E34F1D = 8E72BC640851408F00E34F1D /* PBXTextBookmark */; + 8E8BAEB208548C9600E9F14D = 8E8BAEB208548C9600E9F14D /* PBXTextBookmark */; + 8E8BAEB308548C9600E9F14D = 8E8BAEB308548C9600E9F14D /* PBXTextBookmark */; + 8E8BAEB708548C9600E9F14D = 8E8BAEB708548C9600E9F14D /* PBXTextBookmark */; + 8E8BAF10085494E000E9F14D = 8E8BAF10085494E000E9F14D /* PBXTextBookmark */; + 8E8BAF17085494E000E9F14D = 8E8BAF17085494E000E9F14D /* PBXTextBookmark */; + 8E8BAF790854976A00E9F14D = 8E8BAF790854976A00E9F14D /* PBXTextBookmark */; + 8E8C7BFB085E9CD50086DAC7 = 8E8C7BFB085E9CD50086DAC7 /* PBXTextBookmark */; + 8E8C7C14085E9DA50086DAC7 = 8E8C7C14085E9DA50086DAC7 /* PBXTextBookmark */; + 8E8C7C7F085EA5E30086DAC7 = 8E8C7C7F085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C81085EA5E30086DAC7 = 8E8C7C81085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C83085EA5E30086DAC7 = 8E8C7C83085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C85085EA5E30086DAC7 = 8E8C7C85085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C8C085EA5E30086DAC7 = 8E8C7C8C085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C8E085EA5E30086DAC7 = 8E8C7C8E085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C90085EA5E30086DAC7 = 8E8C7C90085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C92085EA5E30086DAC7 = 8E8C7C92085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C98085EA5E30086DAC7 = 8E8C7C98085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7D35085EAD460086DAC7 = 8E8C7D35085EAD460086DAC7 /* PBXTextBookmark */; + 8E8C7D36085EAD460086DAC7 = 8E8C7D36085EAD460086DAC7 /* PBXTextBookmark */; + 8E8F3F59085546B300BCF803 = 8E8F3F59085546B300BCF803 /* PBXTextBookmark */; + 8E8F3F780855483300BCF803 = 8E8F3F780855483300BCF803 /* PBXTextBookmark */; + 8E8F3FA408554B8000BCF803 = 8E8F3FA408554B8000BCF803 /* PBXTextBookmark */; + 8E8F3FAE08554B8000BCF803 = 8E8F3FAE08554B8000BCF803 /* PBXTextBookmark */; + 8E91CCEE08549FEE0055EC68 = 8E91CCEE08549FEE0055EC68 /* PBXTextBookmark */; + 8E94AFB2086639760038E585 = 8E94AFB2086639760038E585 /* PBXTextBookmark */; + 8E94D9D2084BEA32007F0AEB = 8E94D9D2084BEA32007F0AEB /* PBXTextBookmark */; + 8E94D9D3084BEA32007F0AEB = 8E94D9D3084BEA32007F0AEB /* PBXTextBookmark */; + 8E98E5D308563D1B0078CAA1 = 8E98E5D308563D1B0078CAA1 /* PBXTextBookmark */; + 8E9BF08B082FB9DD00B26943 = 8E9BF08B082FB9DD00B26943 /* PBXTextBookmark */; + 8E9BF100082FEF6B00B26943 = 8E9BF100082FEF6B00B26943 /* PBXTextBookmark */; + 8EAB7544085621B10021C2BF = 8EAB7544085621B10021C2BF /* PBXTextBookmark */; + 8EAB7545085621B10021C2BF = 8EAB7545085621B10021C2BF /* PBXTextBookmark */; + 8EAB7549085621B10021C2BF = 8EAB7549085621B10021C2BF /* PBXBookmark */; + 8EAB754A085621B10021C2BF = 8EAB754A085621B10021C2BF /* PBXBookmark */; + 8EAB754B085621B10021C2BF = 8EAB754B085621B10021C2BF /* PBXBookmark */; + 8EAB754C085621B10021C2BF = 8EAB754C085621B10021C2BF /* PBXBookmark */; + 8EAB7553085621B10021C2BF = 8EAB7553085621B10021C2BF /* PBXBookmark */; + 8EAB7554085621B10021C2BF = 8EAB7554085621B10021C2BF /* PBXBookmark */; + 8EAB7555085621B10021C2BF = 8EAB7555085621B10021C2BF /* PBXBookmark */; + 8EAB755D085621B10021C2BF = 8EAB755D085621B10021C2BF /* PBXBookmark */; + 8EABE78408562281004DF882 = 8EABE78408562281004DF882 /* PBXBookmark */; + 8EABE78808562281004DF882 = 8EABE78808562281004DF882 /* PBXBookmark */; + 8EABE7C308562FF3004DF882 = 8EABE7C308562FF3004DF882 /* PBXBookmark */; + 8EABE7C408562FF3004DF882 = 8EABE7C408562FF3004DF882 /* PBXTextBookmark */; + 8EABE7C508562FF3004DF882 = 8EABE7C508562FF3004DF882 /* PBXTextBookmark */; + 8EABE7CA08562FF3004DF882 = 8EABE7CA08562FF3004DF882 /* PBXBookmark */; + 8EB30D8A0854BEF1009EA87F = 8EB30D8A0854BEF1009EA87F /* PBXTextBookmark */; + 8EB30D990854BEF1009EA87F = 8EB30D990854BEF1009EA87F /* PBXTextBookmark */; + 8EB30DAE0854BFEE009EA87F = 8EB30DAE0854BFEE009EA87F /* PBXTextBookmark */; + 8EB30DDB0854C261009EA87F = 8EB30DDB0854C261009EA87F /* PBXTextBookmark */; + 8EB30DDC0854C261009EA87F = 8EB30DDC0854C261009EA87F /* PBXTextBookmark */; + 8EB30DDD0854C261009EA87F = 8EB30DDD0854C261009EA87F /* PBXTextBookmark */; + 8EB30DDE0854C261009EA87F = 8EB30DDE0854C261009EA87F /* PBXTextBookmark */; + 8EB30DDF0854C261009EA87F = 8EB30DDF0854C261009EA87F /* PBXTextBookmark */; + 8EB30DE00854C261009EA87F = 8EB30DE00854C261009EA87F /* PBXTextBookmark */; + 8EB30E1F0854C36A009EA87F = 8EB30E1F0854C36A009EA87F /* PBXTextBookmark */; + 8EC156F9084FEB8900BB24E8 = 8EC156F9084FEB8900BB24E8 /* PBXTextBookmark */; + 8ED833CD08457E6B0033CDBD = 8ED833CD08457E6B0033CDBD /* PBXTextBookmark */; + 8EDC88A90842F8DE007D1532 = 8EDC88A90842F8DE007D1532 /* PBXTextBookmark */; + 8EDC88B50842F936007D1532 = 8EDC88B50842F936007D1532 /* PBXTextBookmark */; + 8EDCBDDB084061E500F5C7E3 = 8EDCBDDB084061E500F5C7E3 /* PBXTextBookmark */; + 8EDCBDDC084061E500F5C7E3 = 8EDCBDDC084061E500F5C7E3 /* PBXTextBookmark */; + 8EDE0CCC08369EB200EABFE4 = 8EDE0CCC08369EB200EABFE4 /* PBXTextBookmark */; + 8EE4A6C3082E6F6100415456 = 8EE4A6C3082E6F6100415456 /* PBXTextBookmark */; + 8EE4A6C8082E6F6100415456 = 8EE4A6C8082E6F6100415456 /* PBXTextBookmark */; + 8EE4A6FE082E704E00415456 = 8EE4A6FE082E704E00415456 /* PBXTextBookmark */; + 8EE4A799082E7D8700415456 = 8EE4A799082E7D8700415456 /* PBXTextBookmark */; + 8EE558070866A24B009E7F50 = 8EE558070866A24B009E7F50 /* PBXTextBookmark */; + 8EE558080866A24B009E7F50 = 8EE558080866A24B009E7F50 /* PBXTextBookmark */; + 8EE558090866A24B009E7F50 = 8EE558090866A24B009E7F50 /* PBXTextBookmark */; + 8EF45A7A08557C4D00D2D5D0 = 8EF45A7A08557C4D00D2D5D0 /* PBXTextBookmark */; + 8EF6FACD082DAA2B006F7BE6 = 8EF6FACD082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FAD1082DAA2B006F7BE6 = 8EF6FAD1082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FAD5082DAA2B006F7BE6 = 8EF6FAD5082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FAD6082DAA2B006F7BE6 = 8EF6FAD6082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FAD7082DAA2B006F7BE6 = 8EF6FAD7082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FAD8082DAA2B006F7BE6 = 8EF6FAD8082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FADA082DAA2B006F7BE6 = 8EF6FADA082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FADC082DAA2B006F7BE6 = 8EF6FADC082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FADD082DAA2B006F7BE6 = 8EF6FADD082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FADE082DAA2B006F7BE6 = 8EF6FADE082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FADF082DAA2B006F7BE6 = 8EF6FADF082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FAE1082DAA2B006F7BE6 = 8EF6FAE1082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FAEF082DAA2B006F7BE6 = 8EF6FAEF082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EF6FAF3082DAA2B006F7BE6 = 8EF6FAF3082DAA2B006F7BE6 /* PBXTextBookmark */; + 8EFC6D18085376D100C67D06 = 8EFC6D18085376D100C67D06 /* PBXTextBookmark */; + 8EFC6DE8085380B800C67D06 = 8EFC6DE8085380B800C67D06 /* PBXTextBookmark */; + 8EFC6DF0085380B800C67D06 = 8EFC6DF0085380B800C67D06 /* PBXTextBookmark */; + 8EFC6E29085386CE00C67D06 = 8EFC6E29085386CE00C67D06 /* PBXTextBookmark */; }; sourceControlManager = 8EB77466082DA402005891CA /* Source Control */; userBuildSettings = { @@ -274,9 +276,9 @@ }; 29B97316FDCFA39411CA2CEA /* main.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {711, 551}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {711, 551}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 546}}"; + sepNavSelRange = "{203, 47}"; + sepNavVisRect = "{{0, 0}, {775, 546}}"; sepNavWindowFrame = "{{15, 61}, {750, 680}}"; }; }; @@ -288,9 +290,9 @@ }; 8D1107310486CEB800E47090 /* Info.plist */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 1274}}"; - sepNavSelRange = "{501, 0}"; - sepNavVisRect = "{{0, 14}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 1470}}"; + sepNavSelRange = "{2194, 0}"; + sepNavVisRect = "{{0, 1083}, {775, 373}}"; sepNavWindowFrame = "{{15, 61}, {500, 680}}"; }; }; @@ -359,26 +361,6 @@ sepNavVisRect = "{{0, 1020}, {775, 372}}"; }; }; - 8E14E4A5084D089100246BCC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E3851EC084CEC0200D715B8 /* faad.h */; - name = "faad.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1096; - vrLoc = 227; - }; - 8E14E4B3084D089100246BCC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E3851EC084CEC0200D715B8 /* faad.h */; - name = "faad.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1096; - vrLoc = 227; - }; 8E14E4B4084D089100246BCC /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E14E479084CF1A200246BCC /* AACFile.h */; @@ -456,9 +438,9 @@ }; 8E267D070837F7A6004ACBC5 /* FeedbackSocket.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {983, 1848}}"; - sepNavSelRange = "{1512, 0}"; - sepNavVisRect = "{{0, 475}, {983, 310}}"; + sepNavIntBoundsRect = "{{0, 0}, {824, 1848}}"; + sepNavSelRange = "{584, 17}"; + sepNavVisRect = "{{0, 56}, {775, 546}}"; }; }; 8E267D090837F7A6004ACBC5 /* MacPADSocket.h */ = { @@ -472,7 +454,7 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 5600}}"; sepNavSelRange = "{7208, 5}"; - sepNavVisRect = "{{0, 2943}, {775, 372}}"; + sepNavVisRect = "{{0, 2856}, {775, 546}}"; }; }; 8E267D0B0837F7A6004ACBC5 /* UpdateController.h */ = { @@ -485,8 +467,8 @@ 8E267D0C0837F7A6004ACBC5 /* UpdateController.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1022, 2366}}"; - sepNavSelRange = "{3155, 0}"; - sepNavVisRect = "{{0, 1372}, {775, 546}}"; + sepNavSelRange = "{488, 6}"; + sepNavVisRect = "{{0, 42}, {775, 546}}"; }; }; 8E267D8C0837F963004ACBC5 /* PBXTextBookmark */ = { @@ -589,16 +571,6 @@ vrLen = 112; vrLoc = 0; }; - 8E2752B70850A92E001618CD /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E267D070837F7A6004ACBC5 /* FeedbackSocket.m */; - name = "FeedbackSocket.m: 45"; - rLen = 0; - rLoc = 1544; - rType = 0; - vrLen = 258; - vrLoc = 3429; - }; 8E2871080836934A0013CE39 /* VirtualRingBuffer.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {4550, 1246}}"; @@ -645,9 +617,9 @@ }; 8E287E480855F2EC00562C66 /* InfoView.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {775, 546}}"; + sepNavVisRect = "{{0, 0}, {775, 373}}"; }; }; 8E287E490855F2EC00562C66 /* InfoView.m */ = { @@ -687,16 +659,6 @@ vrLen = 825; vrLoc = 1533; }; - 8E287E830855F60E00562C66 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E287E480855F2EC00562C66 /* InfoView.h */; - name = "InfoView.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 79; - vrLoc = 0; - }; 8E297908083D891500F2C55A /* TrackingCell.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {983, 392}}"; @@ -723,13 +685,6 @@ vrLen = 65; vrLoc = 0; }; - 8E3851EC084CEC0200D715B8 /* faad.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = faad.h; - path = /Users/xugg/Desktop/faad2/include/faad.h; - sourceTree = ""; - }; 8E3EDBC9085477D0007C6A53 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E14E479084CF1A200246BCC /* AACFile.h */; @@ -761,8 +716,8 @@ 8E45227B0832898A00F8BA7C /* Sound.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1208, 10570}}"; - sepNavSelRange = "{19122, 0}"; - sepNavVisRect = "{{0, 10024}, {775, 546}}"; + sepNavSelRange = "{7974, 183}"; + sepNavVisRect = "{{0, 2006}, {775, 546}}"; sepNavWindowFrame = "{{15, 66}, {702, 680}}"; }; }; @@ -781,7 +736,7 @@ fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; name = "Sound.m: 15"; rLen = 0; - rLoc = 19655; + rLoc = 19656; rType = 0; vrLen = 182; vrLoc = 0; @@ -810,8 +765,8 @@ 8E47218808318D7A001F89FA /* PlaylistController.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {896, 7154}}"; - sepNavSelRange = "{8585, 0}"; - sepNavVisRect = "{{0, 5908}, {775, 546}}"; + sepNavSelRange = "{9523, 0}"; + sepNavVisRect = "{{0, 728}, {775, 373}}"; }; }; 8E47218908318D7A001F89FA /* PlaylistEntry.h */ = { @@ -933,8 +888,8 @@ 8E4721D208319294001F89FA /* AppController.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1340, 2086}}"; - sepNavSelRange = "{1071, 0}"; - sepNavVisRect = "{{0, 266}, {775, 546}}"; + sepNavSelRange = "{624, 0}"; + sepNavVisRect = "{{0, 1471}, {775, 373}}"; }; }; 8E4721D4083192C2001F89FA /* SoundController.h */ = { @@ -947,8 +902,8 @@ 8E4721D5083192C2001F89FA /* SoundController.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {950, 4522}}"; - sepNavSelRange = "{5440, 0}"; - sepNavVisRect = "{{0, 3175}, {775, 546}}"; + sepNavSelRange = "{6390, 0}"; + sepNavVisRect = "{{0, 3570}, {775, 546}}"; sepNavWindowFrame = "{{15, 61}, {1016, 680}}"; }; }; @@ -1002,16 +957,6 @@ vrLen = 526; vrLoc = 392; }; - 8E4D67210854D2E700816BEE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E8BAE5608548BE800E9F14D /* ShnFile.m */; - name = "ShnFile.m: 58"; - rLen = 0; - rLoc = 1136; - rType = 0; - vrLen = 637; - vrLoc = 598; - }; 8E4D67D40854E7B100816BEE /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E47218B08318D7A001F89FA /* PlaylistView.h */; @@ -1049,6 +994,26 @@ vrLen = 655; vrLoc = 2911; }; + 8E5F6DB1085781B900A111D9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8BAE5608548BE800E9F14D /* ShnFile.m */; + name = "ShnFile.m: 112"; + rLen = 0; + rLoc = 2042; + rType = 0; + vrLen = 575; + vrLoc = 1470; + }; + 8E5F6DB2085781B900A111D9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E45227A0832898A00F8BA7C /* Sound.h */; + name = "Sound.h: setSoundFile:"; + rLen = 0; + rLoc = 2925; + rType = 0; + vrLen = 780; + vrLoc = 266; + }; 8E6082C7083920310017AECF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E267D040837F7A6004ACBC5 /* FeedbackController.h */; @@ -1059,6 +1024,46 @@ vrLen = 583; vrLoc = 0; }; + 8E63F6C808587FD400C79B72 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E267D090837F7A6004ACBC5 /* MacPADSocket.h */; + name = "MacPADSocket.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1402; + vrLoc = 0; + }; + 8E63F6C908587FD400C79B72 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E267D0A0837F7A6004ACBC5 /* MacPADSocket.m */; + name = DBLog; + rLen = 5; + rLoc = 7208; + rType = 0; + vrLen = 1463; + vrLoc = 6505; + }; + 8E63F6CA08587FD400C79B72 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E267D0B0837F7A6004ACBC5 /* UpdateController.h */; + name = "UpdateController.h: 42"; + rLen = 0; + rLoc = 998; + rType = 0; + vrLen = 902; + vrLoc = 142; + }; + 8E63F6CB08587FD400C79B72 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 29B97316FDCFA39411CA2CEA /* main.m */; + name = "main.m: 15"; + rLen = 0; + rLoc = 253; + rType = 0; + vrLen = 253; + vrLoc = 0; + }; 8E6529B5083D8D7F00A7AF1B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E297909083D891500F2C55A /* TrackingCell.h */; @@ -1143,16 +1148,6 @@ vrLen = 65; vrLoc = 0; }; - 8E65357E08563F6A00E468D9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; - name = "Sound.m: 683"; - rLen = 0; - rLoc = 18262; - rType = 0; - vrLen = 792; - vrLoc = 18272; - }; 8E65357F08563F6A00E468D9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8EF6FA6D082DA526006F7BE6 /* SoundFile.h */; @@ -1173,76 +1168,6 @@ vrLen = 734; vrLoc = 0; }; - 8E65358108563F6A00E468D9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E45227A0832898A00F8BA7C /* Sound.h */; - name = "Sound.h: setSoundFile:"; - rLen = 0; - rLoc = 2925; - rType = 0; - vrLen = 780; - vrLoc = 266; - }; - 8E65358208563F6A00E468D9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; - name = "Sound.m: 683"; - rLen = 0; - rLoc = 18262; - rType = 0; - vrLen = 792; - vrLoc = 18272; - }; - 8E65358308563F6A00E468D9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */; - name = "SoundFile.m: 59"; - rLen = 0; - rLoc = 1149; - rType = 0; - vrLen = 1099; - vrLoc = 852; - }; - 8E65358408563F6A00E468D9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA6D082DA526006F7BE6 /* SoundFile.h */; - name = "SoundFile.h: 42"; - rLen = 0; - rLoc = 859; - rType = 0; - vrLen = 842; - vrLoc = 380; - }; - 8E65358508563F6A00E468D9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */; - name = "SoundFile.m: 176"; - rLen = 0; - rLoc = 3747; - rType = 0; - vrLen = 734; - vrLoc = 0; - }; - 8E65358608563F6A00E468D9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E45227A0832898A00F8BA7C /* Sound.h */; - name = "Sound.h: setSoundFile:"; - rLen = 0; - rLoc = 2925; - rType = 0; - vrLen = 780; - vrLoc = 266; - }; - 8E65359D0856401D00E468D9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; - name = "SoundController.m: 246"; - rLen = 0; - rLoc = 5440; - rType = 0; - vrLen = 933; - vrLoc = 5051; - }; 8E65359E0856401D00E468D9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E2871080836934A0013CE39 /* VirtualRingBuffer.h */; @@ -1253,35 +1178,35 @@ vrLen = 1460; vrLoc = 3376; }; - 8E65359F0856401D00E468D9 /* PBXTextBookmark */ = { + 8E657298086085E400A0DAC4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; - name = "SoundController.m: 246"; - rLen = 0; - rLoc = 5440; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + name = NSApplication; + rLen = 13; + rLoc = 2445; rType = 0; - vrLen = 933; - vrLoc = 5051; + vrLen = 927; + vrLoc = 1558; }; - 8E6535A00856401D00E468D9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E2871080836934A0013CE39 /* VirtualRingBuffer.h */; - name = "VirtualRingBuffer.h: 47"; - rLen = 0; - rLoc = 3334; - rType = 0; - vrLen = 1460; - vrLoc = 3376; - }; - 8E6535B60856432F00E468D9 /* PBXTextBookmark */ = { + 8E657299086085E400A0DAC4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; - name = "Sound.m: 730"; - rLen = 0; - rLoc = 19122; + name = "Sound.m: sendPortMessage:withData:ofSize:"; + rLen = 183; + rLoc = 7974; rType = 0; - vrLen = 756; - vrLoc = 18925; + vrLen = 991; + vrLoc = 4522; + }; + 8E65729A086085E400A0DAC4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D208319294001F89FA /* AppController.m */; + name = "AppController.m: 102"; + rLen = 0; + rLoc = 2823; + rType = 0; + vrLen = 921; + vrLoc = 3033; }; 8E72BC640851408F00E34F1D /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -1317,9 +1242,9 @@ }; 8E8BAE5608548BE800E9F14D /* ShnFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 1624}}"; - sepNavSelRange = "{1087, 0}"; - sepNavVisRect = "{{0, 507}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 1666}}"; + sepNavSelRange = "{2042, 0}"; + sepNavVisRect = "{{0, 1036}, {775, 546}}"; }; }; 8E8BAEB208548C9600E9F14D /* PBXTextBookmark */ = { @@ -1362,7 +1287,7 @@ functionName = "-open:"; hitCount = 0; lineNumber = 27; - modificationTime = 139870066.061937; + modificationTime = 139882046.224034; state = 1; }; 8E8BAF10085494E000E9F14D /* PBXTextBookmark */ = { @@ -1395,36 +1320,199 @@ vrLen = 811; vrLoc = 0; }; - 8E8F3F20085543D700BCF803 /* PBXTextBookmark */ = { + 8E8C7BFB085E9CD50086DAC7 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 8E267D090837F7A6004ACBC5 /* MacPADSocket.h */; - name = "MacPADSocket.h: 1"; + fRef = 8E267D0C0837F7A6004ACBC5 /* UpdateController.m */; + name = cogosx; + rLen = 6; + rLoc = 488; + rType = 0; + vrLen = 1059; + vrLoc = 34; + }; + 8E8C7C14085E9DA50086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E267D070837F7A6004ACBC5 /* FeedbackSocket.m */; + name = NSAutoreleasePool; + rLen = 17; + rLoc = 584; + rType = 0; + vrLen = 1359; + vrLoc = 35; + }; + 8E8C7C7F085EA5E30086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8C7C80085EA5E30086DAC7 /* main.m */; + name = "(null): 1"; rLen = 0; rLoc = 0; rType = 0; - vrLen = 1402; + vrLen = 2160; + vrLoc = 590; + }; + 8E8C7C80085EA5E30086DAC7 /* main.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = main.m; + path = /Developer/Examples/InterfaceBuilder/SimpleMultiWindow/main.m; + sourceTree = ""; + }; + 8E8C7C81085EA5E30086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8C7C82085EA5E30086DAC7 /* main.m */; + name = "(null): 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 2245; + vrLoc = 610; + }; + 8E8C7C82085EA5E30086DAC7 /* main.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = main.m; + path = /Developer/Examples/InterfaceBuilder/ControllerPlay/main.m; + sourceTree = ""; + }; + 8E8C7C83085EA5E30086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8C7C84085EA5E30086DAC7 /* mainWindowHandler.c */; + name = "(null): 87"; + rLen = 1458; + rLoc = 4152; + rType = 0; + vrLen = 1002; + vrLoc = 4609; + }; + 8E8C7C84085EA5E30086DAC7 /* mainWindowHandler.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = mainWindowHandler.c; + path = /Developer/Examples/InterfaceBuilder/IBCarbonDialogExample/mainWindowHandler.c; + sourceTree = ""; + }; + 8E8C7C85085EA5E30086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8C7C86085EA5E30086DAC7 /* mainWindowHandler.h */; + name = "(null): 45"; + rLen = 171; + rLoc = 2672; + rType = 0; + vrLen = 2022; + vrLoc = 829; + }; + 8E8C7C86085EA5E30086DAC7 /* mainWindowHandler.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = mainWindowHandler.h; + path = /Developer/Examples/InterfaceBuilder/IBCarbonDialogExample/mainWindowHandler.h; + sourceTree = ""; + }; + 8E8C7C8C085EA5E30086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8C7C8D085EA5E30086DAC7 /* main.m */; + name = "(null): 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 2160; + vrLoc = 590; + }; + 8E8C7C8D085EA5E30086DAC7 /* main.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = main.m; + path = /Developer/Examples/InterfaceBuilder/SimpleMultiWindow/main.m; + sourceTree = ""; + }; + 8E8C7C8E085EA5E30086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8C7C8F085EA5E30086DAC7 /* main.m */; + name = "(null): 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 2245; + vrLoc = 610; + }; + 8E8C7C8F085EA5E30086DAC7 /* main.m */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.objc; + name = main.m; + path = /Developer/Examples/InterfaceBuilder/ControllerPlay/main.m; + sourceTree = ""; + }; + 8E8C7C90085EA5E30086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8C7C91085EA5E30086DAC7 /* main.c */; + name = "(null): 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1521; + vrLoc = 1408; + }; + 8E8C7C91085EA5E30086DAC7 /* main.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = main.c; + path = /Developer/Examples/InterfaceBuilder/IBCarbonDialogExample/main.c; + sourceTree = ""; + }; + 8E8C7C92085EA5E30086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8C7C93085EA5E30086DAC7 /* mainWindowHandler.c */; + name = "(null): 72"; + rLen = 0; + rLoc = 3775; + rType = 0; + vrLen = 1450; + vrLoc = 3101; + }; + 8E8C7C93085EA5E30086DAC7 /* mainWindowHandler.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = mainWindowHandler.c; + path = /Developer/Examples/InterfaceBuilder/IBCarbonDialogExample/mainWindowHandler.c; + sourceTree = ""; + }; + 8E8C7C98085EA5E30086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8C7C99085EA5E30086DAC7 /* mainWindowHandler.h */; + name = "(null): 45"; + rLen = 171; + rLoc = 2672; + rType = 0; + vrLen = 2022; + vrLoc = 829; + }; + 8E8C7C99085EA5E30086DAC7 /* mainWindowHandler.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = mainWindowHandler.h; + path = /Developer/Examples/InterfaceBuilder/IBCarbonDialogExample/mainWindowHandler.h; + sourceTree = ""; + }; + 8E8C7D35085EAD460086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8C7C91085EA5E30086DAC7 /* main.c */; + name = ""; + rLen = 2; + rLoc = 2833; + rType = 0; + vrLen = 1603; + vrLoc = 1326; + }; + 8E8C7D36085EAD460086DAC7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 29B97316FDCFA39411CA2CEA /* main.m */; + name = "NSApplicationMain(argc, (const char **) argv);"; + rLen = 47; + rLoc = 203; + rType = 0; + vrLen = 253; vrLoc = 0; }; - 8E8F3F21085543D700BCF803 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E267D0B0837F7A6004ACBC5 /* UpdateController.h */; - name = "UpdateController.h: takeBoolFromObject:"; - rLen = 0; - rLoc = 998; - rType = 0; - vrLen = 902; - vrLoc = 142; - }; - 8E8F3F22085543D700BCF803 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E267D0C0837F7A6004ACBC5 /* UpdateController.m */; - name = "UpdateController.m: 127"; - rLen = 0; - rLoc = 3155; - rType = 0; - vrLen = 1586; - vrLoc = 2232; - }; 8E8F3F59085546B300BCF803 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E47218708318D7A001F89FA /* PlaylistController.h */; @@ -1457,7 +1545,7 @@ fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; name = "PlaylistController.m: setShuffle:"; rLen = 0; - rLoc = 8585; + rLoc = 8647; rType = 0; vrLen = 472; vrLoc = 8263; @@ -1482,6 +1570,16 @@ vrLen = 365; vrLoc = 0; }; + 8E94AFB2086639760038E585 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 279"; + rLen = 0; + rLoc = 6390; + rType = 0; + vrLen = 1084; + vrLoc = 5645; + }; 8E94D9D2084BEA32007F0AEB /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E0EBF0D084BA776003A6E64 /* DBLog.c */; @@ -1623,16 +1721,6 @@ vrLen = 1103; vrLoc = 0; }; - 8EABE7C608562FF3004DF882 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E4721D208319294001F89FA /* AppController.m */; - name = "AppController.m: delEntries:"; - rLen = 0; - rLoc = 1071; - rType = 0; - vrLen = 759; - vrLoc = 765; - }; 8EABE7CA08562FF3004DF882 /* PBXBookmark */ = { isa = PBXBookmark; fRef = 8EAFD27408465E5600107BA5 /* pause_blue.png */; @@ -1783,16 +1871,6 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - 8EC156F5084FEB8900BB24E8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E267D0A0837F7A6004ACBC5 /* MacPADSocket.m */; - name = DBLog; - rLen = 5; - rLoc = 7208; - rType = 0; - vrLen = 957; - vrLoc = 6740; - }; 8EC156F9084FEB8900BB24E8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E267D0A0837F7A6004ACBC5 /* MacPADSocket.m */; @@ -1803,30 +1881,6 @@ vrLen = 957; vrLoc = 6740; }; - 8EC18EB9084E57D500AE0BA9 /* libmp4.c */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = libmp4.c; - path = /Users/xugg/Desktop/faad2/plugins/xmms/src/libmp4.c; - sourceTree = ""; - }; - 8EC18EBD084E57D500AE0BA9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EC18EBE084E57D500AE0BA9 /* libmp4.c */; - name = "(null): 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 578; - vrLoc = 0; - }; - 8EC18EBE084E57D500AE0BA9 /* libmp4.c */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - name = libmp4.c; - path = /Users/xugg/Desktop/faad2/plugins/xmms/src/libmp4.c; - sourceTree = ""; - }; 8ED833CD08457E6B0033CDBD /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E47218608318D7A001F89FA /* DNDArrayController.m */; @@ -1847,7 +1901,7 @@ functionName = "+readInfo:"; hitCount = 0; lineNumber = 124; - modificationTime = 139870046.137529; + modificationTime = 139882034.259393; state = 2; }; 8EDC88A90842F8DE007D1532 /* PBXTextBookmark */ = { @@ -1914,16 +1968,6 @@ vrLen = 1069; vrLoc = 3336; }; - 8EE2A5B808511A1800367489 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - name = "Info.plist: 18"; - rLen = 0; - rLoc = 501; - rType = 0; - vrLen = 677; - vrLoc = 39; - }; 8EE4A6C3082E6F6100415456 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8EF6FA6A082DA526006F7BE6 /* MPEGFile.m */; @@ -1964,6 +2008,36 @@ vrLen = 761; vrLoc = 0; }; + 8EE558070866A24B009E7F50 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E287E480855F2EC00562C66 /* InfoView.h */; + name = "InfoView.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 79; + vrLoc = 0; + }; + 8EE558080866A24B009E7F50 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E287E480855F2EC00562C66 /* InfoView.h */; + name = "InfoView.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 79; + vrLoc = 0; + }; + 8EE558090866A24B009E7F50 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + name = "Info.plist: 92"; + rLen = 0; + rLoc = 2194; + rType = 0; + vrLen = 679; + vrLoc = 1806; + }; 8EEFDF8808410C00008BB533 /* SoundController.m:275 */ = { isa = PBXFileBreakpoint; actions = ( @@ -1974,18 +2048,20 @@ functionName = "-handlePortMessage:"; hitCount = 0; lineNumber = 275; - modificationTime = 139870046.13733; + modificationTime = 139882034.259246; state = 2; }; 8EF1B97C083A49980095B236 /* PlaylistController.m:386 */ = { isa = PBXFileBreakpoint; + actions = ( + ); continueAfterActions = 0; delayBeforeContinue = 0; fileReference = 8E47218808318D7A001F89FA /* PlaylistController.m */; functionName = "-currentEntry"; hitCount = 0; lineNumber = 386; - modificationTime = 139870046.081174; + modificationTime = 139882034.217395; state = 2; }; 8EF45A7A08557C4D00D2D5D0 /* PBXTextBookmark */ = { @@ -2276,16 +2352,6 @@ vrLen = 272; vrLoc = 0; }; - 8EFC6DE7085380B800C67D06 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EC18EB9084E57D500AE0BA9 /* libmp4.c */; - name = "libmp4.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 578; - vrLoc = 0; - }; 8EFC6DE8085380B800C67D06 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8EF6FA6B082DA526006F7BE6 /* MusepackFile.h */; diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib index 559df81a1..56599ffc8 100644 --- a/English.lproj/MainMenu.nib/info.nib +++ b/English.lproj/MainMenu.nib/info.nib @@ -19,9 +19,9 @@ IBOpenObjects + 463 29 21 - 463 IBSystem Version 8B15 diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index 95b935f4b0790b714f4faf897b2f627beb6cbb99..13760412d7b87fe6de5d8f9ae48e2697b29f8b9b 100644 GIT binary patch delta 8948 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 delta 82 zcmZoMXffEJ!NkT8#lXOzI9ZQLcXA_>79-!}HB1_lS24+mWG1KQC*|ZP0i`*B7z9`* iKVnjwe1%DHvLv(8WKL#*&ECv=SSB{GY-Z>9%MSo6-xOm2 diff --git a/Libraries/SOURCES b/Libraries/SOURCES index caf5117a9..8e7c18ef6 100644 --- a/Libraries/SOURCES +++ b/Libraries/SOURCES @@ -6,3 +6,5 @@ MPCDec: musepack.net Ogg Vorbis: xiph.org SndFile: http://www.mega-nerd.com/libsndfile/ TagLib: http://jakarta.apache.org/taglibs/ +Wavpack: http://www.wavpack.com +Shorten: http://fondriest.frederic.free.fr/realisations/lamip/files/src/testing/contrib/ \ No newline at end of file diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index d1c3fa7eb..0c59678ac 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -36,7 +36,7 @@ - (int)insertFile:(NSString *)filename atIndex:(int)index { - if ([acceptableFileTypes containsObject:[filename pathExtension]]) + if ([acceptableFileTypes containsObject:[filename pathExtension]] && [[NSFileManager defaultManager] fileExistsAtPath:filename]) { PlaylistEntry *pe = [[PlaylistEntry alloc] init]; diff --git a/README b/README index ed9519062..4a862a0a6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------------- +--------------------------------------------------------------------------- NOTE ABOUT BUTTONS: If you are under impression that the buttons are acting strange, they actually may be acting as intended. The back button goes through @@ -8,8 +8,8 @@ had shuffle mode on, and then turned it off, you could go back through the songs played during shuffle mode. The forward button acts as expected, where if shuffle is on, it will pick a random song, and if not it goes to the next song in the playlist. - Please comment on, whether you like this behaviour or not! ------------------------------------------------------------------------------------- + Please comment, whether you like this behaviour or not! +--------------------------------------------------------------------------- Cog is released under the GPL. See COPYING for details. @@ -18,14 +18,14 @@ libraries, which i have created Xcode projects for, and possibly modified to make compile on OS X. The various libraries are under each of their own licenses. - Please note that vulgar language may be contained in the source code. It is rated -M for mature by the ESRB, the MPAA, and whatever else deems it unsuitable for virgin -ears. - - All Cog code is copywrited by me, and is licensed under the GPL. + Please note that vulgar language may be contained in the source code. +It is rated M for mature by the ESRB, the MPAA, and whatever else deems it +unsuitable for virgin ears. + All Cog code is copywrited by me, and is licensed under the GPL. + If you would like the photoshop sources for the various icons and graphics, please send me an email, and I will be happy to get them to you. -Share and enjoy. + Share and enjoy. --Vincent Spader (vspader@users.sf.net) diff --git a/Sound.m b/Sound.m index 4e2b89ae6..463194694 100644 --- a/Sound.m +++ b/Sound.m @@ -28,7 +28,7 @@ //#define RING_BUFFER_SIZE 1048576 //#define BUFFER_WRITE_CHUNK 32768 -#define FEEDER_THREAD_IMPORTANCE 4 +#define FEEDER_THREAD_IMPORTANCE 10 //timeout should be smaller than the time itd take for the buffer to run dry...looks like were ironclad #define TIMEOUT 1 diff --git a/SoundFile/ShnFile.m b/SoundFile/ShnFile.m index e2ccd3683..e2eae7bab 100644 --- a/SoundFile/ShnFile.m +++ b/SoundFile/ShnFile.m @@ -108,6 +108,9 @@ - (void)close { + if (buffer) + free(buffer); + if (shn_cleanup_decoder(handle)) shn_unload(handle); }