diff --git a/Cog.xcodeproj/xugg.mode1 b/Cog.xcodeproj/xugg.mode1
index a0a9b5354..29998fe02 100644
--- a/Cog.xcodeproj/xugg.mode1
+++ b/Cog.xcodeproj/xugg.mode1
@@ -255,20 +255,20 @@
29B97314FDCFA39411CA2CEA
080E96DDFE201D6D7F000001
+ 8EF6FA64082DA525006F7BE6
29B97317FDCFA39411CA2CEA
- 8EAFD26D08465E4500107BA5
1C37FABC05509CD000000102
PBXSmartGroupTreeModuleOutlineStateSelectionKey
- 14
+ 36
1
0
PBXSmartGroupTreeModuleOutlineStateVisibleRectKey
- {{0, 0}, {186, 565}}
+ {{0, 438}, {186, 565}}
PBXTopSmartGroupGIDs
@@ -305,7 +305,7 @@
PBXProjectModuleGUID
1CE0B20306471E060097A5F4
PBXProjectModuleLabel
- SoundController.m
+ Sound.m
PBXSplitModuleInNavigatorKey
Split0
@@ -313,11 +313,11 @@
PBXProjectModuleGUID
1CE0B20406471E060097A5F4
PBXProjectModuleLabel
- SoundController.m
+ Sound.m
_historyCapacity
0
bookmark
- 8EABE78B08562281004DF882
+ 8E6535B60856432F00E468D9
history
8EF6FACD082DAA2B006F7BE6
@@ -338,7 +338,6 @@
8E14E4A5084D089100246BCC
8EC156F5084FEB8900BB24E8
8E2752B70850A92E001618CD
- 8E2BC83D0850F56200BEAC36
8EE2A5B808511A1800367489
8E72BC640851408F00E34F1D
8EFC6D18085376D100C67D06
@@ -347,12 +346,9 @@
8EFC6DF0085380B800C67D06
8EFC6E29085386CE00C67D06
8E3EDBC9085477D0007C6A53
- 8E3EDBCF085477D0007C6A53
- 8E3EDBD1085477D0007C6A53
8E8BAF10085494E000E9F14D
8E8BAF790854976A00E9F14D
8E91CCEE08549FEE0055EC68
- 8EB30D890854BEF1009EA87F
8EB30D8A0854BEF1009EA87F
8EB30DAE0854BFEE009EA87F
8EB30DDB0854C261009EA87F
@@ -362,7 +358,6 @@
8EB30DDF0854C261009EA87F
8EB30DE00854C261009EA87F
8EB30E1F0854C36A009EA87F
- 8EB30E200854C36A009EA87F
8E4D66E90854CD2C00816BEE
8E4D66EA0854CD2C00816BEE
8E4D67210854D2E700816BEE
@@ -370,29 +365,33 @@
8E8F3F20085543D700BCF803
8E8F3F21085543D700BCF803
8E8F3F22085543D700BCF803
- 8E8F3F23085543D700BCF803
- 8E8F3F400855457A00BCF803
8E8F3F59085546B300BCF803
8E8F3F780855483300BCF803
- 8E8F3F790855483300BCF803
8E8F3FA408554B8000BCF803
8EF45A7A08557C4D00D2D5D0
8E287CDC0855D60A00562C66
8E287CDD0855D60A00562C66
- 8E287E580855F35400562C66
8E287E7F0855F60E00562C66
8E287E830855F60E00562C66
8EAB7544085621B10021C2BF
8EAB7545085621B10021C2BF
- 8EAB7547085621B10021C2BF
8EAB7549085621B10021C2BF
8EAB754A085621B10021C2BF
8EAB754B085621B10021C2BF
8EAB754C085621B10021C2BF
8EABE78408562281004DF882
- 8EABE78508562281004DF882
- 8EABE78608562281004DF882
- 8EABE78708562281004DF882
+ 8EABE7C308562FF3004DF882
+ 8EABE7C408562FF3004DF882
+ 8EABE7C508562FF3004DF882
+ 8EABE7C608562FF3004DF882
+ 8E5CC5020856316C00A299E0
+ 8E98E5D308563D1B0078CAA1
+ 8E65357F08563F6A00E468D9
+ 8E65358008563F6A00E468D9
+ 8E65358108563F6A00E468D9
+ 8E65359D0856401D00E468D9
+ 8E65359E0856401D00E468D9
+ 8E65357E08563F6A00E468D9
prevStack
@@ -454,8 +453,6 @@
8E14E4B5084D089100246BCC
8EC18EBD084E57D500AE0BA9
8EC156F9084FEB8900BB24E8
- 8E3EDBE0085477D0007C6A53
- 8E3EDBE4085477D0007C6A53
8E8BAEB208548C9600E9F14D
8E8BAEB308548C9600E9F14D
8E8BAEB708548C9600E9F14D
@@ -469,8 +466,14 @@
8EAB7555085621B10021C2BF
8EAB755D085621B10021C2BF
8EABE78808562281004DF882
- 8EABE78908562281004DF882
- 8EABE78A08562281004DF882
+ 8EABE7CA08562FF3004DF882
+ 8E65358208563F6A00E468D9
+ 8E65358308563F6A00E468D9
+ 8E65358408563F6A00E468D9
+ 8E65358508563F6A00E468D9
+ 8E65358608563F6A00E468D9
+ 8E65359F0856401D00E468D9
+ 8E6535A00856401D00E468D9
SplitCount
@@ -528,9 +531,9 @@
TableOfContents
- 8EABE78C08562281004DF882
+ 8E65358808563F6A00E468D9
1CE0B1FE06471DED0097A5F4
- 8EABE78D08562281004DF882
+ 8E65358908563F6A00E468D9
1CE0B20306471E060097A5F4
1CE0B20506471E060097A5F4
@@ -664,6 +667,11 @@
5
WindowOrderList
+ 8E65359208563F6A00E468D9
+ 8E65359308563F6A00E468D9
+ 8E7A9371083675B600771E14
+ 1CD10A99069EF8BA00B06720
+ 8E65359008563F6A00E468D9
1C0AD2B3069F1EA900FABCE6
/Users/xugg/Projects/Cog/Cog.xcodeproj
@@ -691,7 +699,7 @@
PBXProjectModuleGUID
1CD0528F0623707200166675
PBXProjectModuleLabel
- AppController.m
+ Sound.m
StatusBarVisibility
@@ -747,7 +755,7 @@
TableOfContents
8EF6FAA6082DA951006F7BE6
- 8E287D1F0855DA8900562C66
+ 8E98E5B808563ADC0078CAA1
1CD0528F0623707200166675
XCMainBuildResultsModuleGUID
@@ -789,8 +797,8 @@
yes
sizes
- {{0, 0}, {184, 198}}
- {{184, 0}, {840, 198}}
+ {{0, 0}, {163, 194}}
+ {{163, 0}, {861, 194}}
VerticalSplitView
@@ -805,8 +813,8 @@
yes
sizes
- {{0, 0}, {1024, 198}}
- {{0, 198}, {1024, 386}}
+ {{0, 0}, {1024, 194}}
+ {{0, 194}, {1024, 390}}
@@ -853,14 +861,14 @@
TableOfContents
1CD10A99069EF8BA00B06720
- 8E8F3E55085538AB00BCF803
+ 8E65358A08563F6A00E468D9
1C162984064C10D400B95A72
- 8E8F3E56085538AB00BCF803
- 8E8F3E57085538AB00BCF803
- 8E8F3E58085538AB00BCF803
- 8E8F3E59085538AB00BCF803
- 8E8F3E5A085538AB00BCF803
- 8E8F3E5B085538AB00BCF803
+ 8E65358B08563F6A00E468D9
+ 8E65358C08563F6A00E468D9
+ 8E65358D08563F6A00E468D9
+ 8E65358E08563F6A00E468D9
+ 8E65358F08563F6A00E468D9
+ 8E65359008563F6A00E468D9
ToolbarConfiguration
xcode.toolbar.config.debug
@@ -892,7 +900,7 @@
PBXProjectModuleGUID
1CDD528C0622207200134675
PBXProjectModuleLabel
- Sound.m
+ DBLog.c
StatusBarVisibility
@@ -950,8 +958,8 @@
TableOfContents
1C530D57069F1CE1000CFCEE
- 8E4D67990854E47400816BEE
- 8E4D679A0854E47400816BEE
+ 8E37C10A0856312D00A0FFA6
+ 8E37C10B0856312D00A0FFA6
1CDD528C0622207200134675
1CD0528E0623707200166675
@@ -960,7 +968,7 @@
WindowToolGUID
1C530D57069F1CE1000CFCEE
WindowToolIsVisible
-
+
Identifier
@@ -1014,7 +1022,7 @@
TableOfContents
8E7A9371083675B600771E14
- 8E8F3E5C085538AB00BCF803
+ 8E65359108563F6A00E468D9
1C78EAAC065D492600B07095
WindowString
@@ -1059,8 +1067,8 @@
yes
sizes
- {{0, 0}, {367, 168}}
- {{0, 173}, {367, 270}}
+ {{0, 0}, {493, 168}}
+ {{0, 173}, {493, 270}}
VerticalSplitView
@@ -1109,9 +1117,9 @@
TableOfContents
1C0AD2B3069F1EA900FABCE6
- 8EABE77B085621E4004DF882
+ 8E65356C08563D5600E468D9
1CD0528B0623707200166675
- 8EABE77C085621E4004DF882
+ 8E65356D08563D5600E468D9
ToolbarConfiguration
xcode.toolbar.config.run
diff --git a/Cog.xcodeproj/xugg.pbxuser b/Cog.xcodeproj/xugg.pbxuser
index 2e4c63fdc..63d44c503 100644
--- a/Cog.xcodeproj/xugg.pbxuser
+++ b/Cog.xcodeproj/xugg.pbxuser
@@ -111,178 +111,162 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 139862467;
- PBXWorkspaceStateSaveDate = 139862467;
+ PBXPerProjectTemplateStateSaveDate = 139869480;
+ PBXWorkspaceStateSaveDate = 139869480;
};
perUserProjectItems = {
- 8E0EBF58084BAA56003A6E64 = 8E0EBF58084BAA56003A6E64 /* PBXTextBookmark */;
- 8E0EBF59084BAA56003A6E64 = 8E0EBF59084BAA56003A6E64 /* PBXTextBookmark */;
- 8E10DC08084BBE490013815C = 8E10DC08084BBE490013815C /* PBXTextBookmark */;
- 8E14E4A5084D089100246BCC = 8E14E4A5084D089100246BCC /* PBXTextBookmark */;
- 8E14E4B3084D089100246BCC = 8E14E4B3084D089100246BCC /* 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 */;
- 8E2752B70850A92E001618CD = 8E2752B70850A92E001618CD /* PBXTextBookmark */;
- 8E287164083695080013CE39 = 8E287164083695080013CE39 /* PBXTextBookmark */;
- 8E287CDC0855D60A00562C66 = 8E287CDC0855D60A00562C66 /* PBXTextBookmark */;
- 8E287CDD0855D60A00562C66 = 8E287CDD0855D60A00562C66 /* PBXTextBookmark */;
- 8E287E580855F35400562C66 = 8E287E580855F35400562C66 /* PBXTextBookmark */;
- 8E287E5D0855F35400562C66 = 8E287E5D0855F35400562C66 /* PBXTextBookmark */;
- 8E287E5E0855F35400562C66 = 8E287E5E0855F35400562C66 /* PBXTextBookmark */;
- 8E287E7F0855F60E00562C66 = 8E287E7F0855F60E00562C66 /* PBXTextBookmark */;
- 8E287E830855F60E00562C66 = 8E287E830855F60E00562C66 /* PBXTextBookmark */;
- 8E297910083D892800F2C55A = 8E297910083D892800F2C55A /* PBXTextBookmark */;
- 8E2BC83D0850F56200BEAC36 = 8E2BC83D0850F56200BEAC36 /* PBXTextBookmark */;
- 8E3EDBC9085477D0007C6A53 = 8E3EDBC9085477D0007C6A53 /* PBXTextBookmark */;
- 8E3EDBCF085477D0007C6A53 = 8E3EDBCF085477D0007C6A53 /* PBXTextBookmark */;
- 8E3EDBD1085477D0007C6A53 = 8E3EDBD1085477D0007C6A53 /* PBXTextBookmark */;
- 8E3EDBE0085477D0007C6A53 = 8E3EDBE0085477D0007C6A53 /* PBXTextBookmark */;
- 8E3EDBE4085477D0007C6A53 = 8E3EDBE4085477D0007C6A53 /* 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 */;
- 8E4D67210854D2E700816BEE = 8E4D67210854D2E700816BEE /* PBXTextBookmark */;
- 8E4D67D40854E7B100816BEE = 8E4D67D40854E7B100816BEE /* PBXTextBookmark */;
- 8E5A90BB084CC25900AE6D62 = 8E5A90BB084CC25900AE6D62 /* PBXTextBookmark */;
- 8E6082C7083920310017AECF = 8E6082C7083920310017AECF /* PBXTextBookmark */;
- 8E6529B5083D8D7F00A7AF1B = 8E6529B5083D8D7F00A7AF1B /* PBXTextBookmark */;
- 8E652A33083E1A7900A7AF1B = 8E652A33083E1A7900A7AF1B /* PBXTextBookmark */;
- 8E652A34083E1A7900A7AF1B = 8E652A34083E1A7900A7AF1B /* PBXTextBookmark */;
- 8E652A35083E1A7900A7AF1B = 8E652A35083E1A7900A7AF1B /* PBXTextBookmark */;
- 8E652A36083E1A7900A7AF1B = 8E652A36083E1A7900A7AF1B /* PBXTextBookmark */;
- 8E652A39083E1A7900A7AF1B = 8E652A39083E1A7900A7AF1B /* PBXTextBookmark */;
- 8E652A3A083E1A7900A7AF1B = 8E652A3A083E1A7900A7AF1B /* PBXTextBookmark */;
- 8E72BC640851408F00E34F1D = 8E72BC640851408F00E34F1D /* PBXTextBookmark */;
- 8E8BAEB208548C9600E9F14D = 8E8BAEB208548C9600E9F14D /* PBXTextBookmark */;
- 8E8BAEB308548C9600E9F14D = 8E8BAEB308548C9600E9F14D /* PBXTextBookmark */;
- 8E8BAEB708548C9600E9F14D = 8E8BAEB708548C9600E9F14D /* PBXTextBookmark */;
- 8E8BAF10085494E000E9F14D = 8E8BAF10085494E000E9F14D /* PBXTextBookmark */;
- 8E8BAF17085494E000E9F14D = 8E8BAF17085494E000E9F14D /* PBXTextBookmark */;
- 8E8BAF790854976A00E9F14D = 8E8BAF790854976A00E9F14D /* PBXTextBookmark */;
- 8E8F3F20085543D700BCF803 = 8E8F3F20085543D700BCF803 /* PBXTextBookmark */;
- 8E8F3F21085543D700BCF803 = 8E8F3F21085543D700BCF803 /* PBXTextBookmark */;
- 8E8F3F22085543D700BCF803 = 8E8F3F22085543D700BCF803 /* PBXTextBookmark */;
- 8E8F3F23085543D700BCF803 = 8E8F3F23085543D700BCF803 /* PBXTextBookmark */;
- 8E8F3F400855457A00BCF803 = 8E8F3F400855457A00BCF803 /* PBXTextBookmark */;
- 8E8F3F59085546B300BCF803 = 8E8F3F59085546B300BCF803 /* PBXTextBookmark */;
- 8E8F3F780855483300BCF803 = 8E8F3F780855483300BCF803 /* PBXTextBookmark */;
- 8E8F3F790855483300BCF803 = 8E8F3F790855483300BCF803 /* PBXTextBookmark */;
- 8E8F3FA408554B8000BCF803 = 8E8F3FA408554B8000BCF803 /* PBXTextBookmark */;
- 8E8F3FA608554B8000BCF803 = 8E8F3FA608554B8000BCF803 /* PBXTextBookmark */;
- 8E8F3FAE08554B8000BCF803 = 8E8F3FAE08554B8000BCF803 /* PBXTextBookmark */;
- 8E91CCEE08549FEE0055EC68 = 8E91CCEE08549FEE0055EC68 /* PBXTextBookmark */;
- 8E94D9D2084BEA32007F0AEB = 8E94D9D2084BEA32007F0AEB /* PBXTextBookmark */;
- 8E94D9D3084BEA32007F0AEB = 8E94D9D3084BEA32007F0AEB /* PBXTextBookmark */;
- 8E9BF08B082FB9DD00B26943 = 8E9BF08B082FB9DD00B26943 /* PBXTextBookmark */;
- 8E9BF100082FEF6B00B26943 = 8E9BF100082FEF6B00B26943 /* PBXTextBookmark */;
- 8EAB7543085621B00021C2BF = 8EAB7543085621B00021C2BF /* PBXBookmark */;
- 8EAB7544085621B10021C2BF = 8EAB7544085621B10021C2BF /* PBXTextBookmark */;
- 8EAB7545085621B10021C2BF = 8EAB7545085621B10021C2BF /* PBXTextBookmark */;
- 8EAB7546085621B10021C2BF = 8EAB7546085621B10021C2BF /* PBXTextBookmark */;
- 8EAB7547085621B10021C2BF = 8EAB7547085621B10021C2BF /* PBXTextBookmark */;
- 8EAB7548085621B10021C2BF = 8EAB7548085621B10021C2BF /* PBXTextBookmark */;
- 8EAB7549085621B10021C2BF = 8EAB7549085621B10021C2BF /* PBXBookmark */;
- 8EAB754A085621B10021C2BF = 8EAB754A085621B10021C2BF /* PBXBookmark */;
- 8EAB754B085621B10021C2BF = 8EAB754B085621B10021C2BF /* PBXBookmark */;
- 8EAB754C085621B10021C2BF = 8EAB754C085621B10021C2BF /* PBXBookmark */;
- 8EAB754D085621B10021C2BF = 8EAB754D085621B10021C2BF /* PBXBookmark */;
- 8EAB754E085621B10021C2BF = 8EAB754E085621B10021C2BF /* PBXTextBookmark */;
- 8EAB754F085621B10021C2BF = 8EAB754F085621B10021C2BF /* PBXTextBookmark */;
- 8EAB7550085621B10021C2BF = 8EAB7550085621B10021C2BF /* PBXTextBookmark */;
- 8EAB7551085621B10021C2BF = 8EAB7551085621B10021C2BF /* PBXTextBookmark */;
- 8EAB7552085621B10021C2BF = 8EAB7552085621B10021C2BF /* PBXTextBookmark */;
- 8EAB7553085621B10021C2BF = 8EAB7553085621B10021C2BF /* PBXBookmark */;
- 8EAB7554085621B10021C2BF = 8EAB7554085621B10021C2BF /* PBXBookmark */;
- 8EAB7555085621B10021C2BF = 8EAB7555085621B10021C2BF /* PBXBookmark */;
- 8EAB7556085621B10021C2BF = 8EAB7556085621B10021C2BF /* PBXBookmark */;
- 8EAB7557085621B10021C2BF = 8EAB7557085621B10021C2BF /* PBXBookmark */;
- 8EAB7558085621B10021C2BF = 8EAB7558085621B10021C2BF /* PBXBookmark */;
- 8EAB7559085621B10021C2BF = 8EAB7559085621B10021C2BF /* PBXBookmark */;
- 8EAB755A085621B10021C2BF = 8EAB755A085621B10021C2BF /* PBXBookmark */;
- 8EAB755B085621B10021C2BF = 8EAB755B085621B10021C2BF /* PBXBookmark */;
- 8EAB755C085621B10021C2BF = 8EAB755C085621B10021C2BF /* PBXBookmark */;
- 8EAB755D085621B10021C2BF = 8EAB755D085621B10021C2BF /* PBXBookmark */;
- 8EAB755E085621B10021C2BF = 8EAB755E085621B10021C2BF /* PBXBookmark */;
- 8EAB7561085621B10021C2BF = 8EAB7561085621B10021C2BF /* PBXBookmark */;
+ 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 */;
- 8EABE78508562281004DF882 /* PBXTextBookmark */ = 8EABE78508562281004DF882 /* PBXTextBookmark */;
- 8EABE78608562281004DF882 /* PBXTextBookmark */ = 8EABE78608562281004DF882 /* PBXTextBookmark */;
- 8EABE78708562281004DF882 /* PBXTextBookmark */ = 8EABE78708562281004DF882 /* PBXTextBookmark */;
8EABE78808562281004DF882 /* PBXBookmark */ = 8EABE78808562281004DF882 /* PBXBookmark */;
- 8EABE78908562281004DF882 /* PBXTextBookmark */ = 8EABE78908562281004DF882 /* PBXTextBookmark */;
- 8EABE78A08562281004DF882 /* PBXTextBookmark */ = 8EABE78A08562281004DF882 /* PBXTextBookmark */;
- 8EABE78B08562281004DF882 /* PBXTextBookmark */ = 8EABE78B08562281004DF882 /* PBXTextBookmark */;
- 8EB30D890854BEF1009EA87F = 8EB30D890854BEF1009EA87F /* PBXTextBookmark */;
- 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 */;
- 8EB30E200854C36A009EA87F = 8EB30E200854C36A009EA87F /* PBXTextBookmark */;
- 8EC156F5084FEB8900BB24E8 = 8EC156F5084FEB8900BB24E8 /* PBXTextBookmark */;
- 8EC156F9084FEB8900BB24E8 = 8EC156F9084FEB8900BB24E8 /* PBXTextBookmark */;
- 8EC18EBD084E57D500AE0BA9 = 8EC18EBD084E57D500AE0BA9 /* PBXTextBookmark */;
- 8ED833CD08457E6B0033CDBD = 8ED833CD08457E6B0033CDBD /* PBXTextBookmark */;
- 8EDC88A90842F8DE007D1532 = 8EDC88A90842F8DE007D1532 /* PBXTextBookmark */;
- 8EDC88B50842F936007D1532 = 8EDC88B50842F936007D1532 /* PBXTextBookmark */;
- 8EDCBDDB084061E500F5C7E3 = 8EDCBDDB084061E500F5C7E3 /* PBXTextBookmark */;
- 8EDCBDDC084061E500F5C7E3 = 8EDCBDDC084061E500F5C7E3 /* PBXTextBookmark */;
- 8EDE0CCC08369EB200EABFE4 = 8EDE0CCC08369EB200EABFE4 /* PBXTextBookmark */;
- 8EE2A5B808511A1800367489 = 8EE2A5B808511A1800367489 /* PBXTextBookmark */;
- 8EE4A6C3082E6F6100415456 = 8EE4A6C3082E6F6100415456 /* PBXTextBookmark */;
- 8EE4A6C8082E6F6100415456 = 8EE4A6C8082E6F6100415456 /* PBXTextBookmark */;
- 8EE4A6FE082E704E00415456 = 8EE4A6FE082E704E00415456 /* PBXTextBookmark */;
- 8EE4A799082E7D8700415456 = 8EE4A799082E7D8700415456 /* 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 */;
- 8EFC6DE7085380B800C67D06 = 8EFC6DE7085380B800C67D06 /* PBXTextBookmark */;
- 8EFC6DE8085380B800C67D06 = 8EFC6DE8085380B800C67D06 /* PBXTextBookmark */;
- 8EFC6DF0085380B800C67D06 = 8EFC6DF0085380B800C67D06 /* PBXTextBookmark */;
- 8EFC6E29085386CE00C67D06 = 8EFC6E29085386CE00C67D06 /* PBXTextBookmark */;
+ 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 */;
};
sourceControlManager = 8EB77466082DA402005891CA /* Source Control */;
userBuildSettings = {
@@ -320,7 +304,7 @@
8E0EBF0D084BA776003A6E64 /* DBLog.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {983, 350}}";
- sepNavSelRange = "{257, 0}";
+ sepNavSelRange = "{251, 5}";
sepNavVisRect = "{{0, 0}, {983, 310}}";
};
};
@@ -459,8 +443,8 @@
8E267D050837F7A6004ACBC5 /* FeedbackController.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {914, 1106}}";
- sepNavSelRange = "{1300, 0}";
- sepNavVisRect = "{{0, 588}, {775, 372}}";
+ sepNavSelRange = "{310, 0}";
+ sepNavVisRect = "{{0, 34}, {775, 546}}";
};
};
8E267D060837F7A6004ACBC5 /* FeedbackSocket.h */ = {
@@ -472,9 +456,9 @@
};
8E267D070837F7A6004ACBC5 /* FeedbackSocket.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {824, 1848}}";
- sepNavSelRange = "{1544, 0}";
- sepNavVisRect = "{{0, 1476}, {775, 372}}";
+ sepNavIntBoundsRect = "{{0, 0}, {983, 1848}}";
+ sepNavSelRange = "{1512, 0}";
+ sepNavVisRect = "{{0, 475}, {983, 310}}";
};
};
8E267D090837F7A6004ACBC5 /* MacPADSocket.h */ = {
@@ -619,7 +603,7 @@
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {4550, 1246}}";
sepNavSelRange = "{3334, 0}";
- sepNavVisRect = "{{0, 700}, {775, 546}}";
+ sepNavVisRect = "{{0, 686}, {775, 546}}";
};
};
8E2871090836934A0013CE39 /* VirtualRingBuffer.m */ = {
@@ -673,16 +657,6 @@
sepNavVisRect = "{{0, 0}, {775, 546}}";
};
};
- 8E287E580855F35400562C66 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E2871080836934A0013CE39 /* VirtualRingBuffer.h */;
- name = "VirtualRingBuffer.h: 47";
- rLen = 0;
- rLoc = 3334;
- rType = 0;
- vrLen = 1458;
- vrLoc = 3378;
- };
8E287E5D0855F35400562C66 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8E287E490855F2EC00562C66 /* InfoView.m */;
@@ -749,16 +723,6 @@
vrLen = 65;
vrLoc = 0;
};
- 8E2BC83D0850F56200BEAC36 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E267D050837F7A6004ACBC5 /* FeedbackController.m */;
- name = "FeedbackController.m: 53";
- rLen = 0;
- rLoc = 1300;
- rType = 0;
- vrLen = 877;
- vrLoc = 942;
- };
8E3851EC084CEC0200D715B8 /* faad.h */ = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
@@ -776,74 +740,6 @@
vrLen = 428;
vrLoc = 132;
};
- 8E3EDBCF085477D0007C6A53 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E3EDBD0085477D0007C6A53 /* decode.h */;
- name = "(null): 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 818;
- vrLoc = 0;
- };
- 8E3EDBD0085477D0007C6A53 /* decode.h */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- name = decode.h;
- path = /Users/xugg/Desktop/inputSHORTEN/shorten/include/decode.h;
- sourceTree = "";
- };
- 8E3EDBD1085477D0007C6A53 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E3EDBD2085477D0007C6A53 /* libinputshorten.c */;
- name = "(null): 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 936;
- vrLoc = 4618;
- };
- 8E3EDBD2085477D0007C6A53 /* libinputshorten.c */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.c;
- name = libinputshorten.c;
- path = /Users/xugg/Desktop/inputSHORTEN/src/libinputshorten.c;
- sourceTree = "";
- };
- 8E3EDBE0085477D0007C6A53 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E3EDBE1085477D0007C6A53 /* decode.h */;
- name = "(null): 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 818;
- vrLoc = 0;
- };
- 8E3EDBE1085477D0007C6A53 /* decode.h */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- name = decode.h;
- path = /Users/xugg/Desktop/inputSHORTEN/shorten/include/decode.h;
- sourceTree = "";
- };
- 8E3EDBE4085477D0007C6A53 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E3EDBE5085477D0007C6A53 /* libinputshorten.c */;
- name = "(null): 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 936;
- vrLoc = 4618;
- };
- 8E3EDBE5085477D0007C6A53 /* libinputshorten.c */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.c;
- name = libinputshorten.c;
- path = /Users/xugg/Desktop/inputSHORTEN/src/libinputshorten.c;
- sourceTree = "";
- };
8E4521C408327F4C00F8BA7C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8E4721D5083192C2001F89FA /* SoundController.m */;
@@ -857,16 +753,16 @@
8E45227A0832898A00F8BA7C /* Sound.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {860, 1848}}";
- sepNavSelRange = "{767, 0}";
- sepNavVisRect = "{{0, 224}, {775, 546}}";
+ sepNavSelRange = "{2925, 0}";
+ sepNavVisRect = "{{0, 204}, {775, 546}}";
sepNavWindowFrame = "{{15, 61}, {702, 680}}";
};
};
8E45227B0832898A00F8BA7C /* Sound.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1208, 10360}}";
- sepNavSelRange = "{7601, 0}";
- sepNavVisRect = "{{0, 0}, {775, 546}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1208, 10570}}";
+ sepNavSelRange = "{19122, 0}";
+ sepNavVisRect = "{{0, 10024}, {775, 546}}";
sepNavWindowFrame = "{{15, 66}, {702, 680}}";
};
};
@@ -885,7 +781,7 @@
fRef = 8E45227B0832898A00F8BA7C /* Sound.m */;
name = "Sound.m: 15";
rLen = 0;
- rLoc = 19382;
+ rLoc = 19655;
rType = 0;
vrLen = 182;
vrLoc = 0;
@@ -928,8 +824,8 @@
8E47218A08318D7A001F89FA /* PlaylistEntry.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {782, 3878}}";
- sepNavSelRange = "{1736, 0}";
- sepNavVisRect = "{{0, 1246}, {775, 546}}";
+ sepNavSelRange = "{3092, 3}";
+ sepNavVisRect = "{{0, 2744}, {775, 546}}";
sepNavWindowFrame = "{{15, 61}, {1016, 680}}";
};
};
@@ -1051,8 +947,8 @@
8E4721D5083192C2001F89FA /* SoundController.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {950, 4522}}";
- sepNavSelRange = "{4338, 0}";
- sepNavVisRect = "{{0, 2384}, {775, 546}}";
+ sepNavSelRange = "{5440, 0}";
+ sepNavVisRect = "{{0, 3175}, {775, 546}}";
sepNavWindowFrame = "{{15, 61}, {1016, 680}}";
};
};
@@ -1143,6 +1039,16 @@
vrLen = 131;
vrLoc = 0;
};
+ 8E5CC5020856316C00A299E0 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8E47218A08318D7A001F89FA /* PlaylistEntry.m */;
+ name = Tag;
+ rLen = 3;
+ rLoc = 3092;
+ rType = 0;
+ vrLen = 655;
+ vrLoc = 2911;
+ };
8E6082C7083920310017AECF /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8E267D040837F7A6004ACBC5 /* FeedbackController.h */;
@@ -1237,6 +1143,146 @@
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 */;
+ name = "SoundFile.h: 42";
+ rLen = 0;
+ rLoc = 859;
+ rType = 0;
+ vrLen = 842;
+ vrLoc = 380;
+ };
+ 8E65358008563F6A00E468D9 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */;
+ name = "SoundFile.m: 176";
+ rLen = 0;
+ rLoc = 3747;
+ rType = 0;
+ 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 */;
+ name = "VirtualRingBuffer.h: 47";
+ rLen = 0;
+ rLoc = 3334;
+ rType = 0;
+ vrLen = 1460;
+ vrLoc = 3376;
+ };
+ 8E65359F0856401D00E468D9 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8E4721D5083192C2001F89FA /* SoundController.m */;
+ name = "SoundController.m: 246";
+ rLen = 0;
+ rLoc = 5440;
+ rType = 0;
+ vrLen = 933;
+ vrLoc = 5051;
+ };
+ 8E6535A00856401D00E468D9 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8E2871080836934A0013CE39 /* VirtualRingBuffer.h */;
+ name = "VirtualRingBuffer.h: 47";
+ rLen = 0;
+ rLoc = 3334;
+ rType = 0;
+ vrLen = 1460;
+ vrLoc = 3376;
+ };
+ 8E6535B60856432F00E468D9 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8E45227B0832898A00F8BA7C /* Sound.m */;
+ name = "Sound.m: 730";
+ rLen = 0;
+ rLoc = 19122;
+ rType = 0;
+ vrLen = 756;
+ vrLoc = 18925;
+ };
8E72BC640851408F00E34F1D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8E47218908318D7A001F89FA /* PlaylistEntry.h */;
@@ -1308,13 +1354,15 @@
};
8E8BAEFB08548F8600E9F14D /* WavPackFile.m:27 */ = {
isa = PBXFileBreakpoint;
+ actions = (
+ );
continueAfterActions = 0;
delayBeforeContinue = 0;
fileReference = 8E8BAE5208548BD500E9F14D /* WavPackFile.m */;
functionName = "-open:";
hitCount = 0;
lineNumber = 27;
- modificationTime = 0;
+ modificationTime = 139870066.061937;
state = 1;
};
8E8BAF10085494E000E9F14D /* PBXTextBookmark */ = {
@@ -1377,26 +1425,6 @@
vrLen = 1586;
vrLoc = 2232;
};
- 8E8F3F23085543D700BCF803 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E45227A0832898A00F8BA7C /* Sound.h */;
- name = "Sound.h: kCogStatusUpdateMessage";
- rLen = 0;
- rLoc = 767;
- rType = 0;
- vrLen = 720;
- vrLoc = 328;
- };
- 8E8F3F400855457A00BCF803 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E45227B0832898A00F8BA7C /* Sound.m */;
- name = "Sound.m: 252";
- rLen = 0;
- rLoc = 7601;
- rType = 0;
- vrLen = 1016;
- vrLoc = 0;
- };
8E8F3F59085546B300BCF803 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8E47218708318D7A001F89FA /* PlaylistController.h */;
@@ -1417,16 +1445,6 @@
vrLen = 502;
vrLoc = 496;
};
- 8E8F3F790855483300BCF803 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E47218A08318D7A001F89FA /* PlaylistEntry.m */;
- name = "PlaylistEntry.m: 110";
- rLen = 0;
- rLoc = 1736;
- rType = 0;
- vrLen = 385;
- vrLoc = 1526;
- };
8E8F3F9B0855499500BCF803 /* README */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {775, 546}}";
@@ -1444,16 +1462,6 @@
vrLen = 472;
vrLoc = 8263;
};
- 8E8F3FA608554B8000BCF803 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D5083192C2001F89FA /* SoundController.m */;
- name = "SoundController.m: 269";
- rLen = 0;
- rLoc = 6595;
- rType = 0;
- vrLen = 973;
- vrLoc = 5599;
- };
8E8F3FAE08554B8000BCF803 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8E8F3F9B0855499500BCF803 /* README */;
@@ -1481,7 +1489,7 @@
rLen = 0;
rLoc = 170;
rType = 0;
- vrLen = 297;
+ vrLen = 295;
vrLoc = 0;
};
8E94D9D3084BEA32007F0AEB /* PBXTextBookmark */ = {
@@ -1494,6 +1502,16 @@
vrLen = 273;
vrLoc = 0;
};
+ 8E98E5D308563D1B0078CAA1 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 8E267D050837F7A6004ACBC5 /* FeedbackController.m */;
+ name = "FeedbackController.m: 17";
+ rLen = 0;
+ rLoc = 310;
+ rType = 0;
+ vrLen = 914;
+ vrLoc = 28;
+ };
8E9BF08B082FB9DD00B26943 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8E9BF08C082FB9DD00B26943 /* VirtualRingBuffer.m */;
@@ -1521,20 +1539,6 @@
vrLen = 661;
vrLoc = 2015;
};
- 8EAB753C085621620021C2BF /* suffle_on.png */ = {
- isa = PBXFileReference;
- lastKnownFileType = image.png;
- name = suffle_on.png;
- path = /Users/xugg/Projects/Cog/Icons/suffle_on.png;
- sourceTree = "";
- uiCtxt = {
- sepNavWindowFrame = "{{15, 60}, {1017, 681}}";
- };
- };
- 8EAB7543085621B00021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB753C085621620021C2BF /* suffle_on.png */;
- };
8EAB7544085621B10021C2BF /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8E287E490855F2EC00562C66 /* InfoView.m */;
@@ -1555,36 +1559,6 @@
vrLen = 119;
vrLoc = 0;
};
- 8EAB7546085621B10021C2BF /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D208319294001F89FA /* AppController.m */;
- name = "AppController.m: delEntries:";
- rLen = 0;
- rLoc = 1071;
- rType = 0;
- vrLen = 759;
- vrLoc = 765;
- };
- 8EAB7547085621B10021C2BF /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D108319294001F89FA /* AppController.h */;
- name = "";
- rLen = 1;
- rLoc = 392;
- rType = 0;
- vrLen = 1103;
- vrLoc = 0;
- };
- 8EAB7548085621B10021C2BF /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D4083192C2001F89FA /* SoundController.h */;
- name = "SoundController.h: 25";
- rLen = 0;
- rLoc = 555;
- rType = 0;
- vrLen = 855;
- vrLoc = 0;
- };
8EAB7549085621B10021C2BF /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 8EAFD27B08465E5600107BA5 /* remove_gray.png */;
@@ -1601,60 +1575,6 @@
isa = PBXBookmark;
fRef = 8EAB753D085621620021C2BF /* shuffle_off.png */;
};
- 8EAB754D085621B10021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB753C085621620021C2BF /* suffle_on.png */;
- };
- 8EAB754E085621B10021C2BF /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E287E490855F2EC00562C66 /* InfoView.m */;
- name = "InfoView.m: 19";
- rLen = 0;
- rLoc = 266;
- rType = 0;
- vrLen = 277;
- vrLoc = 0;
- };
- 8EAB754F085621B10021C2BF /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 089C165DFE840E0CC02AAC07 /* English */;
- name = "English: 4";
- rLen = 0;
- rLoc = 111;
- rType = 0;
- vrLen = 119;
- vrLoc = 0;
- };
- 8EAB7550085621B10021C2BF /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D208319294001F89FA /* AppController.m */;
- name = "AppController.m: delEntries:";
- rLen = 0;
- rLoc = 1071;
- rType = 0;
- vrLen = 759;
- vrLoc = 765;
- };
- 8EAB7551085621B10021C2BF /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D108319294001F89FA /* AppController.h */;
- name = "";
- rLen = 1;
- rLoc = 392;
- rType = 0;
- vrLen = 1103;
- vrLoc = 0;
- };
- 8EAB7552085621B10021C2BF /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D4083192C2001F89FA /* SoundController.h */;
- name = "SoundController.h: 25";
- rLen = 0;
- rLoc = 555;
- rType = 0;
- vrLen = 855;
- vrLoc = 0;
- };
8EAB7553085621B10021C2BF /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 8EAFD27B08465E5600107BA5 /* remove_gray.png */;
@@ -1667,95 +1587,23 @@
isa = PBXBookmark;
fRef = 8EAB752A0856205B0021C2BF /* repeat_off.png */;
};
- 8EAB7556085621B10021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB752A0856205B0021C2BF /* repeat_off.png */;
- };
- 8EAB7557085621B10021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB75290856205B0021C2BF /* repeat_on.png */;
- };
- 8EAB7558085621B10021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB75290856205B0021C2BF /* repeat_on.png */;
- };
- 8EAB7559085621B10021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB752A0856205B0021C2BF /* repeat_off.png */;
- };
- 8EAB755A085621B10021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB752A0856205B0021C2BF /* repeat_off.png */;
- };
- 8EAB755B085621B10021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB752A0856205B0021C2BF /* repeat_off.png */;
- };
- 8EAB755C085621B10021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB753C085621620021C2BF /* suffle_on.png */;
- };
8EAB755D085621B10021C2BF /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 8EAB753D085621620021C2BF /* shuffle_off.png */;
};
- 8EAB755E085621B10021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB753C085621620021C2BF /* suffle_on.png */;
- };
- 8EAB7561085621B10021C2BF /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 8EAB753C085621620021C2BF /* suffle_on.png */;
- };
8EABE78408562281004DF882 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 8EABE776085621D4004DF882 /* shuffle_on.png */;
};
- 8EABE78508562281004DF882 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D208319294001F89FA /* AppController.m */;
- name = "AppController.m: delEntries:";
- rLen = 0;
- rLoc = 1071;
- rType = 0;
- vrLen = 759;
- vrLoc = 765;
- };
- 8EABE78608562281004DF882 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D4083192C2001F89FA /* SoundController.h */;
- name = "SoundController.h: playButton";
- rLen = 0;
- rLoc = 462;
- rType = 0;
- vrLen = 832;
- vrLoc = 0;
- };
- 8EABE78708562281004DF882 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D5083192C2001F89FA /* SoundController.m */;
- name = "SoundController.m: 269";
- rLen = 0;
- rLoc = 6595;
- rType = 0;
- vrLen = 968;
- vrLoc = 5599;
- };
8EABE78808562281004DF882 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 8EABE776085621D4004DF882 /* shuffle_on.png */;
};
- 8EABE78908562281004DF882 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8E4721D208319294001F89FA /* AppController.m */;
- name = "AppController.m: delEntries:";
- rLen = 0;
- rLoc = 1071;
- rType = 0;
- vrLen = 759;
- vrLoc = 765;
+ 8EABE7C308562FF3004DF882 /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 8EAFD27408465E5600107BA5 /* pause_blue.png */;
};
- 8EABE78A08562281004DF882 /* PBXTextBookmark */ = {
+ 8EABE7C408562FF3004DF882 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8E4721D4083192C2001F89FA /* SoundController.h */;
name = "SoundController.h: playButton";
@@ -1765,15 +1613,29 @@
vrLen = 832;
vrLoc = 0;
};
- 8EABE78B08562281004DF882 /* PBXTextBookmark */ = {
+ 8EABE7C508562FF3004DF882 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 8E4721D5083192C2001F89FA /* SoundController.m */;
- name = "SoundController.m: 292";
- rLen = 0;
- rLoc = 7273;
+ fRef = 8E4721D108319294001F89FA /* AppController.h */;
+ name = "";
+ rLen = 1;
+ rLoc = 392;
rType = 0;
- vrLen = 875;
- vrLoc = 5806;
+ 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 */;
};
8EB30D4F0854BDDD009EA87F /* shn.h */ = {
isa = PBXFileReference;
@@ -1782,16 +1644,6 @@
path = /Users/xugg/Projects/Cog/Libraries/Shorten/build/Shorten.framework/Versions/A/Headers/shn.h;
sourceTree = "";
};
- 8EB30D890854BEF1009EA87F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8EF6FA6D082DA526006F7BE6 /* SoundFile.h */;
- name = "SoundFile.h: 42";
- rLen = 0;
- rLoc = 859;
- rType = 0;
- vrLen = 670;
- vrLoc = 461;
- };
8EB30D8A0854BEF1009EA87F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 8EB30D4F0854BDDD009EA87F /* shn.h */;
@@ -1892,16 +1744,6 @@
vrLen = 386;
vrLoc = 1947;
};
- 8EB30E200854C36A009EA87F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */;
- name = "SoundFile.m: 93";
- rLen = 0;
- rLoc = 1985;
- rType = 0;
- vrLen = 588;
- vrLoc = 1467;
- };
8EB77455082DA3EB005891CA /* Cog */ = {
isa = PBXExecutable;
activeArgIndex = 2147483647;
@@ -1997,13 +1839,15 @@
};
8EDC87BA0842F2A4007D1532 /* SoundFile.m:124 */ = {
isa = PBXFileBreakpoint;
+ actions = (
+ );
continueAfterActions = 0;
delayBeforeContinue = 0;
fileReference = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */;
functionName = "+readInfo:";
hitCount = 0;
lineNumber = 124;
- modificationTime = 0;
+ modificationTime = 139870046.137529;
state = 2;
};
8EDC88A90842F8DE007D1532 /* PBXTextBookmark */ = {
@@ -2130,7 +1974,7 @@
functionName = "-handlePortMessage:";
hitCount = 0;
lineNumber = 275;
- modificationTime = 0;
+ modificationTime = 139870046.13733;
state = 2;
};
8EF1B97C083A49980095B236 /* PlaylistController.m:386 */ = {
@@ -2141,7 +1985,7 @@
functionName = "-currentEntry";
hitCount = 0;
lineNumber = 386;
- modificationTime = 0;
+ modificationTime = 139870046.081174;
state = 2;
};
8EF45A7A08557C4D00D2D5D0 /* PBXTextBookmark */ = {
@@ -2214,15 +2058,15 @@
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {775, 826}}";
sepNavSelRange = "{859, 0}";
- sepNavVisRect = "{{0, 356}, {775, 372}}";
+ sepNavVisRect = "{{0, 280}, {775, 546}}";
sepNavWindowFrame = "{{15, 61}, {1016, 680}}";
};
};
8EF6FA6E082DA526006F7BE6 /* SoundFile.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {775, 3066}}";
- sepNavSelRange = "{1985, 0}";
- sepNavVisRect = "{{0, 1025}, {775, 372}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1010, 3066}}";
+ sepNavSelRange = "{3747, 0}";
+ sepNavVisRect = "{{0, 0}, {775, 546}}";
sepNavWindowFrame = "{{15, 61}, {750, 680}}";
};
};
diff --git a/Feedback/FeedbackController.m b/Feedback/FeedbackController.m
index 1876128b4..4a450a83a 100644
--- a/Feedback/FeedbackController.m
+++ b/Feedback/FeedbackController.m
@@ -23,7 +23,7 @@
- (void)alertDidEnd:(NSAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo
{
- NSLog(@"CONTEXT: %i", contextInfo);
+ DBLog(@"CONTEXT: %i", contextInfo);
if (contextInfo == YES)
{
[feedbackWindow close];
diff --git a/Feedback/FeedbackSocket.m b/Feedback/FeedbackSocket.m
index 74a3b9d41..8d9dfcd10 100644
--- a/Feedback/FeedbackSocket.m
+++ b/Feedback/FeedbackSocket.m
@@ -42,7 +42,7 @@ NSString *encodeForURL(NSString *s)
NSURLResponse* response;
NSData* resultData = [NSURLConnection sendSynchronousRequest:post returningResponse:&response error:&error];
NSString *resultString = [[[NSString alloc] initWithData:resultData encoding:NSASCIIStringEncoding] autorelease];
- NSLog(@"RESULT: %@", resultString);
+ DBLog(@"RESULT: %@", resultString);
if ([resultString caseInsensitiveCompare:@"SUCCESS"] == NSOrderedSame)
{
[self performSelectorOnMainThread:@selector(returnSuccess:) withObject:nil waitUntilDone:NO];
diff --git a/Playlist/PlaylistEntry.m b/Playlist/PlaylistEntry.m
index 94fbf7ed6..ca6f3a5a2 100644
--- a/Playlist/PlaylistEntry.m
+++ b/Playlist/PlaylistEntry.m
@@ -222,7 +222,7 @@
if (tag)
{
- NSLog(@"TAG: %i", tag);
+ DBLog(@"TAG: %i", tag);
char *pArtist, *pTitle, *pAlbum, *pGenre, *pComment;
diff --git a/Sound.h b/Sound.h
index 020fec2ac..28417e74d 100644
--- a/Sound.h
+++ b/Sound.h
@@ -121,7 +121,7 @@ enum
- (void)playFile:(NSString *)filename;
- (void)changeFile:(NSString *)filename;
-- (void)setSoundFile:(NSString *)filename;
+- (BOOL)setSoundFile:(NSString *)filename;
//helper function
- (double)calculateTime:(unsigned long) pos;
diff --git a/Sound.m b/Sound.m
index fed0eb6e9..4e2b89ae6 100644
--- a/Sound.m
+++ b/Sound.m
@@ -93,7 +93,7 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
amountAvailable = [sound->readRingBuffer lengthAvailableToReadReturningPointer:&readPointer];
if (sound->playbackStatus == kCogStatusEndOfFile && amountAvailable == 0)
{
-// DBLog(@"FILE CHANGED!!!!!");
+ DBLog(@"FILE CHANGED!!!!!");
[sound sendPortMessage:kCogFileChangedMessage];
sound->readRingBuffer = [sound oppositeBuffer:sound->readRingBuffer];
@@ -249,10 +249,7 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
if (portMessage)
{
NSDate *date = [[NSDate alloc] initWithTimeIntervalSinceNow:20.0];//give shit a little time to send, just in case...may come back to bite me
- if ([date laterDate:[NSDate date]] != date)
- {
- DBLog(@"WTF");
- }
+
[portMessage setMsgid:msgid];
DBLog(@"Sending message: %i", msgid);
@@ -311,7 +308,7 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
{
[self playFile:s];
}
- else if (kCogChangeFileMessage) //change the file, usually in response to a nexttrack request
+ else if (msgid == kCogChangeFileMessage) //change the file, usually in response to a nexttrack request
{
[self changeFile:s];
}
@@ -414,7 +411,7 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
// convertedSize = [self convert:writePointer packets:(amountAvailable/deviceFormat.mBytesPerPacket)];
if (playbackStatus == kCogStatusPlaying && convertedSize == 0)
{
-// DBLog(@"NEXT!!!!");
+ DBLog(@"NEXT!!!!");
[self sendPortMessage:kCogRequestNextFileMessage];
writeRingBuffer = [self oppositeBuffer:writeRingBuffer];
@@ -680,8 +677,14 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
// [self stop];
DBLog(@"PLAYING FILE");
- [self setSoundFile:filename];
+ if (![self setSoundFile:filename])
+ {
+ DBLog(@"NOT PLAYING FILE");
+ [self stop];
+ return;
+ }
+
DBLog(@"DONT LIKE THIS, HUH?");
[readLock lock];
@@ -704,8 +707,8 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
- (void)changeFile:(NSString *)filename
{
- [self setSoundFile:filename];
- [self fireFillTimer];
+ if ([self setSoundFile:filename])
+ [self fireFillTimer];
}
- (void)resetBuffer
@@ -725,16 +728,26 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
[writeLock unlock];
}
-- (void)setSoundFile:(NSString *)filename
+- (BOOL)setSoundFile:(NSString *)filename
{
[self cleanUpSoundFile];
[soundFile release];
//GO THROUGH HELLA SHIT TO DETERMINE FILE...NEED TO MAKE SOME KIND OF REGISTERING MECHANISM
soundFile = [SoundFile open:filename];
+ if (!soundFile)
+ {
+ DBLog(@"NEW SONG SETSOUNDFILE");
+ [self sendPortMessage:kCogFileChangedMessage];
+ [self setPlaybackStatus:kCogStatusEndOfPlaylist];
+// [self sendPortMessage:kCogRequestNextFileMessage];
+ return NO;
+ }
// DBLog(@"File opened: %s", [filename UTF8String]);
[self prepareSoundFile];
+
+ return YES;
}
diff --git a/SoundFile/SoundFile.m b/SoundFile/SoundFile.m
index 5b1c0b2ee..2637e5c82 100644
--- a/SoundFile/SoundFile.m
+++ b/SoundFile/SoundFile.m
@@ -56,7 +56,7 @@
{
SoundFile *soundFile;
- if ([[filename pathExtension] isEqualToString:@"wav"] || [[filename pathExtension] isEqualToString:@"aiff"])
+ if ([[filename pathExtension] isEqualToString:@"wav"] || [[filename pathExtension] isEqualToString:@"aiff"] || [[filename pathExtension] isEqualToString:@"aif"])
{
soundFile = [[WaveFile alloc] init];
}