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 95b935f4b..13760412d 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Libraries/MAC/.DS_Store b/Libraries/MAC/.DS_Store index 138949646..0ce1f6eea 100644 Binary files a/Libraries/MAC/.DS_Store and b/Libraries/MAC/.DS_Store differ 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); }