diff --git a/Changelog b/Changelog index 1b333473c..d3a8ab7e8 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,11 @@ +0.0.3 +----- +Fixed bug where Default.playlist referred to non-existent files, resulting in a crash. +Clicking on the time display will now alternate between current time, and time to go. +Now makes ham. + +0.0.2 +----- Awesomized id3v2 and tagging support courtesy of TagLib. Dramatically improved performance of monkeys audio codec. SHN and Wavpack support. @@ -7,3 +15,7 @@ Added tooltips and control menu. Fixed play button so it now plays the currently selected song if no song is playing. Otherwise, it does pause/resume. Changed info panel to a drawer. Misc UI fixes. + +0.0.1 +----- +Initial release. \ No newline at end of file diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 16759cb1e..359fdfc65 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -36,6 +36,8 @@ 8E5A90B1084CBC2F00AE6D62 /* Changelog in Resources */ = {isa = PBXBuildFile; fileRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; }; 8E652A02083D93EB00A7AF1B /* TrackingSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */; }; 8E6F2A1908480D010011F126 /* wheel.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8E6F2A1808480D010011F126 /* wheel.icns */; }; + 8E7DAB4F0867423900615930 /* ClickField.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E7DAB4D0867423900615930 /* ClickField.h */; }; + 8E7DAB500867423900615930 /* ClickField.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E7DAB4E0867423900615930 /* ClickField.m */; }; 8E81BC33083673ED0025A375 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E81BC31083673ED0025A375 /* AudioToolbox.framework */; }; 8E81BC34083673ED0025A375 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E81BC32083673ED0025A375 /* AudioUnit.framework */; }; 8E8BAE5408548BD500E9F14D /* WavPackFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8BAE5208548BD500E9F14D /* WavPackFile.m */; }; @@ -143,6 +145,7 @@ 8EFFB6D5083302A500C53833 /* FLAC.framework in CopyFiles */, 8EFFB6D6083302A500C53833 /* DecMPA.framework in CopyFiles */, 8E287E4A0855F2EC00562C66 /* InfoView.h in CopyFiles */, + 8E7DAB4F0867423900615930 /* ClickField.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -198,6 +201,8 @@ 8E6529FF083D93EB00A7AF1B /* TrackingSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TrackingSlider.h; sourceTree = ""; }; 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = TrackingSlider.m; sourceTree = ""; }; 8E6F2A1808480D010011F126 /* wheel.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = wheel.icns; path = Icons/wheel.icns; sourceTree = ""; }; + 8E7DAB4D0867423900615930 /* ClickField.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ClickField.h; sourceTree = ""; }; + 8E7DAB4E0867423900615930 /* ClickField.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ClickField.m; sourceTree = ""; }; 8E81BC31083673ED0025A375 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; 8E81BC32083673ED0025A375 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; 8E8BAE5108548BD500E9F14D /* WavPackFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WavPackFile.h; sourceTree = ""; }; @@ -285,7 +290,7 @@ 8E267D080837F7A6004ACBC5 /* Updates */, 8E47215C08318D12001F89FA /* Playlist */, 8EF6FA64082DA525006F7BE6 /* SoundFile */, - 8E6529F8083D93AF00A7AF1B /* Slider */, + 8E6529F8083D93AF00A7AF1B /* Custom */, 8E287E480855F2EC00562C66 /* InfoView.h */, 8E287E490855F2EC00562C66 /* InfoView.m */, 8E2871080836934A0013CE39 /* VirtualRingBuffer.h */, @@ -424,15 +429,17 @@ name = Playlist; sourceTree = ""; }; - 8E6529F8083D93AF00A7AF1B /* Slider */ = { + 8E6529F8083D93AF00A7AF1B /* Custom */ = { isa = PBXGroup; children = ( 8E297908083D891500F2C55A /* TrackingCell.m */, 8E297909083D891500F2C55A /* TrackingCell.h */, 8E6529FF083D93EB00A7AF1B /* TrackingSlider.h */, 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */, + 8E7DAB4D0867423900615930 /* ClickField.h */, + 8E7DAB4E0867423900615930 /* ClickField.m */, ); - name = Slider; + name = Custom; sourceTree = ""; }; 8EAFD26D08465E4500107BA5 /* Icons */ = { @@ -637,6 +644,7 @@ 8E8BAE5408548BD500E9F14D /* WavPackFile.m in Sources */, 8E8BAE5808548BE800E9F14D /* ShnFile.m in Sources */, 8E287E4B0855F2EC00562C66 /* InfoView.m in Sources */, + 8E7DAB500867423900615930 /* ClickField.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Cog.xcodeproj/xugg.mode1 b/Cog.xcodeproj/xugg.mode1 index 26d5b3300..c2f37dda2 100644 --- a/Cog.xcodeproj/xugg.mode1 +++ b/Cog.xcodeproj/xugg.mode1 @@ -254,19 +254,21 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey 29B97314FDCFA39411CA2CEA + 080E96DDFE201D6D7F000001 + 8E6529F8083D93AF00A7AF1B 29B97317FDCFA39411CA2CEA 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 7 - 3 + 32 + 24 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {186, 565}} + {{0, 51}, {186, 565}} PBXTopSmartGroupGIDs @@ -285,7 +287,7 @@ 186 RubberWindowFrame - 2 122 1024 624 0 0 1024 746 + 1 122 1024 624 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -303,7 +305,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - Info.plist + Changelog PBXSplitModuleInNavigatorKey Split0 @@ -311,11 +313,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - Info.plist + Changelog _historyCapacity 0 bookmark - 8EE558090866A24B009E7F50 + 8E7DABA50867470600615930 history 8EF6FACD082DAA2B006F7BE6 @@ -324,10 +326,6 @@ 8E267DDB0837FE5F004ACBC5 8E1A1826083806B700AEA302 8E6082C7083920310017AECF - 8E652A33083E1A7900A7AF1B - 8E652A34083E1A7900A7AF1B - 8E652A35083E1A7900A7AF1B - 8E652A36083E1A7900A7AF1B 8EDC88A90842F8DE007D1532 8EDC88B50842F936007D1532 8ED833CD08457E6B0033CDBD @@ -356,11 +354,7 @@ 8E4D67D40854E7B100816BEE 8E8F3F59085546B300BCF803 8E8F3F780855483300BCF803 - 8E8F3FA408554B8000BCF803 8EF45A7A08557C4D00D2D5D0 - 8E287CDC0855D60A00562C66 - 8E287CDD0855D60A00562C66 - 8E287E7F0855F60E00562C66 8EAB7544085621B10021C2BF 8EAB7545085621B10021C2BF 8EAB7549085621B10021C2BF @@ -369,15 +363,11 @@ 8EAB754C085621B10021C2BF 8EABE78408562281004DF882 8EABE7C308562FF3004DF882 - 8EABE7C408562FF3004DF882 8EABE7C508562FF3004DF882 8E5CC5020856316C00A299E0 8E98E5D308563D1B0078CAA1 8E65357F08563F6A00E468D9 - 8E65358008563F6A00E468D9 8E65359E0856401D00E468D9 - 8E5F6DB1085781B900A111D9 - 8E5F6DB2085781B900A111D9 8E63F6C808587FD400C79B72 8E63F6C908587FD400C79B72 8E63F6CA08587FD400C79B72 @@ -389,11 +379,25 @@ 8E8C7C85085EA5E30086DAC7 8E8C7D35085EAD460086DAC7 8E8C7D36085EAD460086DAC7 - 8E657299086085E400A0DAC4 - 8E65729A086085E400A0DAC4 - 8E94AFB2086639760038E585 8EE558070866A24B009E7F50 - 8E657298086085E400A0DAC4 + 8E7DAAA808673DF600615930 + 8E7DAAF70867402D00615930 + 8E7DAAF80867402D00615930 + 8E7DAAF90867402D00615930 + 8E7DAAFB0867402D00615930 + 8E7DAAFC0867402D00615930 + 8E7DAAFD0867402D00615930 + 8E7DAAFE0867402D00615930 + 8E7DAAFF0867402D00615930 + 8E7DAB430867421200615930 + 8E7DAB440867421200615930 + 8E7DAB78086742EB00615930 + 8E7DAB79086742EB00615930 + 8E7DAB7A086742EB00615930 + 8E7DAB9D0867470600615930 + 8E7DAB9E0867470600615930 + 8E7DAB9F0867470600615930 + 8E7DABA00867470600615930 prevStack @@ -473,7 +477,53 @@ 8E8C7C90085EA5E30086DAC7 8E8C7C92085EA5E30086DAC7 8E8C7C98085EA5E30086DAC7 - 8EE558080866A24B009E7F50 + 8E7DAAAA08673DF600615930 + 8E7DAAAB08673DF600615930 + 8E7DAB020867402D00615930 + 8E7DAB030867402D00615930 + 8E7DAB040867402D00615930 + 8E7DAB050867402D00615930 + 8E7DAB060867402D00615930 + 8E7DAB070867402D00615930 + 8E7DAB080867402D00615930 + 8E7DAB090867402D00615930 + 8E7DAB0A0867402D00615930 + 8E7DAB0B0867402D00615930 + 8E7DAB0C0867402D00615930 + 8E7DAB0D0867402D00615930 + 8E7DAB0E0867402D00615930 + 8E7DAB0F0867402D00615930 + 8E7DAB100867402D00615930 + 8E7DAB110867402D00615930 + 8E7DAB320867412700615930 + 8E7DAB330867412700615930 + 8E7DAB340867412700615930 + 8E7DAB350867412700615930 + 8E7DAB360867412700615930 + 8E7DAB470867421200615930 + 8E7DAB480867421200615930 + 8E7DAB490867421200615930 + 8E7DAB4A0867421200615930 + 8E7DAB4B0867421200615930 + 8E7DAB540867424400615930 + 8E7DAB550867424400615930 + 8E7DAB560867424400615930 + 8E7DAB570867424400615930 + 8E7DAB580867424400615930 + 8E7DAB7C086742EB00615930 + 8E7DAB7D086742EB00615930 + 8E7DAB7E086742EB00615930 + 8E7DAB7F086742EB00615930 + 8E7DAB80086742EB00615930 + 8E7DAB81086742EB00615930 + 8E7DAB82086742EB00615930 + 8E7DAB83086742EB00615930 + 8E7DAB84086742EB00615930 + 8E7DAB85086742EB00615930 + 8E7DABA10867470600615930 + 8E7DABA20867470600615930 + 8E7DABA30867470600615930 + 8E7DABA40867470600615930 SplitCount @@ -487,7 +537,7 @@ Frame {{0, 0}, {816, 405}} RubberWindowFrame - 2 122 1024 624 0 0 1024 746 + 1 122 1024 624 0 0 1024 746 Module PBXNavigatorGroup @@ -507,7 +557,7 @@ Frame {{0, 410}, {816, 173}} RubberWindowFrame - 2 122 1024 624 0 0 1024 746 + 1 122 1024 624 0 0 1024 746 Module XCDetailModule @@ -531,9 +581,9 @@ TableOfContents - 8EE5580A0866A24B009E7F50 + 8E7DAAAD08673DF600615930 1CE0B1FE06471DED0097A5F4 - 8EE5580B0866A24B009E7F50 + 8E7DAAAE08673DF600615930 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -667,10 +717,13 @@ 5 WindowOrderList + 1C0AD2B3069F1EA900FABCE6 + 1C530D57069F1CE1000CFCEE + 8EF6FAA6082DA951006F7BE6 /Users/xugg/Projects/Cog/Cog.xcodeproj WindowString - 2 122 1024 624 0 0 1024 746 + 1 122 1024 624 0 0 1024 746 WindowTools @@ -686,14 +739,12 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - Sound.m + SoundController.m StatusBarVisibility @@ -710,6 +761,8 @@ 342pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -749,7 +802,7 @@ TableOfContents 8EF6FAA6082DA951006F7BE6 - 8E98E5B808563ADC0078CAA1 + 8E7DAAB408673E1600615930 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -889,14 +942,12 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - SoundController.m + SoundFile.m StatusBarVisibility @@ -952,8 +1003,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 8E8C7C27085E9DC50086DAC7 - 8E8C7C28085E9DC50086DAC7 + 8E7DAABB08673E5400615930 + 8E7DAABC08673E5400615930 1CDD528C0622207200134675 1CD0528E0623707200166675 @@ -1111,9 +1162,9 @@ TableOfContents 1C0AD2B3069F1EA900FABCE6 - 8E0914FC08661F200039FDAA + 8E7DAB1B086740D100615930 1CD0528B0623707200166675 - 8E0914FD08661F200039FDAA + 8E7DAB1C086740D100615930 ToolbarConfiguration xcode.toolbar.config.run diff --git a/Cog.xcodeproj/xugg.pbxuser b/Cog.xcodeproj/xugg.pbxuser index 65d229e09..c089e92ac 100644 --- a/Cog.xcodeproj/xugg.pbxuser +++ b/Cog.xcodeproj/xugg.pbxuser @@ -9,7 +9,7 @@ }; }; 29B97313FDCFA39411CA2CEA /* Project object */ = { - activeBuildConfigurationName = Development; + activeBuildConfigurationName = Deployment; activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA /* Development */; activeExecutable = 8EB77455082DA3EB005891CA /* Cog */; activeTarget = 8D1107260486CEB800E47090 /* Cog */; @@ -18,7 +18,7 @@ ); breakpoints = ( 8EF1B97C083A49980095B236 /* PlaylistController.m:386 */, - 8EEFDF8808410C00008BB533 /* SoundController.m:275 */, + 8EEFDF8808410C00008BB533 /* SoundController.m:296 */, 8EDC87BA0842F2A4007D1532 /* SoundFile.m:124 */, 8E8BAEFB08548F8600E9F14D /* WavPackFile.m:27 */, ); @@ -115,160 +115,208 @@ PBXWorkspaceStateSaveDate = 140983470; }; perUserProjectItems = { - 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 */; + 8E0EBF58084BAA56003A6E64 /* PBXTextBookmark */ = 8E0EBF58084BAA56003A6E64 /* PBXTextBookmark */; + 8E0EBF59084BAA56003A6E64 /* PBXTextBookmark */ = 8E0EBF59084BAA56003A6E64 /* PBXTextBookmark */; + 8E10DC08084BBE490013815C /* PBXTextBookmark */ = 8E10DC08084BBE490013815C /* 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 */; + 8E287164083695080013CE39 /* PBXTextBookmark */ = 8E287164083695080013CE39 /* PBXTextBookmark */; + 8E287E5D0855F35400562C66 /* PBXTextBookmark */ = 8E287E5D0855F35400562C66 /* PBXTextBookmark */; + 8E287E5E0855F35400562C66 /* PBXTextBookmark */ = 8E287E5E0855F35400562C66 /* 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 */; + 8E4D67D40854E7B100816BEE /* PBXTextBookmark */ = 8E4D67D40854E7B100816BEE /* PBXTextBookmark */; + 8E5A90BB084CC25900AE6D62 /* PBXTextBookmark */ = 8E5A90BB084CC25900AE6D62 /* PBXTextBookmark */; + 8E5CC5020856316C00A299E0 /* PBXTextBookmark */ = 8E5CC5020856316C00A299E0 /* PBXTextBookmark */; + 8E6082C7083920310017AECF /* PBXTextBookmark */ = 8E6082C7083920310017AECF /* PBXTextBookmark */; + 8E63F6C808587FD400C79B72 /* PBXTextBookmark */ = 8E63F6C808587FD400C79B72 /* PBXTextBookmark */; + 8E63F6C908587FD400C79B72 /* PBXTextBookmark */ = 8E63F6C908587FD400C79B72 /* PBXTextBookmark */; + 8E63F6CA08587FD400C79B72 /* PBXTextBookmark */ = 8E63F6CA08587FD400C79B72 /* PBXTextBookmark */; + 8E63F6CB08587FD400C79B72 /* PBXTextBookmark */ = 8E63F6CB08587FD400C79B72 /* PBXTextBookmark */; + 8E6529B5083D8D7F00A7AF1B /* PBXTextBookmark */ = 8E6529B5083D8D7F00A7AF1B /* PBXTextBookmark */; + 8E652A39083E1A7900A7AF1B /* PBXTextBookmark */ = 8E652A39083E1A7900A7AF1B /* PBXTextBookmark */; + 8E652A3A083E1A7900A7AF1B /* PBXTextBookmark */ = 8E652A3A083E1A7900A7AF1B /* PBXTextBookmark */; + 8E65357F08563F6A00E468D9 /* PBXTextBookmark */ = 8E65357F08563F6A00E468D9 /* PBXTextBookmark */; + 8E65359E0856401D00E468D9 /* PBXTextBookmark */ = 8E65359E0856401D00E468D9 /* PBXTextBookmark */; + 8E72BC640851408F00E34F1D /* PBXTextBookmark */ = 8E72BC640851408F00E34F1D /* PBXTextBookmark */; + 8E7DAAA808673DF600615930 /* PBXTextBookmark */ = 8E7DAAA808673DF600615930 /* PBXTextBookmark */; + 8E7DAAAA08673DF600615930 /* PBXTextBookmark */ = 8E7DAAAA08673DF600615930 /* PBXTextBookmark */; + 8E7DAAAB08673DF600615930 /* PBXTextBookmark */ = 8E7DAAAB08673DF600615930 /* PBXTextBookmark */; + 8E7DAAF70867402D00615930 /* PBXTextBookmark */ = 8E7DAAF70867402D00615930 /* PBXTextBookmark */; + 8E7DAAF80867402D00615930 /* PBXTextBookmark */ = 8E7DAAF80867402D00615930 /* PBXTextBookmark */; + 8E7DAAF90867402D00615930 /* PBXTextBookmark */ = 8E7DAAF90867402D00615930 /* PBXTextBookmark */; + 8E7DAAFB0867402D00615930 /* PBXTextBookmark */ = 8E7DAAFB0867402D00615930 /* PBXTextBookmark */; + 8E7DAAFC0867402D00615930 /* PBXTextBookmark */ = 8E7DAAFC0867402D00615930 /* PBXTextBookmark */; + 8E7DAAFD0867402D00615930 /* PBXTextBookmark */ = 8E7DAAFD0867402D00615930 /* PBXTextBookmark */; + 8E7DAAFE0867402D00615930 /* PBXTextBookmark */ = 8E7DAAFE0867402D00615930 /* PBXTextBookmark */; + 8E7DAAFF0867402D00615930 /* PBXTextBookmark */ = 8E7DAAFF0867402D00615930 /* PBXTextBookmark */; + 8E7DAB020867402D00615930 /* PBXTextBookmark */ = 8E7DAB020867402D00615930 /* PBXTextBookmark */; + 8E7DAB030867402D00615930 /* PBXTextBookmark */ = 8E7DAB030867402D00615930 /* PBXTextBookmark */; + 8E7DAB040867402D00615930 /* PBXTextBookmark */ = 8E7DAB040867402D00615930 /* PBXTextBookmark */; + 8E7DAB050867402D00615930 /* PBXTextBookmark */ = 8E7DAB050867402D00615930 /* PBXTextBookmark */; + 8E7DAB060867402D00615930 /* PBXTextBookmark */ = 8E7DAB060867402D00615930 /* PBXTextBookmark */; + 8E7DAB070867402D00615930 /* PBXTextBookmark */ = 8E7DAB070867402D00615930 /* PBXTextBookmark */; + 8E7DAB080867402D00615930 /* PBXTextBookmark */ = 8E7DAB080867402D00615930 /* PBXTextBookmark */; + 8E7DAB090867402D00615930 /* PBXTextBookmark */ = 8E7DAB090867402D00615930 /* PBXTextBookmark */; + 8E7DAB0A0867402D00615930 /* PBXTextBookmark */ = 8E7DAB0A0867402D00615930 /* PBXTextBookmark */; + 8E7DAB0B0867402D00615930 /* PBXTextBookmark */ = 8E7DAB0B0867402D00615930 /* PBXTextBookmark */; + 8E7DAB0C0867402D00615930 /* PBXTextBookmark */ = 8E7DAB0C0867402D00615930 /* PBXTextBookmark */; + 8E7DAB0D0867402D00615930 /* PBXTextBookmark */ = 8E7DAB0D0867402D00615930 /* PBXTextBookmark */; + 8E7DAB0E0867402D00615930 /* PBXTextBookmark */ = 8E7DAB0E0867402D00615930 /* PBXTextBookmark */; + 8E7DAB0F0867402D00615930 /* PBXTextBookmark */ = 8E7DAB0F0867402D00615930 /* PBXTextBookmark */; + 8E7DAB100867402D00615930 /* PBXTextBookmark */ = 8E7DAB100867402D00615930 /* PBXTextBookmark */; + 8E7DAB110867402D00615930 /* PBXTextBookmark */ = 8E7DAB110867402D00615930 /* PBXTextBookmark */; + 8E7DAB320867412700615930 /* PBXTextBookmark */ = 8E7DAB320867412700615930 /* PBXTextBookmark */; + 8E7DAB330867412700615930 /* PBXTextBookmark */ = 8E7DAB330867412700615930 /* PBXTextBookmark */; + 8E7DAB340867412700615930 /* PBXTextBookmark */ = 8E7DAB340867412700615930 /* PBXTextBookmark */; + 8E7DAB350867412700615930 /* PBXTextBookmark */ = 8E7DAB350867412700615930 /* PBXTextBookmark */; + 8E7DAB360867412700615930 /* PBXTextBookmark */ = 8E7DAB360867412700615930 /* PBXTextBookmark */; + 8E7DAB430867421200615930 /* PBXTextBookmark */ = 8E7DAB430867421200615930 /* PBXTextBookmark */; + 8E7DAB440867421200615930 /* PBXTextBookmark */ = 8E7DAB440867421200615930 /* PBXTextBookmark */; + 8E7DAB470867421200615930 /* PBXTextBookmark */ = 8E7DAB470867421200615930 /* PBXTextBookmark */; + 8E7DAB480867421200615930 /* PBXTextBookmark */ = 8E7DAB480867421200615930 /* PBXTextBookmark */; + 8E7DAB490867421200615930 /* PBXTextBookmark */ = 8E7DAB490867421200615930 /* PBXTextBookmark */; + 8E7DAB4A0867421200615930 /* PBXTextBookmark */ = 8E7DAB4A0867421200615930 /* PBXTextBookmark */; + 8E7DAB4B0867421200615930 /* PBXTextBookmark */ = 8E7DAB4B0867421200615930 /* PBXTextBookmark */; + 8E7DAB540867424400615930 /* PBXTextBookmark */ = 8E7DAB540867424400615930 /* PBXTextBookmark */; + 8E7DAB550867424400615930 /* PBXTextBookmark */ = 8E7DAB550867424400615930 /* PBXTextBookmark */; + 8E7DAB560867424400615930 /* PBXTextBookmark */ = 8E7DAB560867424400615930 /* PBXTextBookmark */; + 8E7DAB570867424400615930 /* PBXTextBookmark */ = 8E7DAB570867424400615930 /* PBXTextBookmark */; + 8E7DAB580867424400615930 /* PBXTextBookmark */ = 8E7DAB580867424400615930 /* PBXTextBookmark */; + 8E7DAB78086742EB00615930 /* PBXTextBookmark */ = 8E7DAB78086742EB00615930 /* PBXTextBookmark */; + 8E7DAB79086742EB00615930 /* PBXTextBookmark */ = 8E7DAB79086742EB00615930 /* PBXTextBookmark */; + 8E7DAB7A086742EB00615930 /* PBXTextBookmark */ = 8E7DAB7A086742EB00615930 /* PBXTextBookmark */; + 8E7DAB7C086742EB00615930 /* PBXTextBookmark */ = 8E7DAB7C086742EB00615930 /* PBXTextBookmark */; + 8E7DAB7D086742EB00615930 /* PBXTextBookmark */ = 8E7DAB7D086742EB00615930 /* PBXTextBookmark */; + 8E7DAB7E086742EB00615930 /* PBXTextBookmark */ = 8E7DAB7E086742EB00615930 /* PBXTextBookmark */; + 8E7DAB7F086742EB00615930 /* PBXTextBookmark */ = 8E7DAB7F086742EB00615930 /* PBXTextBookmark */; + 8E7DAB80086742EB00615930 /* PBXTextBookmark */ = 8E7DAB80086742EB00615930 /* PBXTextBookmark */; + 8E7DAB81086742EB00615930 /* PBXTextBookmark */ = 8E7DAB81086742EB00615930 /* PBXTextBookmark */; + 8E7DAB82086742EB00615930 /* PBXTextBookmark */ = 8E7DAB82086742EB00615930 /* PBXTextBookmark */; + 8E7DAB83086742EB00615930 /* PBXTextBookmark */ = 8E7DAB83086742EB00615930 /* PBXTextBookmark */; + 8E7DAB84086742EB00615930 /* PBXTextBookmark */ = 8E7DAB84086742EB00615930 /* PBXTextBookmark */; + 8E7DAB85086742EB00615930 /* PBXTextBookmark */ = 8E7DAB85086742EB00615930 /* PBXTextBookmark */; + 8E7DAB9D0867470600615930 /* PBXTextBookmark */ = 8E7DAB9D0867470600615930 /* PBXTextBookmark */; + 8E7DAB9E0867470600615930 /* PBXTextBookmark */ = 8E7DAB9E0867470600615930 /* PBXTextBookmark */; + 8E7DAB9F0867470600615930 /* PBXTextBookmark */ = 8E7DAB9F0867470600615930 /* PBXTextBookmark */; + 8E7DABA00867470600615930 /* PBXTextBookmark */ = 8E7DABA00867470600615930 /* PBXTextBookmark */; + 8E7DABA10867470600615930 /* PBXTextBookmark */ = 8E7DABA10867470600615930 /* PBXTextBookmark */; + 8E7DABA20867470600615930 /* PBXTextBookmark */ = 8E7DABA20867470600615930 /* PBXTextBookmark */; + 8E7DABA30867470600615930 /* PBXTextBookmark */ = 8E7DABA30867470600615930 /* PBXTextBookmark */; + 8E7DABA40867470600615930 /* PBXTextBookmark */ = 8E7DABA40867470600615930 /* PBXTextBookmark */; + 8E7DABA50867470600615930 /* PBXTextBookmark */ = 8E7DABA50867470600615930 /* 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 */; + 8E8C7BFB085E9CD50086DAC7 /* PBXTextBookmark */ = 8E8C7BFB085E9CD50086DAC7 /* PBXTextBookmark */; + 8E8C7C14085E9DA50086DAC7 /* PBXTextBookmark */ = 8E8C7C14085E9DA50086DAC7 /* PBXTextBookmark */; + 8E8C7C7F085EA5E30086DAC7 /* PBXTextBookmark */ = 8E8C7C7F085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C81085EA5E30086DAC7 /* PBXTextBookmark */ = 8E8C7C81085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C83085EA5E30086DAC7 /* PBXTextBookmark */ = 8E8C7C83085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C85085EA5E30086DAC7 /* PBXTextBookmark */ = 8E8C7C85085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C8C085EA5E30086DAC7 /* PBXTextBookmark */ = 8E8C7C8C085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C8E085EA5E30086DAC7 /* PBXTextBookmark */ = 8E8C7C8E085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C90085EA5E30086DAC7 /* PBXTextBookmark */ = 8E8C7C90085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C92085EA5E30086DAC7 /* PBXTextBookmark */ = 8E8C7C92085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7C98085EA5E30086DAC7 /* PBXTextBookmark */ = 8E8C7C98085EA5E30086DAC7 /* PBXTextBookmark */; + 8E8C7D35085EAD460086DAC7 /* PBXTextBookmark */ = 8E8C7D35085EAD460086DAC7 /* PBXTextBookmark */; + 8E8C7D36085EAD460086DAC7 /* PBXTextBookmark */ = 8E8C7D36085EAD460086DAC7 /* PBXTextBookmark */; + 8E8F3F59085546B300BCF803 /* PBXTextBookmark */ = 8E8F3F59085546B300BCF803 /* PBXTextBookmark */; + 8E8F3F780855483300BCF803 /* PBXTextBookmark */ = 8E8F3F780855483300BCF803 /* 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 */; + 8EABE7C508562FF3004DF882 /* PBXTextBookmark */ = 8EABE7C508562FF3004DF882 /* 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 */; + 8EC156F9084FEB8900BB24E8 /* PBXTextBookmark */ = 8EC156F9084FEB8900BB24E8 /* 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 */; + 8EE4A6C3082E6F6100415456 /* PBXTextBookmark */ = 8EE4A6C3082E6F6100415456 /* PBXTextBookmark */; + 8EE4A6C8082E6F6100415456 /* PBXTextBookmark */ = 8EE4A6C8082E6F6100415456 /* PBXTextBookmark */; + 8EE4A6FE082E704E00415456 /* PBXTextBookmark */ = 8EE4A6FE082E704E00415456 /* PBXTextBookmark */; + 8EE4A799082E7D8700415456 /* PBXTextBookmark */ = 8EE4A799082E7D8700415456 /* PBXTextBookmark */; + 8EE558070866A24B009E7F50 /* PBXTextBookmark */ = 8EE558070866A24B009E7F50 /* 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 */; + 8EFC6DE8085380B800C67D06 /* PBXTextBookmark */ = 8EFC6DE8085380B800C67D06 /* PBXTextBookmark */; + 8EFC6DF0085380B800C67D06 /* PBXTextBookmark */ = 8EFC6DF0085380B800C67D06 /* PBXTextBookmark */; + 8EFC6E29085386CE00C67D06 /* PBXTextBookmark */ = 8EFC6E29085386CE00C67D06 /* PBXTextBookmark */; }; sourceControlManager = 8EB77466082DA402005891CA /* Source Control */; userBuildSettings = { @@ -582,7 +630,7 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {4550, 4340}}"; sepNavSelRange = "{2267, 0}"; - sepNavVisRect = "{{0, 231}, {775, 546}}"; + sepNavVisRect = "{{0, 397}, {775, 373}}"; }; }; 8E287164083695080013CE39 /* PBXTextBookmark */ = { @@ -595,26 +643,6 @@ vrLen = 1783; vrLoc = 0; }; - 8E287CDC0855D60A00562C66 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E8F3F9B0855499500BCF803 /* README */; - name = "README: 2"; - rLen = 0; - rLoc = 105; - rType = 0; - vrLen = 1522; - vrLoc = 0; - }; - 8E287CDD0855D60A00562C66 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; - name = "Changelog: 11"; - rLen = 0; - rLoc = 458; - rType = 0; - vrLen = 459; - vrLoc = 0; - }; 8E287E480855F2EC00562C66 /* InfoView.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; @@ -649,29 +677,19 @@ vrLen = 79; vrLoc = 0; }; - 8E287E7F0855F60E00562C66 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E2871090836934A0013CE39 /* VirtualRingBuffer.m */; - name = "VirtualRingBuffer.m: 51"; - rLen = 0; - rLoc = 2267; - rType = 0; - vrLen = 825; - vrLoc = 1533; - }; 8E297908083D891500F2C55A /* TrackingCell.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {983, 392}}"; - sepNavSelRange = "{355, 0}"; - sepNavVisRect = "{{0, 0}, {983, 310}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 392}}"; + sepNavSelRange = "{520, 0}"; + sepNavVisRect = "{{0, 19}, {775, 373}}"; sepNavWindowFrame = "{{15, 61}, {702, 680}}"; }; }; 8E297909083D891500F2C55A /* TrackingCell.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 547}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; sepNavSelRange = "{311, 0}"; - sepNavVisRect = "{{0, 0}, {775, 547}}"; + sepNavVisRect = "{{0, 0}, {775, 373}}"; sepNavWindowFrame = "{{15, 61}, {702, 680}}"; }; }; @@ -700,7 +718,7 @@ fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; name = "SoundController.m: 6"; rLen = 0; - rLoc = 1122; + rLoc = 1151; rType = 0; vrLen = 67; vrLoc = 0; @@ -709,15 +727,15 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {860, 1848}}"; sepNavSelRange = "{2925, 0}"; - sepNavVisRect = "{{0, 204}, {775, 546}}"; + sepNavVisRect = "{{0, 379}, {775, 373}}"; sepNavWindowFrame = "{{15, 61}, {702, 680}}"; }; }; 8E45227B0832898A00F8BA7C /* Sound.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1208, 10570}}"; - sepNavSelRange = "{7974, 183}"; - sepNavVisRect = "{{0, 2006}, {775, 546}}"; + sepNavSelRange = "{5223, 0}"; + sepNavVisRect = "{{0, 2189}, {775, 373}}"; sepNavWindowFrame = "{{15, 66}, {702, 680}}"; }; }; @@ -765,8 +783,8 @@ 8E47218808318D7A001F89FA /* PlaylistController.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {896, 7154}}"; - sepNavSelRange = "{9523, 0}"; - sepNavVisRect = "{{0, 728}, {775, 373}}"; + sepNavSelRange = "{1199, 0}"; + sepNavVisRect = "{{0, 441}, {775, 373}}"; }; }; 8E47218908318D7A001F89FA /* PlaylistEntry.h */ = { @@ -889,21 +907,21 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1340, 2086}}"; sepNavSelRange = "{624, 0}"; - sepNavVisRect = "{{0, 1471}, {775, 373}}"; + sepNavVisRect = "{{0, 782}, {775, 373}}"; }; }; 8E4721D4083192C2001F89FA /* SoundController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 756}}"; - sepNavSelRange = "{462, 0}"; - sepNavVisRect = "{{0, 0}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 812}}"; + sepNavSelRange = "{709, 0}"; + sepNavVisRect = "{{0, 75}, {775, 373}}"; }; }; 8E4721D5083192C2001F89FA /* SoundController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {950, 4522}}"; - sepNavSelRange = "{6390, 0}"; - sepNavVisRect = "{{0, 3570}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {950, 4928}}"; + sepNavSelRange = "{5035, 0}"; + sepNavVisRect = "{{0, 2861}, {775, 373}}"; sepNavWindowFrame = "{{15, 61}, {1016, 680}}"; }; }; @@ -969,9 +987,9 @@ }; 8E5A90B0084CBC2F00AE6D62 /* Changelog */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 546}}"; - sepNavSelRange = "{541, 0}"; - sepNavVisRect = "{{0, 0}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; + sepNavSelRange = "{709, 0}"; + sepNavVisRect = "{{0, 0}, {775, 373}}"; }; }; 8E5A90BB084CC25900AE6D62 /* PBXTextBookmark */ = { @@ -979,7 +997,7 @@ fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; name = "Changelog: 3"; rLen = 0; - rLoc = 459; + rLoc = 672; rType = 0; vrLen = 131; vrLoc = 0; @@ -994,26 +1012,6 @@ 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 */; @@ -1076,58 +1074,18 @@ }; 8E6529FF083D93EB00A7AF1B /* TrackingSlider.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 547}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; sepNavSelRange = "{106, 0}"; - sepNavVisRect = "{{0, 0}, {775, 547}}"; + sepNavVisRect = "{{0, 0}, {775, 373}}"; }; }; 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 547}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 546}}"; sepNavSelRange = "{664, 0}"; - sepNavVisRect = "{{0, 0}, {775, 547}}"; + sepNavVisRect = "{{0, 0}, {775, 373}}"; }; }; - 8E652A33083E1A7900A7AF1B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E297908083D891500F2C55A /* TrackingCell.m */; - name = "TrackingCell.m: 26"; - rLen = 0; - rLoc = 520; - rType = 0; - vrLen = 522; - vrLoc = 0; - }; - 8E652A34083E1A7900A7AF1B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E297909083D891500F2C55A /* TrackingCell.h */; - name = "TrackingCell.h: 13"; - rLen = 0; - rLoc = 311; - rType = 0; - vrLen = 317; - vrLoc = 0; - }; - 8E652A35083E1A7900A7AF1B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E6529FF083D93EB00A7AF1B /* TrackingSlider.h */; - name = "TrackingSlider.h: 10"; - rLen = 0; - rLoc = 106; - rType = 0; - vrLen = 111; - vrLoc = 0; - }; - 8E652A36083E1A7900A7AF1B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */; - name = "TrackingSlider.m: 35"; - rLen = 0; - rLoc = 664; - rType = 0; - vrLen = 684; - vrLoc = 0; - }; 8E652A39083E1A7900A7AF1B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E6529FF083D93EB00A7AF1B /* TrackingSlider.h */; @@ -1158,16 +1116,6 @@ 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; - }; 8E65359E0856401D00E468D9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E2871080836934A0013CE39 /* VirtualRingBuffer.h */; @@ -1178,36 +1126,6 @@ vrLen = 1460; vrLoc = 3376; }; - 8E657298086085E400A0DAC4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - name = NSApplication; - rLen = 13; - rLoc = 2445; - rType = 0; - vrLen = 927; - vrLoc = 1558; - }; - 8E657299086085E400A0DAC4 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; - name = "Sound.m: sendPortMessage:withData:ofSize:"; - rLen = 183; - rLoc = 7974; - rType = 0; - 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; fRef = 8E47218908318D7A001F89FA /* PlaylistEntry.h */; @@ -1218,6 +1136,681 @@ vrLen = 410; vrLoc = 266; }; + 8E7DAAA808673DF600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + name = "Info.plist: 92"; + rLen = 0; + rLoc = 2194; + rType = 0; + vrLen = 641; + vrLoc = 1499; + }; + 8E7DAAAA08673DF600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + name = "Info.plist: 92"; + rLen = 0; + rLoc = 2194; + rType = 0; + vrLen = 641; + vrLoc = 1499; + }; + 8E7DAAAB08673DF600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D208319294001F89FA /* AppController.m */; + name = "AppController.m: 16"; + rLen = 0; + rLoc = 624; + rType = 0; + vrLen = 598; + vrLoc = 2940; + }; + 8E7DAAF70867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 46"; + rLen = 0; + rLoc = 1199; + rType = 0; + vrLen = 645; + vrLoc = 739; + }; + 8E7DAAF80867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8BAE5608548BE800E9F14D /* ShnFile.m */; + name = "ShnFile.m: fillBuffer:ofSize:"; + rLen = 0; + rLoc = 1832; + rType = 0; + vrLen = 356; + vrLoc = 1747; + }; + 8E7DAAF90867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */; + name = "SoundFile.m: 147"; + rLen = 0; + rLoc = 3015; + rType = 0; + vrLen = 324; + vrLoc = 3596; + }; + 8E7DAAFB0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 10"; + rLen = 0; + rLoc = 633; + rType = 0; + vrLen = 1200; + vrLoc = 309; + }; + 8E7DAAFC0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E45227A0832898A00F8BA7C /* Sound.h */; + name = "Sound.h: setSoundFile:"; + rLen = 0; + rLoc = 2925; + rType = 0; + vrLen = 521; + vrLoc = 525; + }; + 8E7DAAFD0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; + name = "Sound.m: 172"; + rLen = 0; + rLoc = 5223; + rType = 0; + vrLen = 670; + vrLoc = 4843; + }; + 8E7DAAFE0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E2871090836934A0013CE39 /* VirtualRingBuffer.m */; + name = "VirtualRingBuffer.m: 51"; + rLen = 0; + rLoc = 2267; + rType = 0; + vrLen = 573; + vrLoc = 1784; + }; + 8E7DAAFF0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D208319294001F89FA /* AppController.m */; + name = "AppController.m: 16"; + rLen = 0; + rLoc = 624; + rType = 0; + vrLen = 985; + vrLoc = 1414; + }; + 8E7DAB020867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 46"; + rLen = 0; + rLoc = 1199; + rType = 0; + vrLen = 645; + vrLoc = 739; + }; + 8E7DAB030867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8BAE5608548BE800E9F14D /* ShnFile.m */; + name = "ShnFile.m: fillBuffer:ofSize:"; + rLen = 0; + rLoc = 1832; + rType = 0; + vrLen = 356; + vrLoc = 1747; + }; + 8E7DAB040867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */; + name = "SoundFile.m: 147"; + rLen = 0; + rLoc = 3015; + rType = 0; + vrLen = 324; + vrLoc = 3596; + }; + 8E7DAB050867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 8"; + rLen = 0; + rLoc = 245; + rType = 0; + vrLen = 594; + vrLoc = 0; + }; + 8E7DAB060867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 10"; + rLen = 0; + rLoc = 633; + rType = 0; + vrLen = 1200; + vrLoc = 309; + }; + 8E7DAB070867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E45227A0832898A00F8BA7C /* Sound.h */; + name = "Sound.h: setSoundFile:"; + rLen = 0; + rLoc = 2925; + rType = 0; + vrLen = 521; + vrLoc = 525; + }; + 8E7DAB080867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; + name = "Sound.m: 172"; + rLen = 0; + rLoc = 5223; + rType = 0; + vrLen = 670; + vrLoc = 4843; + }; + 8E7DAB090867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E2871090836934A0013CE39 /* VirtualRingBuffer.m */; + name = "VirtualRingBuffer.m: 51"; + rLen = 0; + rLoc = 2267; + rType = 0; + vrLen = 573; + vrLoc = 1784; + }; + 8E7DAB0A0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D208319294001F89FA /* AppController.m */; + name = "AppController.m: 16"; + rLen = 0; + rLoc = 624; + rType = 0; + vrLen = 985; + vrLoc = 1414; + }; + 8E7DAB0B0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 279"; + rLen = 0; + rLoc = 6887; + rType = 0; + vrLen = 539; + vrLoc = 1243; + }; + 8E7DAB0C0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D4083192C2001F89FA /* SoundController.h */; + name = "- (IBAction)showTimeRemaining;"; + rLen = 47; + rLoc = 663; + rType = 0; + vrLen = 558; + vrLoc = 392; + }; + 8E7DAB0D0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 296"; + rLen = 0; + rLoc = 7091; + rType = 0; + vrLen = 774; + vrLoc = 6082; + }; + 8E7DAB0E0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D4083192C2001F89FA /* SoundController.h */; + name = "- (IBAction)showTimeRemaining;"; + rLen = 47; + rLoc = 663; + rType = 0; + vrLen = 570; + vrLoc = 125; + }; + 8E7DAB0F0867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 303"; + rLen = 0; + rLoc = 7259; + rType = 0; + vrLen = 685; + vrLoc = 6473; + }; + 8E7DAB100867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D4083192C2001F89FA /* SoundController.h */; + name = "- (IBAction)showTimeRemaining;"; + rLen = 47; + rLoc = 663; + rType = 0; + vrLen = 569; + vrLoc = 125; + }; + 8E7DAB110867402D00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 212"; + rLen = 0; + rLoc = 4673; + rType = 0; + vrLen = 598; + vrLoc = 4388; + }; + 8E7DAB320867412700615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D4083192C2001F89FA /* SoundController.h */; + name = "SoundController.h: toggleShowTimeRemaining"; + rLen = 0; + rLoc = 682; + rType = 0; + vrLen = 575; + vrLoc = 125; + }; + 8E7DAB330867412700615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 212"; + rLen = 0; + rLoc = 4673; + rType = 0; + vrLen = 598; + vrLoc = 4388; + }; + 8E7DAB340867412700615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D4083192C2001F89FA /* SoundController.h */; + name = "SoundController.h: toggleShowTimeRemaining"; + rLen = 0; + rLoc = 682; + rType = 0; + vrLen = 564; + vrLoc = 392; + }; + 8E7DAB350867412700615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 212"; + rLen = 0; + rLoc = 4673; + rType = 0; + vrLen = 598; + vrLoc = 4388; + }; + 8E7DAB360867412700615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D4083192C2001F89FA /* SoundController.h */; + name = "SoundController.h: toggleShowTimeRemaining:"; + rLen = 0; + rLoc = 709; + rType = 0; + vrLen = 538; + vrLoc = 429; + }; + 8E7DAB430867421200615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E297909083D891500F2C55A /* TrackingCell.h */; + name = "TrackingCell.h: 13"; + rLen = 0; + rLoc = 311; + rType = 0; + vrLen = 317; + vrLoc = 0; + }; + 8E7DAB440867421200615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E6529FF083D93EB00A7AF1B /* TrackingSlider.h */; + name = "TrackingSlider.h: 10"; + rLen = 0; + rLoc = 106; + rType = 0; + vrLen = 111; + vrLoc = 0; + }; + 8E7DAB470867421200615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 303"; + rLen = 0; + rLoc = 7228; + rType = 0; + vrLen = 715; + vrLoc = 6296; + }; + 8E7DAB480867421200615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E297908083D891500F2C55A /* TrackingCell.m */; + name = "TrackingCell.m: 26"; + rLen = 0; + rLoc = 520; + rType = 0; + vrLen = 526; + vrLoc = 0; + }; + 8E7DAB490867421200615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E297909083D891500F2C55A /* TrackingCell.h */; + name = "TrackingCell.h: 13"; + rLen = 0; + rLoc = 311; + rType = 0; + vrLen = 317; + vrLoc = 0; + }; + 8E7DAB4A0867421200615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E6529FF083D93EB00A7AF1B /* TrackingSlider.h */; + name = "TrackingSlider.h: 10"; + rLen = 0; + rLoc = 106; + rType = 0; + vrLen = 111; + vrLoc = 0; + }; + 8E7DAB4B0867421200615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */; + name = "TrackingSlider.m: 35"; + rLen = 0; + rLoc = 664; + rType = 0; + vrLen = 448; + vrLoc = 236; + }; + 8E7DAB4D0867423900615930 /* ClickField.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; + sepNavSelRange = "{69, 0}"; + sepNavVisRect = "{{0, 0}, {775, 373}}"; + }; + }; + 8E7DAB4E0867423900615930 /* ClickField.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; + sepNavSelRange = "{253, 0}"; + sepNavVisRect = "{{0, 0}, {775, 373}}"; + sepNavWindowFrame = "{{15, 60}, {1017, 681}}"; + }; + }; + 8E7DAB540867424400615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E297908083D891500F2C55A /* TrackingCell.m */; + name = "TrackingCell.m: 26"; + rLen = 0; + rLoc = 520; + rType = 0; + vrLen = 526; + vrLoc = 0; + }; + 8E7DAB550867424400615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4D0867423900615930 /* ClickField.h */; + name = "ClickField.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 88; + vrLoc = 0; + }; + 8E7DAB560867424400615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4E0867423900615930 /* ClickField.m */; + name = "ClickField.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 57; + vrLoc = 0; + }; + 8E7DAB570867424400615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4D0867423900615930 /* ClickField.h */; + name = "ClickField.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 88; + vrLoc = 0; + }; + 8E7DAB580867424400615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4E0867423900615930 /* ClickField.m */; + name = "ClickField.m: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 57; + vrLoc = 0; + }; + 8E7DAB78086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */; + name = "TrackingSlider.m: 35"; + rLen = 0; + rLoc = 664; + rType = 0; + vrLen = 571; + vrLoc = 0; + }; + 8E7DAB79086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E297908083D891500F2C55A /* TrackingCell.m */; + name = "TrackingCell.m: 26"; + rLen = 0; + rLoc = 520; + rType = 0; + vrLen = 501; + vrLoc = 25; + }; + 8E7DAB7A086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4D0867423900615930 /* ClickField.h */; + name = "ClickField.h: 4"; + rLen = 0; + rLoc = 69; + rType = 0; + vrLen = 160; + vrLoc = 0; + }; + 8E7DAB7C086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4D0867423900615930 /* ClickField.h */; + name = "ClickField.h: 7"; + rLen = 0; + rLoc = 152; + rType = 0; + vrLen = 90; + vrLoc = 0; + }; + 8E7DAB7D086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4E0867423900615930 /* ClickField.m */; + name = "ClickField.m: 17"; + rLen = 0; + rLoc = 254; + rType = 0; + vrLen = 353; + vrLoc = 0; + }; + 8E7DAB7E086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4D0867423900615930 /* ClickField.h */; + name = "ClickField.h: 9"; + rLen = 0; + rLoc = 159; + rType = 0; + vrLen = 90; + vrLoc = 0; + }; + 8E7DAB7F086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */; + name = "TrackingSlider.m: 35"; + rLen = 0; + rLoc = 664; + rType = 0; + vrLen = 448; + vrLoc = 236; + }; + 8E7DAB80086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4D0867423900615930 /* ClickField.h */; + name = "ClickField.h: 9"; + rLen = 0; + rLoc = 159; + rType = 0; + vrLen = 90; + vrLoc = 0; + }; + 8E7DAB81086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4E0867423900615930 /* ClickField.m */; + name = "ClickField.m: 17"; + rLen = 0; + rLoc = 254; + rType = 0; + vrLen = 353; + vrLoc = 0; + }; + 8E7DAB82086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */; + name = "TrackingSlider.m: 35"; + rLen = 0; + rLoc = 664; + rType = 0; + vrLen = 571; + vrLoc = 0; + }; + 8E7DAB83086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E297908083D891500F2C55A /* TrackingCell.m */; + name = "TrackingCell.m: 26"; + rLen = 0; + rLoc = 520; + rType = 0; + vrLen = 501; + vrLoc = 25; + }; + 8E7DAB84086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4E0867423900615930 /* ClickField.m */; + name = "ClickField.m: 4"; + rLen = 0; + rLoc = 51; + rType = 0; + vrLen = 260; + vrLoc = 0; + }; + 8E7DAB85086742EB00615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4D0867423900615930 /* ClickField.h */; + name = "ClickField.h: 4"; + rLen = 0; + rLoc = 69; + rType = 0; + vrLen = 160; + vrLoc = 0; + }; + 8E7DAB9D0867470600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4E0867423900615930 /* ClickField.m */; + name = "ClickField.m: 15"; + rLen = 0; + rLoc = 253; + rType = 0; + vrLen = 260; + vrLoc = 0; + }; + 8E7DAB9E0867470600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D4083192C2001F89FA /* SoundController.h */; + name = "SoundController.h: toggleShowTimeRemaining:"; + rLen = 0; + rLoc = 709; + rType = 0; + vrLen = 594; + vrLoc = 66; + }; + 8E7DAB9F0867470600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 229"; + rLen = 0; + rLoc = 5035; + rType = 0; + vrLen = 632; + vrLoc = 4461; + }; + 8E7DABA00867470600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 8"; + rLen = 0; + rLoc = 245; + rType = 0; + vrLen = 594; + vrLoc = 0; + }; + 8E7DABA10867470600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4E0867423900615930 /* ClickField.m */; + name = "ClickField.m: 15"; + rLen = 0; + rLoc = 253; + rType = 0; + vrLen = 260; + vrLoc = 0; + }; + 8E7DABA20867470600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 228"; + rLen = 0; + rLoc = 5006; + rType = 0; + vrLen = 568; + vrLoc = 4461; + }; + 8E7DABA30867470600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D4083192C2001F89FA /* SoundController.h */; + name = "SoundController.h: toggleShowTimeRemaining:"; + rLen = 0; + rLoc = 709; + rType = 0; + vrLen = 594; + vrLoc = 66; + }; + 8E7DABA40867470600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 229"; + rLen = 0; + rLoc = 5035; + rType = 0; + vrLen = 632; + vrLoc = 4461; + }; + 8E7DABA50867470600615930 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 21"; + rLen = 0; + rLoc = 709; + rType = 0; + vrLen = 709; + vrLoc = 0; + }; 8E8BAE5108548BD500E9F14D /* WavPackFile.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 372}}"; @@ -1242,9 +1835,9 @@ }; 8E8BAE5608548BE800E9F14D /* ShnFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 1666}}"; - sepNavSelRange = "{2042, 0}"; - sepNavVisRect = "{{0, 1036}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {983, 1666}}"; + sepNavSelRange = "{1600, 49}"; + sepNavVisRect = "{{0, 1028}, {983, 310}}"; }; }; 8E8BAEB208548C9600E9F14D /* PBXTextBookmark */ = { @@ -1538,18 +2131,9 @@ sepNavIntBoundsRect = "{{0, 0}, {775, 546}}"; sepNavSelRange = "{105, 0}"; sepNavVisRect = "{{0, 0}, {775, 546}}"; + sepNavWindowFrame = "{{15, 60}, {1017, 681}}"; }; }; - 8E8F3FA408554B8000BCF803 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; - name = "PlaylistController.m: setShuffle:"; - rLen = 0; - rLoc = 8647; - rType = 0; - vrLen = 472; - vrLoc = 8263; - }; 8E8F3FAE08554B8000BCF803 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E8F3F9B0855499500BCF803 /* README */; @@ -1557,7 +2141,7 @@ rLen = 0; rLoc = 105; rType = 0; - vrLen = 1522; + vrLen = 1509; vrLoc = 0; }; 8E91CCEE08549FEE0055EC68 /* PBXTextBookmark */ = { @@ -1570,16 +2154,6 @@ 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 */; @@ -1701,16 +2275,6 @@ isa = PBXBookmark; fRef = 8EAFD27408465E5600107BA5 /* pause_blue.png */; }; - 8EABE7C408562FF3004DF882 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E4721D4083192C2001F89FA /* SoundController.h */; - name = "SoundController.h: playButton"; - rLen = 0; - rLoc = 462; - rType = 0; - vrLen = 832; - vrLoc = 0; - }; 8EABE7C508562FF3004DF882 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E4721D108319294001F89FA /* AppController.h */; @@ -2018,27 +2582,7 @@ 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 */ = { + 8EEFDF8808410C00008BB533 /* SoundController.m:296 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2047,7 +2591,7 @@ fileReference = 8E4721D5083192C2001F89FA /* SoundController.m */; functionName = "-handlePortMessage:"; hitCount = 0; - lineNumber = 275; + lineNumber = 296; modificationTime = 139882034.259246; state = 2; }; @@ -2141,8 +2685,8 @@ 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1010, 3066}}"; - sepNavSelRange = "{3747, 0}"; - sepNavVisRect = "{{0, 0}, {775, 546}}"; + sepNavSelRange = "{3471, 0}"; + sepNavVisRect = "{{0, 134}, {983, 310}}"; sepNavWindowFrame = "{{15, 61}, {750, 680}}"; }; }; diff --git a/English.lproj/MainMenu.nib/classes.nib b/English.lproj/MainMenu.nib/classes.nib index 2e2fcebbb..d6154bd27 100644 --- a/English.lproj/MainMenu.nib/classes.nib +++ b/English.lproj/MainMenu.nib/classes.nib @@ -26,6 +26,12 @@ }; SUPERCLASS = NSObject; }, + { + CLASS = ClickField; + LANGUAGE = ObjC; + OUTLETS = {soundController = SoundController; }; + SUPERCLASS = NSTextField; + }, { CLASS = DNDArrayController; LANGUAGE = ObjC; @@ -72,6 +78,7 @@ resume = id; seek = id; stop = id; + toggleShowTimeRemaining = id; }; CLASS = SoundController; LANGUAGE = ObjC; diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib index 56599ffc8..16efa9003 100644 --- a/English.lproj/MainMenu.nib/info.nib +++ b/English.lproj/MainMenu.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 349 139 356 240 0 0 1024 746 + 288 118 356 240 0 0 1024 746 IBEditorPositions 29 @@ -20,8 +20,8 @@ IBOpenObjects 463 - 29 21 + 29 IBSystem Version 8B15 diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index 13760412d..89998e01c 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/SoundController.h b/SoundController.h index c4385b02e..9368f0d33 100644 --- a/SoundController.h +++ b/SoundController.h @@ -25,11 +25,15 @@ int playbackStatus; + BOOL showTimeRemaining; + //For communication with the sound NSPort *sendPort; NSPort *distantPort; } +- (IBAction)toggleShowTimeRemaining:(id)sender; + - (IBAction)playPauseResume:(id)sender; - (IBAction)pauseResume:(id)sender; diff --git a/SoundController.m b/SoundController.m index 0f86c3569..1b204e0cf 100644 --- a/SoundController.m +++ b/SoundController.m @@ -15,6 +15,8 @@ { sound = [[Sound alloc] init]; playbackStatus = kCogStatusStopped; + + showTimeRemaining = NO; } return self; @@ -207,6 +209,25 @@ [playButton setAlternateImage:alt]; } +- (IBAction)toggleShowTimeRemaining:(id)sender +{ + NSString *text; + + showTimeRemaining = !showTimeRemaining; + if (showTimeRemaining == NO) + { + int sec = (int)([positionSlider doubleValue]/1000.0); + text = [NSString stringWithFormat:@"%i:%02i", sec/60, sec%60]; + } + else + { + int sec = (int)(([positionSlider maxValue] - [positionSlider doubleValue])/1000.0); + text = [NSString stringWithFormat:@"%i:%02i", sec/60, sec%60]; + } + + [timeField setStringValue:text]; +} + - (void)handlePortMessage:(NSPortMessage *)portMessage { @@ -287,9 +308,17 @@ [positionSlider setDoubleValue:pos]; } - int sec = (int)(pos/1000.0); NSString *text; - text = [NSString stringWithFormat:@"%i:%02i", sec/60, sec%60]; + if (showTimeRemaining == NO) + { + int sec = (int)(pos/1000.0); + text = [NSString stringWithFormat:@"%i:%02i", sec/60, sec%60]; + } + else + { + int sec = (int)(([positionSlider maxValue] - pos)/1000.0); + text = [NSString stringWithFormat:@"%i:%02i", sec/60, sec%60]; + } [timeField setStringValue:text]; } else if (message == kCogStatusUpdateMessage)