diff --git a/AppController.h b/AppController.h index 5222ecfaf..5a5edb3be 100644 --- a/AppController.h +++ b/AppController.h @@ -22,7 +22,6 @@ - (IBAction)addFiles:(id)sender; - (IBAction)delEntries:(id)sender; -- (IBAction)showInfo:(id)sender; - (IBAction)savePlaylist:(id)sender; - (IBAction)savePlaylistAs:(id)sender; - (IBAction)loadPlaylist:(id)sender; diff --git a/Changelog b/Changelog index d3a8ab7e8..37f4116da 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,12 @@ +0.04 +---- +Fixed id3v1 tag issue when taggers use spaces to fill empty bytes. +Fixed minor UI (Hide NewApplication) bug. +Fixed version number, so autoupdate should work. +Compiled with GCC3.3, which should hopefully fix issues with 10.3. +Now ignores case when dealing with file extensions. +Added volume slider. + 0.0.3 ----- Fixed bug where Default.playlist referred to non-existent files, resulting in a crash. diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 359fdfc65..84975c179 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -13,17 +13,12 @@ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 8E0EBF0F084BA776003A6E64 /* DBLog.c in Sources */ = {isa = PBXBuildFile; fileRef = 8E0EBF0D084BA776003A6E64 /* DBLog.c */; }; 8E10DBF0084BBCF00013815C /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 8E10DBEF084BBCF00013815C /* Credits.html */; }; - 8E14E469084CF15C00246BCC /* FAAD2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E14E468084CF15C00246BCC /* FAAD2.framework */; }; - 8E14E472084CF16400246BCC /* FAAD2.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E14E468084CF15C00246BCC /* FAAD2.framework */; }; 8E14E47C084CF1A200246BCC /* AACFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E14E47A084CF1A200246BCC /* AACFile.m */; }; 8E267D0E0837F7A6004ACBC5 /* FeedbackController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E267D050837F7A6004ACBC5 /* FeedbackController.m */; }; 8E267D100837F7A6004ACBC5 /* FeedbackSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E267D070837F7A6004ACBC5 /* FeedbackSocket.m */; }; 8E267D120837F7A6004ACBC5 /* MacPADSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E267D0A0837F7A6004ACBC5 /* MacPADSocket.m */; }; 8E267D140837F7A6004ACBC5 /* UpdateController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E267D0C0837F7A6004ACBC5 /* UpdateController.m */; }; 8E28710B0836934A0013CE39 /* VirtualRingBuffer.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E2871090836934A0013CE39 /* VirtualRingBuffer.m */; }; - 8E287E4A0855F2EC00562C66 /* InfoView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E287E480855F2EC00562C66 /* InfoView.h */; }; - 8E287E4B0855F2EC00562C66 /* InfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E287E490855F2EC00562C66 /* InfoView.m */; }; - 8E29790A083D891500F2C55A /* TrackingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E297908083D891500F2C55A /* TrackingCell.m */; }; 8E45227C0832898A00F8BA7C /* Sound.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E45227B0832898A00F8BA7C /* Sound.m */; }; 8E47218D08318D7A001F89FA /* DNDArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E47218608318D7A001F89FA /* DNDArrayController.m */; }; 8E47218E08318D7A001F89FA /* PlaylistController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; }; @@ -31,21 +26,13 @@ 8E47219008318D7A001F89FA /* PlaylistView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E47218C08318D7A001F89FA /* PlaylistView.m */; }; 8E4721D308319294001F89FA /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E4721D208319294001F89FA /* AppController.m */; }; 8E4721D6083192C2001F89FA /* SoundController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E4721D5083192C2001F89FA /* SoundController.m */; }; - 8E5A9032084CB48500AE6D62 /* TagLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E5A9031084CB48500AE6D62 /* TagLib.framework */; }; - 8E5A908D084CB92D00AE6D62 /* TagLib.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E5A9031084CB48500AE6D62 /* TagLib.framework */; }; 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 */; }; + 8E847F73086DEBD600162B93 /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 8E847F72086DEBD600162B93 /* TODO */; }; 8E8BAE5408548BD500E9F14D /* WavPackFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8BAE5208548BD500E9F14D /* WavPackFile.m */; }; 8E8BAE5808548BE800E9F14D /* ShnFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E8BAE5608548BE800E9F14D /* ShnFile.m */; }; - 8E8BAE9908548C5500E9F14D /* Shorten.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E8BAE9808548C5500E9F14D /* Shorten.framework */; }; - 8E8BAE9D08548C6300E9F14D /* WavPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E8BAE9C08548C6300E9F14D /* WavPack.framework */; }; - 8E8BAEA508548C8200E9F14D /* WavPack.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E8BAE9C08548C6300E9F14D /* WavPack.framework */; }; - 8E8BAEA608548C8200E9F14D /* Shorten.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E8BAE9808548C5500E9F14D /* Shorten.framework */; }; 8E8F3F9C0855499500BCF803 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 8E8F3F9B0855499500BCF803 /* README */; }; 8EAB752D0856205B0021C2BF /* repeat_on.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EAB75290856205B0021C2BF /* repeat_on.png */; }; 8EAB752E0856205B0021C2BF /* repeat_off.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EAB752A0856205B0021C2BF /* repeat_off.png */; }; @@ -68,15 +55,34 @@ 8EAFD28F08465E5600107BA5 /* remove_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EAFD27B08465E5600107BA5 /* remove_gray.png */; }; 8EAFD29408465E5600107BA5 /* stop_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EAFD28008465E5600107BA5 /* stop_blue.png */; }; 8EAFD29508465E5600107BA5 /* stop_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 8EAFD28108465E5600107BA5 /* stop_gray.png */; }; + 8EC4BB7E0872E2FB00ACF986 /* ClickField.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EC4BB760872E2FB00ACF986 /* ClickField.m */; }; + 8EC4BB800872E2FB00ACF986 /* InfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EC4BB780872E2FB00ACF986 /* InfoView.m */; }; + 8EC4BB820872E2FB00ACF986 /* TrackingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EC4BB7A0872E2FB00ACF986 /* TrackingCell.m */; }; + 8EC4BB840872E2FB00ACF986 /* TrackingSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EC4BB7C0872E2FB00ACF986 /* TrackingSlider.m */; }; + 8EC4BCC20872EEB800ACF986 /* WavPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCC10872EEB800ACF986 /* WavPack.framework */; }; + 8EC4BCCF0872EEFC00ACF986 /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCCE0872EEFC00ACF986 /* Vorbis.framework */; }; + 8EC4BCD30872EF0C00ACF986 /* TagLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCD20872EF0C00ACF986 /* TagLib.framework */; }; + 8EC4BCD70872EF1600ACF986 /* SndFile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCD60872EF1600ACF986 /* SndFile.framework */; }; + 8EC4BCDB0872EF1F00ACF986 /* Shorten.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCDA0872EF1F00ACF986 /* Shorten.framework */; }; + 8EC4BCDF0872EF3100ACF986 /* Ogg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCDE0872EF3100ACF986 /* Ogg.framework */; }; + 8EC4BCE30872EF3A00ACF986 /* MPCDec.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCE20872EF3A00ACF986 /* MPCDec.framework */; }; + 8EC4BCE70872EF4400ACF986 /* MAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCE60872EF4400ACF986 /* MAC.framework */; }; + 8EC4BCEB0872EF4D00ACF986 /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCEA0872EF4D00ACF986 /* FLAC.framework */; }; + 8EC4BCEF0872EF5600ACF986 /* FAAD2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCEE0872EF5600ACF986 /* FAAD2.framework */; }; + 8EC4BCF30872EF6300ACF986 /* DecMPA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EC4BCF20872EF6300ACF986 /* DecMPA.framework */; }; + 8EC4BD310872EF6A00ACF986 /* DecMPA.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCF20872EF6300ACF986 /* DecMPA.framework */; }; + 8EC4BD320872EF6A00ACF986 /* FAAD2.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCEE0872EF5600ACF986 /* FAAD2.framework */; }; + 8EC4BD330872EF6A00ACF986 /* FLAC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCEA0872EF4D00ACF986 /* FLAC.framework */; }; + 8EC4BD340872EF6A00ACF986 /* MAC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCE60872EF4400ACF986 /* MAC.framework */; }; + 8EC4BD350872EF6A00ACF986 /* MPCDec.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCE20872EF3A00ACF986 /* MPCDec.framework */; }; + 8EC4BD360872EF6A00ACF986 /* Ogg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCDE0872EF3100ACF986 /* Ogg.framework */; }; + 8EC4BD370872EF6A00ACF986 /* Shorten.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCDA0872EF1F00ACF986 /* Shorten.framework */; }; + 8EC4BD380872EF6A00ACF986 /* SndFile.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCD60872EF1600ACF986 /* SndFile.framework */; }; + 8EC4BD390872EF6A00ACF986 /* TagLib.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCD20872EF0C00ACF986 /* TagLib.framework */; }; + 8EC4BD3A0872EF6A00ACF986 /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCCE0872EEFC00ACF986 /* Vorbis.framework */; }; + 8EC4BD3B0872EF6A00ACF986 /* WavPack.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EC4BCC10872EEB800ACF986 /* WavPack.framework */; }; 8EDCBDCB0840617B00F5C7E3 /* Cog.scriptTerminology in Resources */ = {isa = PBXBuildFile; fileRef = 8EDCBDCA0840617B00F5C7E3 /* Cog.scriptTerminology */; }; 8EDCBDCD0840618900F5C7E3 /* Cog.scriptSuite in Resources */ = {isa = PBXBuildFile; fileRef = 8EDCBDCC0840618900F5C7E3 /* Cog.scriptSuite */; }; - 8EE4A685082E6E5100415456 /* DecMPA.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EE4A684082E6E5100415456 /* DecMPA.framework */; }; - 8EE4A689082E6E6000415456 /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EE4A688082E6E6000415456 /* FLAC.framework */; }; - 8EE4A68D082E6E7000415456 /* MAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EE4A68C082E6E7000415456 /* MAC.framework */; }; - 8EE4A691082E6E8000415456 /* MPCDec.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EE4A690082E6E8000415456 /* MPCDec.framework */; }; - 8EE4A695082E6E9100415456 /* Ogg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EE4A694082E6E9100415456 /* Ogg.framework */; }; - 8EE4A699082E6EA000415456 /* SndFile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EE4A698082E6EA000415456 /* SndFile.framework */; }; - 8EE4A69C082E6EB200415456 /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EE4A69B082E6EB200415456 /* Vorbis.framework */; }; 8EF6FA73082DA526006F7BE6 /* FlacFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EF6FA66082DA526006F7BE6 /* FlacFile.m */; }; 8EF6FA74082DA526006F7BE6 /* MonkeysFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EF6FA68082DA526006F7BE6 /* MonkeysFile.m */; }; 8EF6FA75082DA526006F7BE6 /* MPEGFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EF6FA6A082DA526006F7BE6 /* MPEGFile.m */; }; @@ -84,15 +90,27 @@ 8EF6FA77082DA526006F7BE6 /* SoundFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */; }; 8EF6FA78082DA526006F7BE6 /* VorbisFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EF6FA70082DA526006F7BE6 /* VorbisFile.m */; }; 8EF6FA79082DA526006F7BE6 /* WaveFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EF6FA72082DA526006F7BE6 /* WaveFile.m */; }; - 8EFFB6D0083302A500C53833 /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EE4A69B082E6EB200415456 /* Vorbis.framework */; }; - 8EFFB6D1083302A500C53833 /* SndFile.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EE4A698082E6EA000415456 /* SndFile.framework */; }; - 8EFFB6D2083302A500C53833 /* Ogg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EE4A694082E6E9100415456 /* Ogg.framework */; }; - 8EFFB6D3083302A500C53833 /* MPCDec.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EE4A690082E6E8000415456 /* MPCDec.framework */; }; - 8EFFB6D4083302A500C53833 /* MAC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EE4A68C082E6E7000415456 /* MAC.framework */; }; - 8EFFB6D5083302A500C53833 /* FLAC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EE4A688082E6E6000415456 /* FLAC.framework */; }; - 8EFFB6D6083302A500C53833 /* DecMPA.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EE4A684082E6E5100415456 /* DecMPA.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXBuildRule section */ + 8E6A0CCE086CCB5900B90CF9 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.3_3; + fileType = sourcecode.c; + isEditable = 1; + outputFiles = ( + ); + }; + 8E6A0CCF086CCB6600B90CF9 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.gcc.3_3; + fileType = sourcecode.asm; + isEditable = 1; + outputFiles = ( + ); + }; +/* End PBXBuildRule section */ + /* Begin PBXBuildStyle section */ 4A9504CCFFE6A4B311CA0CBA /* Development */ = { isa = PBXBuildStyle; @@ -133,19 +151,17 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 8E8BAEA508548C8200E9F14D /* WavPack.framework in CopyFiles */, - 8E8BAEA608548C8200E9F14D /* Shorten.framework in CopyFiles */, - 8E14E472084CF16400246BCC /* FAAD2.framework in CopyFiles */, - 8E5A908D084CB92D00AE6D62 /* TagLib.framework in CopyFiles */, - 8EFFB6D0083302A500C53833 /* Vorbis.framework in CopyFiles */, - 8EFFB6D1083302A500C53833 /* SndFile.framework in CopyFiles */, - 8EFFB6D2083302A500C53833 /* Ogg.framework in CopyFiles */, - 8EFFB6D3083302A500C53833 /* MPCDec.framework in CopyFiles */, - 8EFFB6D4083302A500C53833 /* MAC.framework in CopyFiles */, - 8EFFB6D5083302A500C53833 /* FLAC.framework in CopyFiles */, - 8EFFB6D6083302A500C53833 /* DecMPA.framework in CopyFiles */, - 8E287E4A0855F2EC00562C66 /* InfoView.h in CopyFiles */, - 8E7DAB4F0867423900615930 /* ClickField.h in CopyFiles */, + 8EC4BD310872EF6A00ACF986 /* DecMPA.framework in CopyFiles */, + 8EC4BD320872EF6A00ACF986 /* FAAD2.framework in CopyFiles */, + 8EC4BD330872EF6A00ACF986 /* FLAC.framework in CopyFiles */, + 8EC4BD340872EF6A00ACF986 /* MAC.framework in CopyFiles */, + 8EC4BD350872EF6A00ACF986 /* MPCDec.framework in CopyFiles */, + 8EC4BD360872EF6A00ACF986 /* Ogg.framework in CopyFiles */, + 8EC4BD370872EF6A00ACF986 /* Shorten.framework in CopyFiles */, + 8EC4BD380872EF6A00ACF986 /* SndFile.framework in CopyFiles */, + 8EC4BD390872EF6A00ACF986 /* TagLib.framework in CopyFiles */, + 8EC4BD3A0872EF6A00ACF986 /* Vorbis.framework in CopyFiles */, + 8EC4BD3B0872EF6A00ACF986 /* WavPack.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -165,7 +181,6 @@ 8E0EBF0C084BA776003A6E64 /* DBLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBLog.h; sourceTree = ""; }; 8E0EBF0D084BA776003A6E64 /* DBLog.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = DBLog.c; sourceTree = ""; }; 8E10DBEF084BBCF00013815C /* Credits.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Credits.html; sourceTree = ""; }; - 8E14E468084CF15C00246BCC /* FAAD2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FAAD2.framework; path = Libraries/FAAD2/build/FAAD2.framework; sourceTree = ""; }; 8E14E479084CF1A200246BCC /* AACFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AACFile.h; sourceTree = ""; }; 8E14E47A084CF1A200246BCC /* AACFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AACFile.m; sourceTree = ""; }; 8E267D040837F7A6004ACBC5 /* FeedbackController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FeedbackController.h; sourceTree = ""; }; @@ -178,10 +193,6 @@ 8E267D0C0837F7A6004ACBC5 /* UpdateController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UpdateController.m; sourceTree = ""; }; 8E2871080836934A0013CE39 /* VirtualRingBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VirtualRingBuffer.h; sourceTree = ""; }; 8E2871090836934A0013CE39 /* VirtualRingBuffer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VirtualRingBuffer.m; sourceTree = ""; }; - 8E287E480855F2EC00562C66 /* InfoView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = InfoView.h; sourceTree = ""; }; - 8E287E490855F2EC00562C66 /* InfoView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = InfoView.m; sourceTree = ""; }; - 8E297908083D891500F2C55A /* TrackingCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = TrackingCell.m; sourceTree = ""; }; - 8E297909083D891500F2C55A /* TrackingCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TrackingCell.h; sourceTree = ""; }; 8E45227A0832898A00F8BA7C /* Sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sound.h; sourceTree = ""; }; 8E45227B0832898A00F8BA7C /* Sound.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = Sound.m; sourceTree = ""; }; 8E47218508318D7A001F89FA /* DNDArrayController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DNDArrayController.h; path = Playlist/DNDArrayController.h; sourceTree = ""; }; @@ -189,28 +200,22 @@ 8E47218708318D7A001F89FA /* PlaylistController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PlaylistController.h; path = Playlist/PlaylistController.h; sourceTree = ""; }; 8E47218808318D7A001F89FA /* PlaylistController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 30; name = PlaylistController.m; path = Playlist/PlaylistController.m; sourceTree = ""; }; 8E47218908318D7A001F89FA /* PlaylistEntry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PlaylistEntry.h; path = Playlist/PlaylistEntry.h; sourceTree = ""; }; - 8E47218A08318D7A001F89FA /* PlaylistEntry.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PlaylistEntry.m; path = Playlist/PlaylistEntry.m; sourceTree = ""; }; + 8E47218A08318D7A001F89FA /* PlaylistEntry.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; name = PlaylistEntry.m; path = Playlist/PlaylistEntry.m; sourceTree = ""; }; 8E47218B08318D7A001F89FA /* PlaylistView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PlaylistView.h; path = Playlist/PlaylistView.h; sourceTree = ""; }; 8E47218C08318D7A001F89FA /* PlaylistView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PlaylistView.m; path = Playlist/PlaylistView.m; sourceTree = ""; }; 8E4721D108319294001F89FA /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; 8E4721D208319294001F89FA /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AppController.m; sourceTree = ""; }; 8E4721D4083192C2001F89FA /* SoundController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SoundController.h; sourceTree = ""; }; 8E4721D5083192C2001F89FA /* SoundController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SoundController.m; sourceTree = ""; }; - 8E5A9031084CB48500AE6D62 /* TagLib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TagLib.framework; path = Libraries/TagLib/build/TagLib.framework; sourceTree = ""; }; 8E5A90B0084CBC2F00AE6D62 /* Changelog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Changelog; sourceTree = ""; }; - 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 = ""; }; + 8E847F72086DEBD600162B93 /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = ""; }; 8E8BAE5108548BD500E9F14D /* WavPackFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WavPackFile.h; sourceTree = ""; }; 8E8BAE5208548BD500E9F14D /* WavPackFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WavPackFile.m; sourceTree = ""; }; 8E8BAE5508548BE800E9F14D /* ShnFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShnFile.h; sourceTree = ""; }; 8E8BAE5608548BE800E9F14D /* ShnFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShnFile.m; sourceTree = ""; }; - 8E8BAE9808548C5500E9F14D /* Shorten.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Shorten.framework; path = Libraries/Shorten/build/Shorten.framework; sourceTree = ""; }; - 8E8BAE9C08548C6300E9F14D /* WavPack.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WavPack.framework; path = Libraries/WavPack/build/WavPack.framework; sourceTree = ""; }; 8E8F3F9B0855499500BCF803 /* README */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README; sourceTree = ""; }; 8EAB75290856205B0021C2BF /* repeat_on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_on.png; path = Icons/repeat_on.png; sourceTree = ""; }; 8EAB752A0856205B0021C2BF /* repeat_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_off.png; path = Icons/repeat_off.png; sourceTree = ""; }; @@ -233,15 +238,27 @@ 8EAFD27B08465E5600107BA5 /* remove_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = remove_gray.png; path = Icons/remove_gray.png; sourceTree = ""; }; 8EAFD28008465E5600107BA5 /* stop_blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop_blue.png; path = Icons/stop_blue.png; sourceTree = ""; }; 8EAFD28108465E5600107BA5 /* stop_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop_gray.png; path = Icons/stop_gray.png; sourceTree = ""; }; + 8EC4BB750872E2FB00ACF986 /* ClickField.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ClickField.h; path = Custom/ClickField.h; sourceTree = ""; }; + 8EC4BB760872E2FB00ACF986 /* ClickField.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ClickField.m; path = Custom/ClickField.m; sourceTree = ""; }; + 8EC4BB770872E2FB00ACF986 /* InfoView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = InfoView.h; path = Custom/InfoView.h; sourceTree = ""; }; + 8EC4BB780872E2FB00ACF986 /* InfoView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = InfoView.m; path = Custom/InfoView.m; sourceTree = ""; }; + 8EC4BB790872E2FB00ACF986 /* TrackingCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TrackingCell.h; path = Custom/TrackingCell.h; sourceTree = ""; }; + 8EC4BB7A0872E2FB00ACF986 /* TrackingCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TrackingCell.m; path = Custom/TrackingCell.m; sourceTree = ""; }; + 8EC4BB7B0872E2FB00ACF986 /* TrackingSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TrackingSlider.h; path = Custom/TrackingSlider.h; sourceTree = ""; }; + 8EC4BB7C0872E2FB00ACF986 /* TrackingSlider.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TrackingSlider.m; path = Custom/TrackingSlider.m; sourceTree = ""; }; + 8EC4BCC10872EEB800ACF986 /* WavPack.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WavPack.framework; path = Libraries/WavPack/build/Deployment/WavPack.framework; sourceTree = ""; }; + 8EC4BCCE0872EEFC00ACF986 /* Vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Vorbis.framework; path = Libraries/Vorbis/build/Deployment/Vorbis.framework; sourceTree = ""; }; + 8EC4BCD20872EF0C00ACF986 /* TagLib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TagLib.framework; path = Libraries/TagLib/build/Deployment/TagLib.framework; sourceTree = ""; }; + 8EC4BCD60872EF1600ACF986 /* SndFile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SndFile.framework; path = Libraries/SndFile/build/Deployment/SndFile.framework; sourceTree = ""; }; + 8EC4BCDA0872EF1F00ACF986 /* Shorten.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Shorten.framework; path = Libraries/Shorten/build/Deployment/Shorten.framework; sourceTree = ""; }; + 8EC4BCDE0872EF3100ACF986 /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = Libraries/Ogg/build/Deployment/Ogg.framework; sourceTree = ""; }; + 8EC4BCE20872EF3A00ACF986 /* MPCDec.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MPCDec.framework; path = Libraries/MPCDec/build/Deployment/MPCDec.framework; sourceTree = ""; }; + 8EC4BCE60872EF4400ACF986 /* MAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MAC.framework; path = Libraries/MAC/build/Deployment/MAC.framework; sourceTree = ""; }; + 8EC4BCEA0872EF4D00ACF986 /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = Libraries/FLAC/build/Deployment/FLAC.framework; sourceTree = ""; }; + 8EC4BCEE0872EF5600ACF986 /* FAAD2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FAAD2.framework; path = Libraries/FAAD2/build/Deployment/FAAD2.framework; sourceTree = ""; }; + 8EC4BCF20872EF6300ACF986 /* DecMPA.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DecMPA.framework; path = Libraries/DecMPA/build/Deployment/DecMPA.framework; sourceTree = ""; }; 8EDCBDCA0840617B00F5C7E3 /* Cog.scriptTerminology */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.scriptTerminology; path = Cog.scriptTerminology; sourceTree = ""; }; 8EDCBDCC0840618900F5C7E3 /* Cog.scriptSuite */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.scriptSuite; path = Cog.scriptSuite; sourceTree = ""; }; - 8EE4A684082E6E5100415456 /* DecMPA.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DecMPA.framework; path = Libraries/DecMPA/build/DecMPA.framework; sourceTree = ""; }; - 8EE4A688082E6E6000415456 /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = Libraries/FLAC/build/FLAC.framework; sourceTree = ""; }; - 8EE4A68C082E6E7000415456 /* MAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MAC.framework; path = Libraries/MAC/build/MAC.framework; sourceTree = ""; }; - 8EE4A690082E6E8000415456 /* MPCDec.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MPCDec.framework; path = Libraries/MPCDec/build/MPCDec.framework; sourceTree = ""; }; - 8EE4A694082E6E9100415456 /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = Libraries/Ogg/build/Ogg.framework; sourceTree = ""; }; - 8EE4A698082E6EA000415456 /* SndFile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SndFile.framework; path = Libraries/SndFile/build/SndFile.framework; sourceTree = ""; }; - 8EE4A69B082E6EB200415456 /* Vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Vorbis.framework; path = Libraries/Vorbis/build/Vorbis.framework; sourceTree = ""; }; 8EF6FA65082DA526006F7BE6 /* FlacFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FlacFile.h; sourceTree = ""; }; 8EF6FA66082DA526006F7BE6 /* FlacFile.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FlacFile.m; sourceTree = ""; }; 8EF6FA67082DA526006F7BE6 /* MonkeysFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MonkeysFile.h; sourceTree = ""; }; @@ -251,7 +268,7 @@ 8EF6FA6B082DA526006F7BE6 /* MusepackFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MusepackFile.h; sourceTree = ""; }; 8EF6FA6C082DA526006F7BE6 /* MusepackFile.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MusepackFile.m; sourceTree = ""; }; 8EF6FA6D082DA526006F7BE6 /* SoundFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SoundFile.h; sourceTree = ""; }; - 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 30; path = SoundFile.m; sourceTree = ""; }; + 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = SoundFile.m; sourceTree = ""; }; 8EF6FA6F082DA526006F7BE6 /* VorbisFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VorbisFile.h; sourceTree = ""; }; 8EF6FA70082DA526006F7BE6 /* VorbisFile.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VorbisFile.m; sourceTree = ""; }; 8EF6FA71082DA526006F7BE6 /* WaveFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WaveFile.h; sourceTree = ""; }; @@ -264,19 +281,19 @@ buildActionMask = 2147483647; files = ( 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, - 8EE4A685082E6E5100415456 /* DecMPA.framework in Frameworks */, - 8EE4A689082E6E6000415456 /* FLAC.framework in Frameworks */, - 8EE4A68D082E6E7000415456 /* MAC.framework in Frameworks */, - 8EE4A691082E6E8000415456 /* MPCDec.framework in Frameworks */, - 8EE4A695082E6E9100415456 /* Ogg.framework in Frameworks */, - 8EE4A699082E6EA000415456 /* SndFile.framework in Frameworks */, - 8EE4A69C082E6EB200415456 /* Vorbis.framework in Frameworks */, 8E81BC33083673ED0025A375 /* AudioToolbox.framework in Frameworks */, 8E81BC34083673ED0025A375 /* AudioUnit.framework in Frameworks */, - 8E5A9032084CB48500AE6D62 /* TagLib.framework in Frameworks */, - 8E14E469084CF15C00246BCC /* FAAD2.framework in Frameworks */, - 8E8BAE9908548C5500E9F14D /* Shorten.framework in Frameworks */, - 8E8BAE9D08548C6300E9F14D /* WavPack.framework in Frameworks */, + 8EC4BCC20872EEB800ACF986 /* WavPack.framework in Frameworks */, + 8EC4BCCF0872EEFC00ACF986 /* Vorbis.framework in Frameworks */, + 8EC4BCD30872EF0C00ACF986 /* TagLib.framework in Frameworks */, + 8EC4BCD70872EF1600ACF986 /* SndFile.framework in Frameworks */, + 8EC4BCDB0872EF1F00ACF986 /* Shorten.framework in Frameworks */, + 8EC4BCDF0872EF3100ACF986 /* Ogg.framework in Frameworks */, + 8EC4BCE30872EF3A00ACF986 /* MPCDec.framework in Frameworks */, + 8EC4BCE70872EF4400ACF986 /* MAC.framework in Frameworks */, + 8EC4BCEB0872EF4D00ACF986 /* FLAC.framework in Frameworks */, + 8EC4BCEF0872EF5600ACF986 /* FAAD2.framework in Frameworks */, + 8EC4BCF30872EF6300ACF986 /* DecMPA.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -291,8 +308,6 @@ 8E47215C08318D12001F89FA /* Playlist */, 8EF6FA64082DA525006F7BE6 /* SoundFile */, 8E6529F8083D93AF00A7AF1B /* Custom */, - 8E287E480855F2EC00562C66 /* InfoView.h */, - 8E287E490855F2EC00562C66 /* InfoView.m */, 8E2871080836934A0013CE39 /* VirtualRingBuffer.h */, 8E2871090836934A0013CE39 /* VirtualRingBuffer.m */, 8E4721D108319294001F89FA /* AppController.h */, @@ -308,20 +323,17 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 8E8BAE9C08548C6300E9F14D /* WavPack.framework */, - 8E8BAE9808548C5500E9F14D /* Shorten.framework */, - 8E14E468084CF15C00246BCC /* FAAD2.framework */, - 8E5A9031084CB48500AE6D62 /* TagLib.framework */, - 8E81BC31083673ED0025A375 /* AudioToolbox.framework */, - 8E81BC32083673ED0025A375 /* AudioUnit.framework */, - 8EE4A69B082E6EB200415456 /* Vorbis.framework */, - 8EE4A698082E6EA000415456 /* SndFile.framework */, - 8EE4A694082E6E9100415456 /* Ogg.framework */, - 8EE4A690082E6E8000415456 /* MPCDec.framework */, - 8EE4A68C082E6E7000415456 /* MAC.framework */, - 8EE4A688082E6E6000415456 /* FLAC.framework */, - 8EE4A684082E6E5100415456 /* DecMPA.framework */, - 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, + 8EC4BCF20872EF6300ACF986 /* DecMPA.framework */, + 8EC4BCEE0872EF5600ACF986 /* FAAD2.framework */, + 8EC4BCEA0872EF4D00ACF986 /* FLAC.framework */, + 8EC4BCE60872EF4400ACF986 /* MAC.framework */, + 8EC4BCE20872EF3A00ACF986 /* MPCDec.framework */, + 8EC4BCDE0872EF3100ACF986 /* Ogg.framework */, + 8EC4BCDA0872EF1F00ACF986 /* Shorten.framework */, + 8EC4BCD60872EF1600ACF986 /* SndFile.framework */, + 8EC4BCD20872EF0C00ACF986 /* TagLib.framework */, + 8EC4BCCE0872EEFC00ACF986 /* Vorbis.framework */, + 8EC4BCC10872EEB800ACF986 /* WavPack.framework */, ); name = "Linked Frameworks"; sourceTree = ""; @@ -329,6 +341,9 @@ 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = { isa = PBXGroup; children = ( + 8E81BC31083673ED0025A375 /* AudioToolbox.framework */, + 8E81BC32083673ED0025A375 /* AudioUnit.framework */, + 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, 29B97324FDCFA39411CA2CEA /* AppKit.framework */, 13E42FB307B3F0F600E4EEF1 /* CoreData.framework */, 29B97325FDCFA39411CA2CEA /* Foundation.framework */, @@ -379,6 +394,7 @@ 8E10DBEF084BBCF00013815C /* Credits.html */, 8E5A90B0084CBC2F00AE6D62 /* Changelog */, 8E8F3F9B0855499500BCF803 /* README */, + 8E847F72086DEBD600162B93 /* TODO */, ); name = Resources; sourceTree = ""; @@ -432,12 +448,14 @@ 8E6529F8083D93AF00A7AF1B /* Custom */ = { isa = PBXGroup; children = ( - 8E297908083D891500F2C55A /* TrackingCell.m */, - 8E297909083D891500F2C55A /* TrackingCell.h */, - 8E6529FF083D93EB00A7AF1B /* TrackingSlider.h */, - 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */, - 8E7DAB4D0867423900615930 /* ClickField.h */, - 8E7DAB4E0867423900615930 /* ClickField.m */, + 8EC4BB750872E2FB00ACF986 /* ClickField.h */, + 8EC4BB760872E2FB00ACF986 /* ClickField.m */, + 8EC4BB770872E2FB00ACF986 /* InfoView.h */, + 8EC4BB780872E2FB00ACF986 /* InfoView.m */, + 8EC4BB790872E2FB00ACF986 /* TrackingCell.h */, + 8EC4BB7A0872E2FB00ACF986 /* TrackingCell.m */, + 8EC4BB7B0872E2FB00ACF986 /* TrackingSlider.h */, + 8EC4BB7C0872E2FB00ACF986 /* TrackingSlider.m */, ); name = Custom; sourceTree = ""; @@ -511,6 +529,8 @@ 8EFFB6980833028600C53833 /* CopyFiles */, ); buildRules = ( + 8E6A0CCF086CCB6600B90CF9 /* PBXBuildRule */, + 8E6A0CCE086CCB5900B90CF9 /* PBXBuildRule */, ); buildSettings = { FRAMEWORK_SEARCH_PATHS = ( @@ -607,6 +627,7 @@ 8EAB752E0856205B0021C2BF /* repeat_off.png in Resources */, 8EAB753F085621620021C2BF /* shuffle_off.png in Resources */, 8EABE777085621D4004DF882 /* shuffle_on.png in Resources */, + 8E847F73086DEBD600162B93 /* TODO in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -637,14 +658,14 @@ 8E267D100837F7A6004ACBC5 /* FeedbackSocket.m in Sources */, 8E267D120837F7A6004ACBC5 /* MacPADSocket.m in Sources */, 8E267D140837F7A6004ACBC5 /* UpdateController.m in Sources */, - 8E29790A083D891500F2C55A /* TrackingCell.m in Sources */, - 8E652A02083D93EB00A7AF1B /* TrackingSlider.m in Sources */, 8E0EBF0F084BA776003A6E64 /* DBLog.c in Sources */, 8E14E47C084CF1A200246BCC /* AACFile.m in Sources */, 8E8BAE5408548BD500E9F14D /* WavPackFile.m in Sources */, 8E8BAE5808548BE800E9F14D /* ShnFile.m in Sources */, - 8E287E4B0855F2EC00562C66 /* InfoView.m in Sources */, - 8E7DAB500867423900615930 /* ClickField.m in Sources */, + 8EC4BB7E0872E2FB00ACF986 /* ClickField.m in Sources */, + 8EC4BB800872E2FB00ACF986 /* InfoView.m in Sources */, + 8EC4BB820872E2FB00ACF986 /* TrackingCell.m in Sources */, + 8EC4BB840872E2FB00ACF986 /* TrackingSlider.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -687,11 +708,25 @@ /Users/xugg/Projects/Cog/Libraries/FAAD2/build, /Users/xugg/Projects/Cog/Libraries/Shorten/build, /Users/xugg/Projects/Cog/Libraries/WavPack/build, + "$(SRCROOT)/Libraries/DecMPA/build/Deployment", + "$(SRCROOT)/Libraries/FAAD2/build/Deployment", + "$(SRCROOT)/Libraries/FLAC/build/Deployment", + "$(SRCROOT)/Libraries/MAC/build/Deployment", + "$(SRCROOT)/Libraries/MPCDec/build/Deployment", + "$(SRCROOT)/Libraries/Ogg/build/Deployment", + "$(SRCROOT)/Libraries/Shorten/build/Deployment", + "$(SRCROOT)/Libraries/SndFile/build/Deployment", + "$(SRCROOT)/Libraries/TagLib/build/Deployment", + "$(SRCROOT)/Libraries/Vorbis/build/Development", + "$(SRCROOT)/Libraries/WavPack/build/Deployment", + "$(SRCROOT)/Libraries/MAC/build/Development", + "$(SRCROOT)/../Cog/Libraries/FLAC/build/Deployment", + "$(SRCROOT)/Libraries/Vorbis/build/Deployment", ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Cog_Prefix.pch; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -705,10 +740,11 @@ "-DHAVE_CONFIG_H", ); OTHER_LDFLAGS = "-Wl,-read_only_relocs,warning"; - PREBINDING = NO; + PREBINDING = YES; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES; PRODUCT_NAME = Cog; WRAPPER_EXTENSION = app; - ZERO_LINK = YES; + ZERO_LINK = NO; }; name = Development; }; @@ -717,18 +753,17 @@ buildSettings = { COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( - /Users/xugg/Projects/Cog/Libraries/DecMPA/build, - /Users/xugg/Projects/Cog/Libraries/FLAC/build, - /Users/xugg/Projects/Cog/Libraries/MAC/build, - /Users/xugg/Projects/Cog/Libraries/MPCDec/build, - /Users/xugg/Projects/Cog/Libraries/Ogg/build, - /Users/xugg/Projects/Cog/Libraries/SndFile/build, - /Users/xugg/Projects/Cog/Libraries/Vorbis/build, - /Users/xugg/Projects/Cog/Libraries/MetaTag/build, - /Users/xugg/Projects/Cog/Libraries/TagLib/build, - /Users/xugg/Projects/Cog/Libraries/FAAD2/build, - /Users/xugg/Projects/Cog/Libraries/Shorten/build, - /Users/xugg/Projects/Cog/Libraries/WavPack/build, + "$(SRCROOT)/Libraries/WavPack/build/Deployment", + "$(SRCROOT)/Libraries/Vorbis/build/Deployment", + "$(SRCROOT)/Libraries/TagLib/build/Deployment", + "$(SRCROOT)/Libraries/SndFile/build/Deployment", + "$(SRCROOT)/Libraries/Shorten/build/Deployment", + "$(SRCROOT)/Libraries/Ogg/build/Deployment", + "$(SRCROOT)/Libraries/MPCDec/build/Deployment", + "$(SRCROOT)/Libraries/MAC/build/Deployment", + "$(SRCROOT)/Libraries/FLAC/build/Deployment", + "$(SRCROOT)/Libraries/FAAD2/build/Deployment", + "$(SRCROOT)/Libraries/DecMPA/build/Deployment", ); GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -768,6 +803,20 @@ /Users/xugg/Projects/Cog/Libraries/FAAD2/build, /Users/xugg/Projects/Cog/Libraries/Shorten/build, /Users/xugg/Projects/Cog/Libraries/WavPack/build, + "$(SRCROOT)/Libraries/DecMPA/build/Deployment", + "$(SRCROOT)/Libraries/FAAD2/build/Deployment", + "$(SRCROOT)/Libraries/FLAC/build/Deployment", + "$(SRCROOT)/Libraries/MAC/build/Deployment", + "$(SRCROOT)/Libraries/MPCDec/build/Deployment", + "$(SRCROOT)/Libraries/Ogg/build/Deployment", + "$(SRCROOT)/Libraries/Shorten/build/Deployment", + "$(SRCROOT)/Libraries/SndFile/build/Deployment", + "$(SRCROOT)/Libraries/TagLib/build/Deployment", + "$(SRCROOT)/Libraries/Vorbis/build/Development", + "$(SRCROOT)/Libraries/WavPack/build/Deployment", + "$(SRCROOT)/Libraries/MAC/build/Development", + "$(SRCROOT)/../Cog/Libraries/FLAC/build/Deployment", + "$(SRCROOT)/Libraries/Vorbis/build/Deployment", ); GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = 3; diff --git a/Cog.xcodeproj/xugg.mode1 b/Cog.xcodeproj/xugg.mode1 index c2f37dda2..d523c8568 100644 --- a/Cog.xcodeproj/xugg.mode1 +++ b/Cog.xcodeproj/xugg.mode1 @@ -255,20 +255,21 @@ 29B97314FDCFA39411CA2CEA 080E96DDFE201D6D7F000001 - 8E6529F8083D93AF00A7AF1B 29B97317FDCFA39411CA2CEA + 29B97323FDCFA39411CA2CEA + 1058C7A0FEA54F0111CA2CBB 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 32 - 24 + 26 + 16 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 51}, {186, 565}} + {{0, 0}, {186, 567}} PBXTopSmartGroupGIDs @@ -280,14 +281,14 @@ GeometryConfiguration Frame - {{0, 0}, {203, 583}} + {{0, 0}, {203, 585}} GroupTreeTableConfiguration MainColumn 186 RubberWindowFrame - 1 122 1024 624 0 0 1024 746 + 0 120 1024 626 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -305,7 +306,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - Changelog + TODO PBXSplitModuleInNavigatorKey Split0 @@ -313,11 +314,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - Changelog + TODO _historyCapacity 0 bookmark - 8E7DABA50867470600615930 + 8EC4BD6B0872EFD900ACF986 history 8EF6FACD082DAA2B006F7BE6 @@ -327,33 +328,13 @@ 8E1A1826083806B700AEA302 8E6082C7083920310017AECF 8EDC88A90842F8DE007D1532 - 8EDC88B50842F936007D1532 - 8ED833CD08457E6B0033CDBD 8E94D9D2084BEA32007F0AEB 8E94D9D3084BEA32007F0AEB - 8E72BC640851408F00E34F1D - 8EFC6D18085376D100C67D06 8EFC6DE8085380B800C67D06 8EFC6DF0085380B800C67D06 - 8EFC6E29085386CE00C67D06 8E3EDBC9085477D0007C6A53 - 8E8BAF10085494E000E9F14D 8E8BAF790854976A00E9F14D 8E91CCEE08549FEE0055EC68 - 8EB30D8A0854BEF1009EA87F - 8EB30DAE0854BFEE009EA87F - 8EB30DDB0854C261009EA87F - 8EB30DDC0854C261009EA87F - 8EB30DDD0854C261009EA87F - 8EB30DDE0854C261009EA87F - 8EB30DDF0854C261009EA87F - 8EB30DE00854C261009EA87F - 8EB30E1F0854C36A009EA87F - 8E4D66E90854CD2C00816BEE - 8E4D66EA0854CD2C00816BEE - 8E4D67D40854E7B100816BEE - 8E8F3F59085546B300BCF803 - 8E8F3F780855483300BCF803 8EF45A7A08557C4D00D2D5D0 8EAB7544085621B10021C2BF 8EAB7545085621B10021C2BF @@ -363,13 +344,10 @@ 8EAB754C085621B10021C2BF 8EABE78408562281004DF882 8EABE7C308562FF3004DF882 - 8EABE7C508562FF3004DF882 - 8E5CC5020856316C00A299E0 8E98E5D308563D1B0078CAA1 8E65357F08563F6A00E468D9 8E65359E0856401D00E468D9 8E63F6C808587FD400C79B72 - 8E63F6C908587FD400C79B72 8E63F6CA08587FD400C79B72 8E8C7BFB085E9CD50086DAC7 8E8C7C14085E9DA50086DAC7 @@ -379,25 +357,50 @@ 8E8C7C85085EA5E30086DAC7 8E8C7D35085EAD460086DAC7 8E8C7D36085EAD460086DAC7 - 8EE558070866A24B009E7F50 - 8E7DAAA808673DF600615930 - 8E7DAAF70867402D00615930 - 8E7DAAF80867402D00615930 - 8E7DAAF90867402D00615930 - 8E7DAAFB0867402D00615930 - 8E7DAAFC0867402D00615930 - 8E7DAAFD0867402D00615930 8E7DAAFE0867402D00615930 - 8E7DAAFF0867402D00615930 8E7DAB430867421200615930 8E7DAB440867421200615930 8E7DAB78086742EB00615930 8E7DAB79086742EB00615930 - 8E7DAB7A086742EB00615930 8E7DAB9D0867470600615930 - 8E7DAB9E0867470600615930 - 8E7DAB9F0867470600615930 - 8E7DABA00867470600615930 + 8EB911C208676353008538A7 + 8EDA5C650869FCFD004E4A55 + 8EDA5C660869FCFD004E4A55 + 8EDA5C670869FCFD004E4A55 + 8EC82088086CD56B0088347D + 8EC820C1086CD8890088347D + 8EC820C2086CD8890088347D + 8EC822A2086CE76C0088347D + 8EC822A3086CE76C0088347D + 8EC822A5086CE76C0088347D + 8E035561086DC742005939B9 + 8E035562086DC742005939B9 + 8E035565086DC742005939B9 + 8E035566086DC742005939B9 + 8E035567086DC742005939B9 + 8E035569086DC742005939B9 + 8E03556A086DC742005939B9 + 8E78A0BE086DD58B007E14C5 + 8ECDC91A086DDDCD007D9727 + 8E4F5F72086E37260043E85E + 8E4F5FB8086E38910043E85E + 8E4F5FDE086E39190043E85E + 8E0AA7B1086F226C00E31C8E + 8E0AA7EC086F251100E31C8E + 8E0AA808086F259400E31C8E + 8E0AA809086F259400E31C8E + 8E0AA812086F26A100E31C8E + 8EC4BD460872EFD900ACF986 + 8EC4BD470872EFD900ACF986 + 8EC4BD480872EFD900ACF986 + 8EC4BD490872EFD900ACF986 + 8EC4BD4A0872EFD900ACF986 + 8EC4BD4B0872EFD900ACF986 + 8EC4BD4C0872EFD900ACF986 + 8EC4BD4D0872EFD900ACF986 + 8EC4BD4E0872EFD900ACF986 + 8EC4BD4F0872EFD900ACF986 + 8EC4BD500872EFD900ACF986 prevStack @@ -461,10 +464,8 @@ 8E8BAEB308548C9600E9F14D 8E8BAEB708548C9600E9F14D 8E8BAF17085494E000E9F14D - 8EB30D990854BEF1009EA87F 8E8F3FAE08554B8000BCF803 8E287E5D0855F35400562C66 - 8E287E5E0855F35400562C66 8EAB7553085621B10021C2BF 8EAB7554085621B10021C2BF 8EAB7555085621B10021C2BF @@ -477,53 +478,35 @@ 8E8C7C90085EA5E30086DAC7 8E8C7C92085EA5E30086DAC7 8E8C7C98085EA5E30086DAC7 - 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 + 8EC822B1086CE76C0088347D + 8EC4BD510872EFD900ACF986 + 8EC4BD520872EFD900ACF986 + 8EC4BD530872EFD900ACF986 + 8EC4BD540872EFD900ACF986 + 8EC4BD550872EFD900ACF986 + 8EC4BD560872EFD900ACF986 + 8EC4BD570872EFD900ACF986 + 8EC4BD580872EFD900ACF986 + 8EC4BD590872EFD900ACF986 + 8EC4BD5A0872EFD900ACF986 + 8EC4BD5B0872EFD900ACF986 + 8EC4BD5C0872EFD900ACF986 + 8EC4BD5D0872EFD900ACF986 + 8EC4BD5E0872EFD900ACF986 + 8EC4BD5F0872EFD900ACF986 + 8EC4BD600872EFD900ACF986 + 8EC4BD610872EFD900ACF986 + 8EC4BD620872EFD900ACF986 + 8EC4BD630872EFD900ACF986 + 8EC4BD640872EFD900ACF986 + 8EC4BD650872EFD900ACF986 + 8EC4BD660872EFD900ACF986 + 8EC4BD670872EFD900ACF986 + 8EC4BD680872EFD900ACF986 + 8EC4BD690872EFD900ACF986 + 8EC4BD6A0872EFD900ACF986 SplitCount @@ -535,14 +518,14 @@ GeometryConfiguration Frame - {{0, 0}, {816, 405}} + {{0, 0}, {816, 407}} RubberWindowFrame - 1 122 1024 624 0 0 1024 746 + 0 120 1024 626 0 0 1024 746 Module PBXNavigatorGroup Proportion - 405pt + 407pt ContentConfiguration @@ -555,9 +538,9 @@ GeometryConfiguration Frame - {{0, 410}, {816, 173}} + {{0, 412}, {816, 173}} RubberWindowFrame - 1 122 1024 624 0 0 1024 746 + 0 120 1024 626 0 0 1024 746 Module XCDetailModule @@ -581,9 +564,9 @@ TableOfContents - 8E7DAAAD08673DF600615930 + 8EC4BB6E0872D41D00ACF986 1CE0B1FE06471DED0097A5F4 - 8E7DAAAE08673DF600615930 + 8EC4BB6F0872D41D00ACF986 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -717,13 +700,13 @@ 5 WindowOrderList - 1C0AD2B3069F1EA900FABCE6 1C530D57069F1CE1000CFCEE 8EF6FAA6082DA951006F7BE6 + 1C0AD2B3069F1EA900FABCE6 /Users/xugg/Projects/Cog/Cog.xcodeproj WindowString - 1 122 1024 624 0 0 1024 746 + 0 120 1024 626 0 0 1024 746 WindowTools @@ -739,12 +722,14 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - SoundController.m + FlacFile.h StatusBarVisibility @@ -761,10 +746,10 @@ 342pt - BecomeActive - ContentConfiguration + PBXBuildLogShowsTranscriptDefaultKey + {{0, 17}, {1024, 219}} PBXProjectModuleGUID XCMainBuildResultsModuleGUID PBXProjectModuleLabel @@ -802,7 +787,7 @@ TableOfContents 8EF6FAA6082DA951006F7BE6 - 8E7DAAB408673E1600615930 + 8EC4BB950872E84700ACF986 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -844,8 +829,8 @@ yes sizes - {{0, 0}, {143, 190}} - {{143, 0}, {881, 190}} + {{0, 0}, {184, 171}} + {{184, 0}, {840, 171}} VerticalSplitView @@ -860,8 +845,8 @@ yes sizes - {{0, 0}, {1024, 190}} - {{0, 190}, {1024, 394}} + {{0, 0}, {1024, 171}} + {{0, 171}, {1024, 413}} @@ -908,14 +893,14 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 8EC12F0608566E3A00FC8AE7 + 8E4F5F78086E37260043E85E 1C162984064C10D400B95A72 - 8EC12F0708566E3A00FC8AE7 - 8EC12F0808566E3A00FC8AE7 - 8EC12F0908566E3A00FC8AE7 - 8EC12F0A08566E3A00FC8AE7 - 8EC12F0B08566E3A00FC8AE7 - 8EC12F0C08566E3A00FC8AE7 + 8E4F5F79086E37260043E85E + 8E4F5F7A086E37260043E85E + 8E4F5F7B086E37260043E85E + 8E4F5F7C086E37260043E85E + 8E4F5F7D086E37260043E85E + 8E4F5F7E086E37260043E85E ToolbarConfiguration xcode.toolbar.config.debug @@ -947,7 +932,7 @@ PBXProjectModuleGUID 1CDD528C0622207200134675 PBXProjectModuleLabel - SoundFile.m + PlaylistController.m StatusBarVisibility @@ -1003,8 +988,8 @@ TableOfContents 1C530D57069F1CE1000CFCEE - 8E7DAABB08673E5400615930 - 8E7DAABC08673E5400615930 + 8EC4BBCB0872E9F100ACF986 + 8EC4BBCC0872E9F100ACF986 1CDD528C0622207200134675 1CD0528E0623707200166675 @@ -1067,7 +1052,7 @@ TableOfContents 8E7A9371083675B600771E14 - 8EC12F0D08566E3A00FC8AE7 + 8E4F5FBD086E38910043E85E 1C78EAAC065D492600B07095 WindowString @@ -1162,9 +1147,9 @@ TableOfContents 1C0AD2B3069F1EA900FABCE6 - 8E7DAB1B086740D100615930 + 8EC4BB700872D41D00ACF986 1CD0528B0623707200166675 - 8E7DAB1C086740D100615930 + 8EC4BB710872D41D00ACF986 ToolbarConfiguration xcode.toolbar.config.run diff --git a/Cog.xcodeproj/xugg.pbxuser b/Cog.xcodeproj/xugg.pbxuser index c089e92ac..334afc5ac 100644 --- a/Cog.xcodeproj/xugg.pbxuser +++ b/Cog.xcodeproj/xugg.pbxuser @@ -17,11 +17,11 @@ 8D1107260486CEB800E47090 /* Cog */, ); breakpoints = ( - 8EF1B97C083A49980095B236 /* PlaylistController.m:386 */, - 8EEFDF8808410C00008BB533 /* SoundController.m:296 */, - 8EDC87BA0842F2A4007D1532 /* SoundFile.m:124 */, - 8E8BAEFB08548F8600E9F14D /* WavPackFile.m:27 */, + 8EF1B97C083A49980095B236 /* PlaylistController.m:391 */, + 8EEFDF8808410C00008BB533 /* SoundController.m:302 */, + 8EDC87BA0842F2A4007D1532 /* SoundFile.m:135 */, ); + breakpointsGroup = 8E14325D086DCCD400A2233E /* XCBreakpointsBucket */; codeSenseManager = 8EB77467082DA402005891CA /* Code sense */; executables = ( 8EB77455082DA3EB005891CA /* Cog */, @@ -89,6 +89,30 @@ PBXFindDataSource_LocationID, ); }; + PBXConfiguration.PBXFileTableDataSource3.XCSCMDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 20, + 553, + 20, + 48.1626, + 43, + 43, + 20, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXFileDataSource_SCM_ColumnID, + PBXFileDataSource_FiletypeID, + PBXFileDataSource_Filename_ColumnID, + PBXFileDataSource_Built_ColumnID, + PBXFileDataSource_ObjectSize_ColumnID, + PBXFileDataSource_Errors_ColumnID, + PBXFileDataSource_Warnings_ColumnID, + PBXFileDataSource_Target_ColumnID, + ); + }; PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = { PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; @@ -111,212 +135,233 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 140983470; - PBXWorkspaceStateSaveDate = 140983470; + PBXPerProjectTemplateStateSaveDate = 141743129; + PBXWorkspaceStateSaveDate = 141743129; }; perUserProjectItems = { - 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 */; + 8E035561086DC742005939B9 = 8E035561086DC742005939B9 /* PBXTextBookmark */; + 8E035562086DC742005939B9 = 8E035562086DC742005939B9 /* PBXTextBookmark */; + 8E035565086DC742005939B9 = 8E035565086DC742005939B9 /* PBXTextBookmark */; + 8E035566086DC742005939B9 = 8E035566086DC742005939B9 /* PBXTextBookmark */; + 8E035567086DC742005939B9 = 8E035567086DC742005939B9 /* PBXTextBookmark */; + 8E035569086DC742005939B9 = 8E035569086DC742005939B9 /* PBXTextBookmark */; + 8E03556A086DC742005939B9 = 8E03556A086DC742005939B9 /* PBXTextBookmark */; + 8E03559F086DC876005939B9 = 8E03559F086DC876005939B9 /* PBXTextBookmark */; + 8E0AA7B1086F226C00E31C8E = 8E0AA7B1086F226C00E31C8E /* PBXTextBookmark */; + 8E0AA7EC086F251100E31C8E = 8E0AA7EC086F251100E31C8E /* PBXTextBookmark */; + 8E0AA808086F259400E31C8E = 8E0AA808086F259400E31C8E /* PBXTextBookmark */; + 8E0AA809086F259400E31C8E = 8E0AA809086F259400E31C8E /* PBXTextBookmark */; + 8E0AA812086F26A100E31C8E = 8E0AA812086F26A100E31C8E /* PBXTextBookmark */; + 8E0AA854086F2BEC00E31C8E = 8E0AA854086F2BEC00E31C8E /* PBXTextBookmark */; + 8E0EBF58084BAA56003A6E64 = 8E0EBF58084BAA56003A6E64 /* PBXTextBookmark */; + 8E0EBF59084BAA56003A6E64 = 8E0EBF59084BAA56003A6E64 /* PBXTextBookmark */; + 8E10DC08084BBE490013815C = 8E10DC08084BBE490013815C /* PBXTextBookmark */; + 8E14E4B4084D089100246BCC = 8E14E4B4084D089100246BCC /* PBXTextBookmark */; + 8E14E4B5084D089100246BCC = 8E14E4B5084D089100246BCC /* PBXTextBookmark */; + 8E1A1826083806B700AEA302 = 8E1A1826083806B700AEA302 /* PBXTextBookmark */; + 8E1A182C083806B700AEA302 = 8E1A182C083806B700AEA302 /* PBXTextBookmark */; + 8E267D8C0837F963004ACBC5 = 8E267D8C0837F963004ACBC5 /* PBXTextBookmark */; + 8E267D8D0837F963004ACBC5 = 8E267D8D0837F963004ACBC5 /* PBXTextBookmark */; + 8E267D900837F963004ACBC5 = 8E267D900837F963004ACBC5 /* PBXTextBookmark */; + 8E267D910837F963004ACBC5 = 8E267D910837F963004ACBC5 /* PBXTextBookmark */; + 8E267D920837F963004ACBC5 = 8E267D920837F963004ACBC5 /* PBXTextBookmark */; + 8E267D940837F963004ACBC5 = 8E267D940837F963004ACBC5 /* PBXTextBookmark */; + 8E267DA00837FA6E004ACBC5 = 8E267DA00837FA6E004ACBC5 /* PBXTextBookmark */; + 8E267DDB0837FE5F004ACBC5 = 8E267DDB0837FE5F004ACBC5 /* PBXTextBookmark */; + 8E267E0308380176004ACBC5 = 8E267E0308380176004ACBC5 /* PBXTextBookmark */; + 8E267E1A083801D8004ACBC5 = 8E267E1A083801D8004ACBC5 /* PBXTextBookmark */; + 8E287164083695080013CE39 = 8E287164083695080013CE39 /* PBXTextBookmark */; + 8E287E5D0855F35400562C66 = 8E287E5D0855F35400562C66 /* PBXTextBookmark */; + 8E287E5E0855F35400562C66 = 8E287E5E0855F35400562C66 /* 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 */; + 8E4F5F71086E37260043E85E = 8E4F5F71086E37260043E85E /* PBXTextBookmark */; + 8E4F5F72086E37260043E85E = 8E4F5F72086E37260043E85E /* PBXTextBookmark */; + 8E4F5F73086E37260043E85E = 8E4F5F73086E37260043E85E /* PBXTextBookmark */; + 8E4F5FB8086E38910043E85E = 8E4F5FB8086E38910043E85E /* PBXTextBookmark */; + 8E4F5FDE086E39190043E85E = 8E4F5FDE086E39190043E85E /* PBXTextBookmark */; + 8E5A90BB084CC25900AE6D62 = 8E5A90BB084CC25900AE6D62 /* PBXTextBookmark */; + 8E6082C7083920310017AECF = 8E6082C7083920310017AECF /* PBXTextBookmark */; + 8E63F6C808587FD400C79B72 = 8E63F6C808587FD400C79B72 /* PBXTextBookmark */; + 8E63F6CA08587FD400C79B72 = 8E63F6CA08587FD400C79B72 /* PBXTextBookmark */; + 8E63F6CB08587FD400C79B72 = 8E63F6CB08587FD400C79B72 /* PBXTextBookmark */; + 8E6529B5083D8D7F00A7AF1B = 8E6529B5083D8D7F00A7AF1B /* PBXTextBookmark */; + 8E652A39083E1A7900A7AF1B = 8E652A39083E1A7900A7AF1B /* PBXTextBookmark */; + 8E652A3A083E1A7900A7AF1B = 8E652A3A083E1A7900A7AF1B /* PBXTextBookmark */; + 8E65357F08563F6A00E468D9 = 8E65357F08563F6A00E468D9 /* PBXTextBookmark */; + 8E65359E0856401D00E468D9 = 8E65359E0856401D00E468D9 /* PBXTextBookmark */; + 8E7877DD086F4E4100E47CD9 = 8E7877DD086F4E4100E47CD9 /* PBXTextBookmark */; + 8E78A0BE086DD58B007E14C5 = 8E78A0BE086DD58B007E14C5 /* PBXTextBookmark */; + 8E7DAAFE0867402D00615930 = 8E7DAAFE0867402D00615930 /* PBXTextBookmark */; + 8E7DAB430867421200615930 = 8E7DAB430867421200615930 /* PBXTextBookmark */; + 8E7DAB440867421200615930 = 8E7DAB440867421200615930 /* PBXTextBookmark */; + 8E7DAB550867424400615930 = 8E7DAB550867424400615930 /* PBXTextBookmark */; + 8E7DAB560867424400615930 = 8E7DAB560867424400615930 /* PBXTextBookmark */; + 8E7DAB78086742EB00615930 = 8E7DAB78086742EB00615930 /* PBXTextBookmark */; + 8E7DAB79086742EB00615930 = 8E7DAB79086742EB00615930 /* PBXTextBookmark */; + 8E7DAB9D0867470600615930 = 8E7DAB9D0867470600615930 /* PBXTextBookmark */; + 8E847F76086DEC0A00162B93 = 8E847F76086DEC0A00162B93 /* PBXTextBookmark */; + 8E8BAEB208548C9600E9F14D = 8E8BAEB208548C9600E9F14D /* PBXTextBookmark */; + 8E8BAEB308548C9600E9F14D = 8E8BAEB308548C9600E9F14D /* PBXTextBookmark */; + 8E8BAEB708548C9600E9F14D = 8E8BAEB708548C9600E9F14D /* 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 */; + 8E8F3FAE08554B8000BCF803 = 8E8F3FAE08554B8000BCF803 /* PBXTextBookmark */; + 8E91CCEE08549FEE0055EC68 = 8E91CCEE08549FEE0055EC68 /* 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 */; + 8EABE7CA08562FF3004DF882 = 8EABE7CA08562FF3004DF882 /* PBXBookmark */; + 8EB911C208676353008538A7 = 8EB911C208676353008538A7 /* PBXTextBookmark */; + 8EC156F9084FEB8900BB24E8 = 8EC156F9084FEB8900BB24E8 /* PBXTextBookmark */; + 8EC4BBCF0872EA1E00ACF986 /* PBXTextBookmark */ = 8EC4BBCF0872EA1E00ACF986 /* PBXTextBookmark */; + 8EC4BBD00872EA1E00ACF986 /* PBXTextBookmark */ = 8EC4BBD00872EA1E00ACF986 /* PBXTextBookmark */; + 8EC4BBD60872EA3200ACF986 /* PBXTextBookmark */ = 8EC4BBD60872EA3200ACF986 /* PBXTextBookmark */; + 8EC4BBD90872EA5200ACF986 /* PBXTextBookmark */ = 8EC4BBD90872EA5200ACF986 /* PBXTextBookmark */; + 8EC4BBDC0872EA7100ACF986 /* PBXTextBookmark */ = 8EC4BBDC0872EA7100ACF986 /* PBXTextBookmark */; + 8EC4BBDF0872EA8100ACF986 /* PBXTextBookmark */ = 8EC4BBDF0872EA8100ACF986 /* PBXTextBookmark */; + 8EC4BC3B0872EDD900ACF986 /* PBXTextBookmark */ = 8EC4BC3B0872EDD900ACF986 /* PBXTextBookmark */; + 8EC4BC3C0872EDD900ACF986 /* PBXTextBookmark */ = 8EC4BC3C0872EDD900ACF986 /* PBXTextBookmark */; + 8EC4BC3E0872EDD900ACF986 /* PBXTextBookmark */ = 8EC4BC3E0872EDD900ACF986 /* PBXTextBookmark */; + 8EC4BC3F0872EDD900ACF986 /* PBXTextBookmark */ = 8EC4BC3F0872EDD900ACF986 /* PBXTextBookmark */; + 8EC4BC410872EDD900ACF986 /* PBXTextBookmark */ = 8EC4BC410872EDD900ACF986 /* PBXTextBookmark */; + 8EC4BC440872EE4400ACF986 /* PBXTextBookmark */ = 8EC4BC440872EE4400ACF986 /* PBXTextBookmark */; + 8EC4BC450872EE4400ACF986 /* PBXTextBookmark */ = 8EC4BC450872EE4400ACF986 /* PBXTextBookmark */; + 8EC4BC460872EE4400ACF986 /* PBXTextBookmark */ = 8EC4BC460872EE4400ACF986 /* PBXTextBookmark */; + 8EC4BC470872EE4400ACF986 /* PBXTextBookmark */ = 8EC4BC470872EE4400ACF986 /* PBXTextBookmark */; + 8EC4BC480872EE4400ACF986 /* PBXTextBookmark */ = 8EC4BC480872EE4400ACF986 /* PBXTextBookmark */; + 8EC4BC4B0872EE9600ACF986 /* PBXTextBookmark */ = 8EC4BC4B0872EE9600ACF986 /* PBXTextBookmark */; + 8EC4BC4C0872EE9600ACF986 /* PBXTextBookmark */ = 8EC4BC4C0872EE9600ACF986 /* PBXTextBookmark */; + 8EC4BC4D0872EE9600ACF986 /* PBXTextBookmark */ = 8EC4BC4D0872EE9600ACF986 /* PBXTextBookmark */; + 8EC4BC4E0872EE9600ACF986 /* PBXTextBookmark */ = 8EC4BC4E0872EE9600ACF986 /* PBXTextBookmark */; + 8EC4BC4F0872EE9600ACF986 /* PBXTextBookmark */ = 8EC4BC4F0872EE9600ACF986 /* PBXTextBookmark */; + 8EC4BD440872EFD700ACF986 /* PBXTextBookmark */ = 8EC4BD440872EFD700ACF986 /* PBXTextBookmark */; + 8EC4BD450872EFD700ACF986 /* PBXTextBookmark */ = 8EC4BD450872EFD700ACF986 /* PBXTextBookmark */; + 8EC4BD460872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD460872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD470872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD470872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD480872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD480872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD490872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD490872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD4A0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD4A0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD4B0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD4B0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD4C0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD4C0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD4D0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD4D0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD4E0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD4E0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD4F0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD4F0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD500872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD500872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD510872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD510872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD520872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD520872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD530872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD530872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD540872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD540872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD550872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD550872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD560872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD560872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD570872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD570872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD580872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD580872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD590872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD590872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD5A0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD5A0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD5B0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD5B0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD5C0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD5C0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD5D0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD5D0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD5E0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD5E0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD5F0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD5F0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD600872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD600872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD610872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD610872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD620872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD620872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD630872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD630872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD640872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD640872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD650872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD650872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD660872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD660872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD670872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD670872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD680872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD680872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD690872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD690872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD6A0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD6A0872EFD900ACF986 /* PBXTextBookmark */; + 8EC4BD6B0872EFD900ACF986 /* PBXTextBookmark */ = 8EC4BD6B0872EFD900ACF986 /* PBXTextBookmark */; + 8EC82088086CD56B0088347D = 8EC82088086CD56B0088347D /* PBXTextBookmark */; + 8EC8208A086CD56B0088347D = 8EC8208A086CD56B0088347D /* PBXTextBookmark */; + 8EC820C1086CD8890088347D = 8EC820C1086CD8890088347D /* PBXTextBookmark */; + 8EC820C2086CD8890088347D = 8EC820C2086CD8890088347D /* PBXTextBookmark */; + 8EC82204086CE2330088347D = 8EC82204086CE2330088347D /* PBXTextBookmark */; + 8EC822A2086CE76C0088347D = 8EC822A2086CE76C0088347D /* PBXTextBookmark */; + 8EC822A3086CE76C0088347D = 8EC822A3086CE76C0088347D /* PBXTextBookmark */; + 8EC822A5086CE76C0088347D = 8EC822A5086CE76C0088347D /* PBXTextBookmark */; + 8EC822B1086CE76C0088347D = 8EC822B1086CE76C0088347D /* PBXTextBookmark */; + 8ECDC919086DDDCD007D9727 = 8ECDC919086DDDCD007D9727 /* PBXTextBookmark */; + 8ECDC91A086DDDCD007D9727 = 8ECDC91A086DDDCD007D9727 /* PBXTextBookmark */; + 8EDA5C650869FCFD004E4A55 = 8EDA5C650869FCFD004E4A55 /* PBXTextBookmark */; + 8EDA5C660869FCFD004E4A55 = 8EDA5C660869FCFD004E4A55 /* PBXTextBookmark */; + 8EDA5C670869FCFD004E4A55 = 8EDA5C670869FCFD004E4A55 /* PBXTextBookmark */; + 8EDC88A90842F8DE007D1532 = 8EDC88A90842F8DE007D1532 /* PBXTextBookmark */; + 8EDCBDDB084061E500F5C7E3 = 8EDCBDDB084061E500F5C7E3 /* PBXTextBookmark */; + 8EDCBDDC084061E500F5C7E3 = 8EDCBDDC084061E500F5C7E3 /* PBXTextBookmark */; + 8EDE0CCC08369EB200EABFE4 = 8EDE0CCC08369EB200EABFE4 /* PBXTextBookmark */; + 8EE4A6C3082E6F6100415456 = 8EE4A6C3082E6F6100415456 /* PBXTextBookmark */; + 8EE4A6C8082E6F6100415456 = 8EE4A6C8082E6F6100415456 /* PBXTextBookmark */; + 8EE4A6FE082E704E00415456 = 8EE4A6FE082E704E00415456 /* PBXTextBookmark */; + 8EE4A799082E7D8700415456 = 8EE4A799082E7D8700415456 /* PBXTextBookmark */; + 8EEF9CAF0872390300FCD68F = 8EEF9CAF0872390300FCD68F /* PBXTextBookmark */; + 8EEF9CB00872390300FCD68F = 8EEF9CB00872390300FCD68F /* PBXTextBookmark */; + 8EEF9D0D08723A4D00FCD68F = 8EEF9D0D08723A4D00FCD68F /* PBXTextBookmark */; + 8EEF9D0E08723A4D00FCD68F = 8EEF9D0E08723A4D00FCD68F /* PBXBookmark */; + 8EEF9D0F08723A4D00FCD68F = 8EEF9D0F08723A4D00FCD68F /* PBXTextBookmark */; + 8EEF9D1008723A4D00FCD68F = 8EEF9D1008723A4D00FCD68F /* 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 */; + 8EFC6DE8085380B800C67D06 = 8EFC6DE8085380B800C67D06 /* PBXTextBookmark */; + 8EFC6DF0085380B800C67D06 = 8EFC6DF0085380B800C67D06 /* PBXTextBookmark */; }; sourceControlManager = 8EB77466082DA402005891CA /* Source Control */; userBuildSettings = { @@ -339,11 +384,151 @@ 8D1107310486CEB800E47090 /* Info.plist */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 1470}}"; - sepNavSelRange = "{2194, 0}"; - sepNavVisRect = "{{0, 1083}, {775, 373}}"; + sepNavSelRange = "{2289, 0}"; + sepNavVisRect = "{{0, 1088}, {775, 373}}"; sepNavWindowFrame = "{{15, 61}, {500, 680}}"; }; }; + 8E035561086DC742005939B9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E14E47A084CF1A200246BCC /* AACFile.m */; + name = "AACFile.m: 71"; + rLen = 0; + rLoc = 1635; + rType = 0; + vrLen = 541; + vrLoc = 1315; + }; + 8E035562086DC742005939B9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA66082DA526006F7BE6 /* FlacFile.m */; + name = "FlacFile.m: 106"; + rLen = 0; + rLoc = 3034; + rType = 0; + vrLen = 560; + vrLoc = 2595; + }; + 8E035565086DC742005939B9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA6C082DA526006F7BE6 /* MusepackFile.m */; + name = "MusepackFile.m: 96"; + rLen = 0; + rLoc = 1887; + rType = 0; + vrLen = 702; + vrLoc = 1441; + }; + 8E035566086DC742005939B9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA70082DA526006F7BE6 /* VorbisFile.m */; + name = "VorbisFile.m: 47"; + rLen = 0; + rLoc = 808; + rType = 0; + vrLen = 581; + vrLoc = 657; + }; + 8E035567086DC742005939B9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA72082DA526006F7BE6 /* WaveFile.m */; + name = "WaveFile.m: 88"; + rLen = 0; + rLoc = 1594; + rType = 0; + vrLen = 418; + vrLoc = 1455; + }; + 8E035569086DC742005939B9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8BAE5508548BE800E9F14D /* ShnFile.h */; + name = "ShnFile.h: bufferSize"; + rLen = 0; + rLoc = 345; + rType = 0; + vrLen = 410; + vrLoc = 0; + }; + 8E03556A086DC742005939B9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8BAE5608548BE800E9F14D /* ShnFile.m */; + name = "ShnFile.m: 17"; + rLen = 0; + rLoc = 268; + rType = 0; + vrLen = 470; + vrLoc = 25; + }; + 8E03559F086DC876005939B9 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC8221E086CE2D50088347D /* shn.h */; + name = "#define\tmin(a,b)\t\t\t(((a)<(b))?(a):(b))"; + rLen = 39; + rLoc = 1361; + rType = 0; + vrLen = 565; + vrLoc = 1127; + }; + 8E0AA7B1086F226C00E31C8E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8BAE5208548BD500E9F14D /* WavPackFile.m */; + name = "WavPackFile.m: 73"; + rLen = 0; + rLoc = 1416; + rType = 0; + vrLen = 566; + vrLoc = 892; + }; + 8E0AA7EC086F251100E31C8E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D108319294001F89FA /* AppController.h */; + name = "AppController.h: savePlaylist:"; + rLen = 0; + rLoc = 566; + rType = 0; + vrLen = 869; + vrLoc = 201; + }; + 8E0AA808086F259400E31C8E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E45227A0832898A00F8BA7C /* Sound.h */; + name = "Sound.h: setVolume:"; + rLen = 0; + rLoc = 3118; + rType = 0; + vrLen = 483; + vrLoc = 2646; + }; + 8E0AA809086F259400E31C8E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D4083192C2001F89FA /* SoundController.h */; + name = "- (IBAction)changeVolume:(id)sender;"; + rLen = 37; + rLoc = 711; + rType = 0; + vrLen = 719; + vrLoc = 617; + }; + 8E0AA812086F26A100E31C8E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; + name = "SoundController.m: 219"; + rLen = 0; + rLoc = 4777; + rType = 0; + vrLen = 632; + vrLoc = 4458; + }; + 8E0AA854086F2BEC00E31C8E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 10"; + rLen = 0; + rLoc = 76; + rType = 0; + vrLen = 1276; + vrLoc = 233; + }; 8E0EBF0C084BA776003A6E64 /* DBLog.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 372}}"; @@ -395,6 +580,15 @@ vrLen = 30; vrLoc = 0; }; + 8E14325D086DCCD400A2233E /* XCBreakpointsBucket */ = { + isa = XCBreakpointsBucket; + name = "Project Breakpoints"; + objects = ( + 8EF1B97C083A49980095B236 /* PlaylistController.m:391 */, + 8EEFDF8808410C00008BB533 /* SoundController.m:302 */, + 8EDC87BA0842F2A4007D1532 /* SoundFile.m:135 */, + ); + }; 8E14E479084CF1A200246BCC /* AACFile.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 476}}"; @@ -404,9 +598,9 @@ }; 8E14E47A084CF1A200246BCC /* AACFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 2464}}"; - sepNavSelRange = "{1761, 1694}"; - sepNavVisRect = "{{0, 1020}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 2492}}"; + sepNavSelRange = "{1635, 0}"; + sepNavVisRect = "{{0, 773}, {775, 375}}"; }; }; 8E14E4B4084D089100246BCC /* PBXTextBookmark */ = { @@ -472,9 +666,9 @@ }; 8E267D050837F7A6004ACBC5 /* FeedbackController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {914, 1106}}"; - sepNavSelRange = "{310, 0}"; - sepNavVisRect = "{{0, 34}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {983, 1106}}"; + sepNavSelRange = "{1369, 147}"; + sepNavVisRect = "{{0, 622}, {983, 310}}"; }; }; 8E267D060837F7A6004ACBC5 /* FeedbackSocket.h */ = { @@ -500,9 +694,9 @@ }; 8E267D0A0837F7A6004ACBC5 /* MacPADSocket.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 5600}}"; - sepNavSelRange = "{7208, 5}"; - sepNavVisRect = "{{0, 2856}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {983, 5600}}"; + sepNavSelRange = "{3809, 2}"; + sepNavVisRect = "{{0, 2084}, {983, 310}}"; }; }; 8E267D0B0837F7A6004ACBC5 /* UpdateController.h */ = { @@ -622,8 +816,8 @@ 8E2871080836934A0013CE39 /* VirtualRingBuffer.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {4550, 1246}}"; - sepNavSelRange = "{3334, 0}"; - sepNavVisRect = "{{0, 686}, {775, 546}}"; + sepNavSelRange = "{3756, 37}"; + sepNavVisRect = "{{0, 706}, {983, 310}}"; }; }; 8E2871090836934A0013CE39 /* VirtualRingBuffer.m */ = { @@ -644,13 +838,25 @@ vrLoc = 0; }; 8E287E480855F2EC00562C66 /* InfoView.h */ = { + isa = PBXFileReference; + fileEncoding = 30; + lastKnownFileType = sourcecode.c.h; + name = InfoView.h; + path = /Users/xugg/Projects/Cog/InfoView.h; + sourceTree = ""; uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 375}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {775, 373}}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; }; }; 8E287E490855F2EC00562C66 /* InfoView.m */ = { + isa = PBXFileReference; + fileEncoding = 30; + lastKnownFileType = sourcecode.c.objc; + name = InfoView.m; + path = /Users/xugg/Projects/Cog/InfoView.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 546}}"; sepNavSelRange = "{231, 0}"; @@ -678,6 +884,12 @@ vrLoc = 0; }; 8E297908083D891500F2C55A /* TrackingCell.m */ = { + isa = PBXFileReference; + fileEncoding = 30; + lastKnownFileType = sourcecode.c.objc; + name = TrackingCell.m; + path = /Users/xugg/Projects/Cog/TrackingCell.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 392}}"; sepNavSelRange = "{520, 0}"; @@ -686,6 +898,12 @@ }; }; 8E297909083D891500F2C55A /* TrackingCell.h */ = { + isa = PBXFileReference; + fileEncoding = 30; + lastKnownFileType = sourcecode.c.h; + name = TrackingCell.h; + path = /Users/xugg/Projects/Cog/TrackingCell.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; sepNavSelRange = "{311, 0}"; @@ -725,17 +943,17 @@ }; 8E45227A0832898A00F8BA7C /* Sound.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {860, 1848}}"; - sepNavSelRange = "{2925, 0}"; - sepNavVisRect = "{{0, 379}, {775, 373}}"; + sepNavIntBoundsRect = "{{0, 0}, {860, 1876}}"; + sepNavSelRange = "{3118, 0}"; + sepNavVisRect = "{{0, 1501}, {775, 375}}"; sepNavWindowFrame = "{{15, 61}, {702, 680}}"; }; }; 8E45227B0832898A00F8BA7C /* Sound.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1208, 10570}}"; - sepNavSelRange = "{5223, 0}"; - sepNavVisRect = "{{0, 2189}, {775, 373}}"; + sepNavIntBoundsRect = "{{0, 0}, {1208, 10976}}"; + sepNavSelRange = "{2357, 0}"; + sepNavVisRect = "{{0, 952}, {775, 375}}"; sepNavWindowFrame = "{{15, 66}, {702, 680}}"; }; }; @@ -744,7 +962,7 @@ fRef = 8E45227A0832898A00F8BA7C /* Sound.h */; name = "Sound.h: 13"; rLen = 0; - rLoc = 2075; + rLoc = 2098; rType = 0; vrLen = 199; vrLoc = 0; @@ -754,7 +972,7 @@ fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; name = "Sound.m: 15"; rLen = 0; - rLoc = 19656; + rLoc = 20091; rType = 0; vrLen = 182; vrLoc = 0; @@ -768,52 +986,52 @@ }; 8E47218608318D7A001F89FA /* DNDArrayController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {758, 2072}}"; - sepNavSelRange = "{1640, 5}"; - sepNavVisRect = "{{0, 813}, {740, 180}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 2072}}"; + sepNavSelRange = "{3343, 0}"; + sepNavVisRect = "{{0, 947}, {775, 373}}"; }; }; 8E47218708318D7A001F89FA /* PlaylistController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 1176}}"; sepNavSelRange = "{990, 0}"; - sepNavVisRect = "{{0, 104}, {775, 546}}"; + sepNavVisRect = "{{0, 285}, {775, 373}}"; }; }; 8E47218808318D7A001F89FA /* PlaylistController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {896, 7154}}"; - sepNavSelRange = "{1199, 0}"; - sepNavVisRect = "{{0, 441}, {775, 373}}"; + sepNavIntBoundsRect = "{{0, 0}, {983, 7224}}"; + sepNavSelRange = "{931, 0}"; + sepNavVisRect = "{{0, 384}, {983, 310}}"; }; }; 8E47218908318D7A001F89FA /* PlaylistEntry.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 952}}"; - sepNavSelRange = "{374, 0}"; - sepNavVisRect = "{{0, 210}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {983, 952}}"; + sepNavSelRange = "{704, 16}"; + sepNavVisRect = "{{0, 454}, {983, 310}}"; }; }; 8E47218A08318D7A001F89FA /* PlaylistEntry.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {782, 3878}}"; - sepNavSelRange = "{3092, 3}"; - sepNavVisRect = "{{0, 2744}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {983, 3920}}"; + sepNavSelRange = "{1716, 2}"; + sepNavVisRect = "{{0, 1350}, {983, 310}}"; sepNavWindowFrame = "{{15, 61}, {1016, 680}}"; }; }; 8E47218B08318D7A001F89FA /* PlaylistView.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 375}}"; sepNavSelRange = "{206, 0}"; - sepNavVisRect = "{{0, 0}, {775, 372}}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; }; }; 8E47218C08318D7A001F89FA /* PlaylistView.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 952}}"; sepNavSelRange = "{951, 0}"; - sepNavVisRect = "{{0, 406}, {775, 546}}"; + sepNavVisRect = "{{0, 187}, {775, 373}}"; }; }; 8E4721AE08318F3E001F89FA /* PBXTextBookmark */ = { @@ -898,30 +1116,30 @@ }; 8E4721D108319294001F89FA /* AppController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 546}}"; - sepNavSelRange = "{392, 1}"; - sepNavVisRect = "{{0, 0}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 518}}"; + sepNavSelRange = "{566, 0}"; + sepNavVisRect = "{{0, 143}, {775, 375}}"; }; }; 8E4721D208319294001F89FA /* AppController.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1340, 2086}}"; sepNavSelRange = "{624, 0}"; - sepNavVisRect = "{{0, 782}, {775, 373}}"; + sepNavVisRect = "{{0, 789}, {775, 373}}"; }; }; 8E4721D4083192C2001F89FA /* SoundController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 812}}"; - sepNavSelRange = "{709, 0}"; - sepNavVisRect = "{{0, 75}, {775, 373}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 826}}"; + sepNavSelRange = "{711, 37}"; + sepNavVisRect = "{{0, 420}, {775, 375}}"; }; }; 8E4721D5083192C2001F89FA /* SoundController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {950, 4928}}"; - sepNavSelRange = "{5035, 0}"; - sepNavVisRect = "{{0, 2861}, {775, 373}}"; + sepNavIntBoundsRect = "{{0, 0}, {950, 5012}}"; + sepNavSelRange = "{4777, 0}"; + sepNavVisRect = "{{0, 2842}, {775, 375}}"; sepNavWindowFrame = "{{15, 61}, {1016, 680}}"; }; }; @@ -955,7 +1173,17 @@ vrLen = 63; vrLoc = 0; }; - 8E4D66E90854CD2C00816BEE /* PBXTextBookmark */ = { + 8E4F5F71086E37260043E85E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E847F72086DEBD600162B93 /* TODO */; + name = "TODO: 3"; + rLen = 0; + rLoc = 89; + rType = 0; + vrLen = 71; + vrLoc = 0; + }; + 8E4F5F72086E37260043E85E /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E8BAE5108548BD500E9F14D /* WavPackFile.h */; name = "WavPackFile.h: 13"; @@ -965,31 +1193,41 @@ vrLen = 282; vrLoc = 0; }; - 8E4D66EA0854CD2C00816BEE /* PBXTextBookmark */ = { + 8E4F5F73086E37260043E85E /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 8E8BAE5208548BD500E9F14D /* WavPackFile.m */; - name = "WavPackFile.m: 41"; + fRef = 8E847F72086DEBD600162B93 /* TODO */; + name = "TODO: 3"; rLen = 0; - rLoc = 735; + rLoc = 89; rType = 0; - vrLen = 526; - vrLoc = 392; - }; - 8E4D67D40854E7B100816BEE /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E47218B08318D7A001F89FA /* PlaylistView.h */; - name = "PlaylistView.h: 12"; - rLen = 0; - rLoc = 206; - rType = 0; - vrLen = 369; + vrLen = 71; vrLoc = 0; }; + 8E4F5FB8086E38910043E85E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E267D0A0837F7A6004ACBC5 /* MacPADSocket.m */; + name = CF; + rLen = 2; + rLoc = 3809; + rType = 0; + vrLen = 1043; + vrLoc = 3265; + }; + 8E4F5FDE086E39190043E85E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA6A082DA526006F7BE6 /* MPEGFile.m */; + name = "MPEGFile.m: 87"; + rLen = 0; + rLoc = 1941; + rType = 0; + vrLen = 490; + vrLoc = 1691; + }; 8E5A90B0084CBC2F00AE6D62 /* Changelog */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; - sepNavSelRange = "{709, 0}"; - sepNavVisRect = "{{0, 0}, {775, 373}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 420}}"; + sepNavSelRange = "{308, 0}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; }; }; 8E5A90BB084CC25900AE6D62 /* PBXTextBookmark */ = { @@ -997,21 +1235,11 @@ fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; name = "Changelog: 3"; rLen = 0; - rLoc = 672; + rLoc = 981; rType = 0; 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 */; @@ -1032,16 +1260,6 @@ vrLen = 1402; vrLoc = 0; }; - 8E63F6C908587FD400C79B72 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E267D0A0837F7A6004ACBC5 /* MacPADSocket.m */; - name = DBLog; - rLen = 5; - rLoc = 7208; - rType = 0; - vrLen = 1463; - vrLoc = 6505; - }; 8E63F6CA08587FD400C79B72 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E267D0B0837F7A6004ACBC5 /* UpdateController.h */; @@ -1073,6 +1291,12 @@ vrLoc = 0; }; 8E6529FF083D93EB00A7AF1B /* TrackingSlider.h */ = { + isa = PBXFileReference; + fileEncoding = 30; + lastKnownFileType = sourcecode.c.h; + name = TrackingSlider.h; + path = /Users/xugg/Projects/Cog/TrackingSlider.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; sepNavSelRange = "{106, 0}"; @@ -1080,6 +1304,12 @@ }; }; 8E652A00083D93EB00A7AF1B /* TrackingSlider.m */ = { + isa = PBXFileReference; + fileEncoding = 30; + lastKnownFileType = sourcecode.c.objc; + name = TrackingSlider.m; + path = /Users/xugg/Projects/Cog/TrackingSlider.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 546}}"; sepNavSelRange = "{664, 0}"; @@ -1126,105 +1356,25 @@ vrLen = 1460; vrLoc = 3376; }; - 8E72BC640851408F00E34F1D /* PBXTextBookmark */ = { + 8E7877DD086F4E4100E47CD9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 8E47218908318D7A001F89FA /* PlaylistEntry.h */; - name = "PlaylistEntry.h: track"; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 15"; rLen = 0; - rLoc = 374; + rLoc = 509; rType = 0; - vrLen = 410; - vrLoc = 266; + vrLen = 990; + vrLoc = 0; }; - 8E7DAAA808673DF600615930 /* PBXTextBookmark */ = { + 8E78A0BE086DD58B007E14C5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - name = "Info.plist: 92"; + fRef = 8EF6FA69082DA526006F7BE6 /* MPEGFile.h */; + name = "MPEGFile.h: 14"; rLen = 0; - rLoc = 2194; + rLoc = 245; 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; + vrLen = 272; + vrLoc = 0; }; 8E7DAAFE0867402D00615930 /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -1236,226 +1386,6 @@ 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 */; @@ -1476,64 +1406,26 @@ 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 */ = { + isa = PBXFileReference; + fileEncoding = 30; + lastKnownFileType = sourcecode.c.h; + name = ClickField.h; + path = /Users/xugg/Projects/Cog/ClickField.h; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; - sepNavSelRange = "{69, 0}"; + sepNavSelRange = "{152, 0}"; sepNavVisRect = "{{0, 0}, {775, 373}}"; }; }; 8E7DAB4E0867423900615930 /* ClickField.m */ = { + isa = PBXFileReference; + fileEncoding = 30; + lastKnownFileType = sourcecode.c.objc; + name = ClickField.m; + path = /Users/xugg/Projects/Cog/ClickField.m; + sourceTree = ""; uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 373}}"; sepNavSelRange = "{253, 0}"; @@ -1541,16 +1433,6 @@ 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 */; @@ -1571,26 +1453,6 @@ 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 */; @@ -1611,116 +1473,6 @@ 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 */; @@ -1731,113 +1483,50 @@ 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; + 8E847F72086DEBD600162B93 /* TODO */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {775, 375}}"; + sepNavSelRange = "{89, 0}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; + }; }; - 8E7DAB9F0867470600615930 /* PBXTextBookmark */ = { + 8E847F76086DEC0A00162B93 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 8E4721D5083192C2001F89FA /* SoundController.m */; - name = "SoundController.m: 229"; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 126"; rLen = 0; - rLoc = 5035; + rLoc = 2636; 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; + vrLen = 487; + vrLoc = 2330; }; 8E8BAE5108548BD500E9F14D /* WavPackFile.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 375}}"; sepNavSelRange = "{214, 0}"; - sepNavVisRect = "{{0, 0}, {775, 372}}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; }; }; 8E8BAE5208548BD500E9F14D /* WavPackFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 1120}}"; - sepNavSelRange = "{735, 0}"; - sepNavVisRect = "{{0, 353}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 1176}}"; + sepNavSelRange = "{1416, 0}"; + sepNavVisRect = "{{0, 717}, {775, 375}}"; sepNavWindowFrame = "{{15, 60}, {1017, 681}}"; }; }; 8E8BAE5508548BE800E9F14D /* ShnFile.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 375}}"; sepNavSelRange = "{345, 0}"; - sepNavVisRect = "{{0, 0}, {775, 372}}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; }; }; 8E8BAE5608548BE800E9F14D /* ShnFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {983, 1666}}"; - sepNavSelRange = "{1600, 49}"; - sepNavVisRect = "{{0, 1028}, {983, 310}}"; + sepNavIntBoundsRect = "{{0, 0}, {983, 1638}}"; + sepNavSelRange = "{1588, 49}"; + sepNavVisRect = "{{0, 1000}, {983, 310}}"; }; }; 8E8BAEB208548C9600E9F14D /* PBXTextBookmark */ = { @@ -1870,29 +1559,6 @@ vrLen = 187; vrLoc = 0; }; - 8E8BAEFB08548F8600E9F14D /* WavPackFile.m:27 */ = { - isa = PBXFileBreakpoint; - actions = ( - ); - continueAfterActions = 0; - delayBeforeContinue = 0; - fileReference = 8E8BAE5208548BD500E9F14D /* WavPackFile.m */; - functionName = "-open:"; - hitCount = 0; - lineNumber = 27; - modificationTime = 139882046.224034; - state = 1; - }; - 8E8BAF10085494E000E9F14D /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA66082DA526006F7BE6 /* FlacFile.m */; - name = "FlacFile.m: 166"; - rLen = 0; - rLoc = 4219; - rType = 0; - vrLen = 367; - vrLoc = 3928; - }; 8E8BAF17085494E000E9F14D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E8BAE5208548BD500E9F14D /* WavPackFile.m */; @@ -2106,31 +1772,11 @@ vrLen = 253; vrLoc = 0; }; - 8E8F3F59085546B300BCF803 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E47218708318D7A001F89FA /* PlaylistController.h */; - name = "PlaylistController.h: 43"; - rLen = 0; - rLoc = 990; - rType = 0; - vrLen = 936; - vrLoc = 143; - }; - 8E8F3F780855483300BCF803 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E47218C08318D7A001F89FA /* PlaylistView.m */; - name = "PlaylistView.m: 59"; - rLen = 0; - rLoc = 951; - rType = 0; - vrLen = 502; - vrLoc = 496; - }; 8E8F3F9B0855499500BCF803 /* README */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 546}}"; - sepNavSelRange = "{105, 0}"; - sepNavVisRect = "{{0, 0}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 406}}"; + sepNavSelRange = "{443, 0}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; sepNavWindowFrame = "{{15, 60}, {1017, 681}}"; }; }; @@ -2139,7 +1785,7 @@ fRef = 8E8F3F9B0855499500BCF803 /* README */; name = "README: 2"; rLen = 0; - rLoc = 105; + rLoc = 76; rType = 0; vrLen = 1509; vrLoc = 0; @@ -2275,127 +1921,10 @@ isa = PBXBookmark; fRef = 8EAFD27408465E5600107BA5 /* pause_blue.png */; }; - 8EABE7C508562FF3004DF882 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E4721D108319294001F89FA /* AppController.h */; - name = ""; - rLen = 1; - rLoc = 392; - rType = 0; - vrLen = 1103; - vrLoc = 0; - }; 8EABE7CA08562FF3004DF882 /* PBXBookmark */ = { isa = PBXBookmark; fRef = 8EAFD27408465E5600107BA5 /* pause_blue.png */; }; - 8EB30D4F0854BDDD009EA87F /* shn.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = shn.h; - path = /Users/xugg/Projects/Cog/Libraries/Shorten/build/Shorten.framework/Versions/A/Headers/shn.h; - sourceTree = ""; - }; - 8EB30D8A0854BEF1009EA87F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EB30D4F0854BDDD009EA87F /* shn.h */; - name = "shn.h: sys_errlist"; - rLen = 0; - rLoc = 1183; - rType = 0; - vrLen = 532; - vrLoc = 961; - }; - 8EB30D990854BEF1009EA87F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EB30D4F0854BDDD009EA87F /* shn.h */; - name = "shn.h: sys_errlist"; - rLen = 0; - rLoc = 1183; - rType = 0; - vrLen = 532; - vrLoc = 961; - }; - 8EB30DAE0854BFEE009EA87F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA72082DA526006F7BE6 /* WaveFile.m */; - name = "WaveFile.m: close"; - rLen = 0; - rLoc = 2003; - rType = 0; - vrLen = 418; - vrLoc = 1717; - }; - 8EB30DDB0854C261009EA87F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA70082DA526006F7BE6 /* VorbisFile.m */; - name = "VorbisFile.m: 50"; - rLen = 333; - rLoc = 868; - rType = 0; - vrLen = 593; - vrLoc = 657; - }; - 8EB30DDC0854C261009EA87F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E8BAE5508548BE800E9F14D /* ShnFile.h */; - name = "ShnFile.h: bufferSize"; - rLen = 0; - rLoc = 345; - rType = 0; - vrLen = 410; - vrLoc = 0; - }; - 8EB30DDD0854C261009EA87F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA67082DA526006F7BE6 /* MonkeysFile.h */; - name = "MonkeysFile.h: 15"; - rLen = 0; - rLoc = 267; - rType = 0; - vrLen = 308; - vrLoc = 0; - }; - 8EB30DDE0854C261009EA87F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA68082DA526006F7BE6 /* MonkeysFile.m */; - name = "MonkeysFile.m: close"; - rLen = 0; - rLoc = 1738; - rType = 0; - vrLen = 475; - vrLoc = 1471; - }; - 8EB30DDF0854C261009EA87F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA6C082DA526006F7BE6 /* MusepackFile.m */; - name = "MusepackFile.m: 115"; - rLen = 0; - rLoc = 2381; - rType = 0; - vrLen = 685; - vrLoc = 1881; - }; - 8EB30DE00854C261009EA87F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E14E47A084CF1A200246BCC /* AACFile.m */; - name = "AACFile.m: 76"; - rLen = 1694; - rLoc = 1761; - rType = 0; - vrLen = 792; - vrLoc = 1708; - }; - 8EB30E1F0854C36A009EA87F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA6A082DA526006F7BE6 /* MPEGFile.m */; - name = "MPEGFile.m: 106"; - rLen = 0; - rLoc = 2304; - rType = 0; - vrLen = 386; - vrLoc = 1947; - }; 8EB77455082DA3EB005891CA /* Cog */ = { isa = PBXExecutable; activeArgIndex = 2147483647; @@ -2435,6 +1964,16 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; + 8EB911C208676353008538A7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EDCBDCC0840618900F5C7E3 /* Cog.scriptSuite */; + name = "Cog.scriptSuite: 70"; + rLen = 0; + rLoc = 1667; + rType = 0; + vrLen = 692; + vrLoc = 0; + }; 8EC156F9084FEB8900BB24E8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E267D0A0837F7A6004ACBC5 /* MacPADSocket.m */; @@ -2445,17 +1984,792 @@ vrLen = 957; vrLoc = 6740; }; - 8ED833CD08457E6B0033CDBD /* PBXTextBookmark */ = { + 8EC4BB750872E2FB00ACF986 /* ClickField.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {775, 375}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; + }; + }; + 8EC4BB770872E2FB00ACF986 /* InfoView.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {775, 375}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; + }; + }; + 8EC4BBCF0872EA1E00ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + rLen = 19; + rLoc = 854; + rType = 0; + }; + 8EC4BBD00872EA1E00ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 39"; + rLen = 0; + rLoc = 931; + rType = 0; + vrLen = 569; + vrLoc = 720; + }; + 8EC4BBD60872EA3200ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 39"; + rLen = 0; + rLoc = 931; + rType = 0; + vrLen = 569; + vrLoc = 720; + }; + 8EC4BBD90872EA5200ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 39"; + rLen = 0; + rLoc = 931; + rType = 0; + vrLen = 569; + vrLoc = 720; + }; + 8EC4BBDC0872EA7100ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 39"; + rLen = 0; + rLoc = 931; + rType = 0; + vrLen = 569; + vrLoc = 720; + }; + 8EC4BBDF0872EA8100ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 39"; + rLen = 0; + rLoc = 931; + rType = 0; + vrLen = 569; + vrLoc = 720; + }; + 8EC4BC3B0872EDD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC8221E086CE2D50088347D /* shn.h */; + name = "#define\tmin(a,b)\t\t\t(((a)<(b))?(a):(b))"; + rLen = 39; + rLoc = 1361; + rType = 0; + vrLen = 529; + vrLoc = 1135; + }; + 8EC4BC3C0872EDD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + comments = "warning: this is the location of the previous definition"; + fRef = 8EC4BC3D0872EDD900ACF986 /* NoWindows.h */; + rLen = 1; + rLoc = 38; + rType = 1; + }; + 8EC4BC3D0872EDD900ACF986 /* NoWindows.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = NoWindows.h; + path = /Users/xugg/Projects/Cog/Libraries/MAC/build/Deployment/MAC.framework/Headers/NoWindows.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {983, 994}}"; + sepNavSelRange = "{1212, 0}"; + sepNavVisRect = "{{0, 384}, {983, 310}}"; + }; + }; + 8EC4BC3E0872EDD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC8221E086CE2D50088347D /* shn.h */; + name = "#define\tmin(a,b)\t\t\t(((a)<(b))?(a):(b))"; + rLen = 39; + rLoc = 1361; + rType = 0; + vrLen = 529; + vrLoc = 1135; + }; + 8EC4BC3F0872EDD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC4BC400872EDD900ACF986 /* NoWindows.h */; + name = "#define min(a,b) (((a) < (b)) ? (a) : (b))"; + rLen = 47; + rLoc = 1064; + rType = 0; + vrLen = 651; + vrLoc = 655; + }; + 8EC4BC400872EDD900ACF986 /* NoWindows.h */ = { + isa = PBXFileReference; + name = NoWindows.h; + path = /Users/xugg/Projects/Cog/Libraries/MAC/build/Deployment/MAC.framework/Versions/A/Headers/NoWindows.h; + sourceTree = ""; + }; + 8EC4BC410872EDD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 39"; + rLen = 0; + rLoc = 931; + rType = 0; + vrLen = 569; + vrLoc = 720; + }; + 8EC4BC440872EE4400ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC4BC3D0872EDD900ACF986 /* NoWindows.h */; + name = "NoWindows.h: 46"; + rLen = 0; + rLoc = 1212; + rType = 0; + vrLen = 651; + vrLoc = 655; + }; + 8EC4BC450872EE4400ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + comments = "warning: dereferencing `void *' pointer"; + fRef = 8E8BAE5608548BE800E9F14D /* ShnFile.m */; + rLen = 1; + rLoc = 82; + rType = 1; + }; + 8EC4BC460872EE4400ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC4BC3D0872EDD900ACF986 /* NoWindows.h */; + name = "NoWindows.h: 46"; + rLen = 0; + rLoc = 1212; + rType = 0; + vrLen = 651; + vrLoc = 655; + }; + 8EC4BC470872EE4400ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8BAE5608548BE800E9F14D /* ShnFile.m */; + name = "memmove(buffer, &buffer[count], bufferAmount);"; + rLen = 49; + rLoc = 1588; + rType = 0; + vrLen = 395; + vrLoc = 1435; + }; + 8EC4BC480872EE4400ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 39"; + rLen = 0; + rLoc = 931; + rType = 0; + vrLen = 569; + vrLoc = 720; + }; + 8EC4BC4B0872EE9600ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8BAE5608548BE800E9F14D /* ShnFile.m */; + name = "memmove(buffer, &buffer[count], bufferAmount);"; + rLen = 49; + rLoc = 1588; + rType = 0; + vrLen = 395; + vrLoc = 1435; + }; + 8EC4BC4C0872EE9600ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + comments = "FLAC/all.h: No such file or directory"; + fRef = 8EF6FA65082DA526006F7BE6 /* FlacFile.h */; + rLen = 1; + rLoc = 9; + rType = 1; + }; + 8EC4BC4D0872EE9600ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8BAE5608548BE800E9F14D /* ShnFile.m */; + name = "memmove(buffer, &buffer[count], bufferAmount);"; + rLen = 49; + rLoc = 1588; + rType = 0; + vrLen = 395; + vrLoc = 1435; + }; + 8EC4BC4E0872EE9600ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA65082DA526006F7BE6 /* FlacFile.h */; + name = "#import \"FLAC/all.h\""; + rLen = 21; + rLoc = 163; + rType = 0; + vrLen = 540; + vrLoc = 0; + }; + 8EC4BC4F0872EE9600ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 39"; + rLen = 0; + rLoc = 931; + rType = 0; + vrLen = 569; + vrLoc = 720; + }; + 8EC4BD440872EFD700ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA65082DA526006F7BE6 /* FlacFile.h */; + name = "#import \"FLAC/all.h\""; + rLen = 21; + rLoc = 163; + rType = 0; + vrLen = 540; + vrLoc = 0; + }; + 8EC4BD450872EFD700ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 39"; + rLen = 0; + rLoc = 931; + rType = 0; + vrLen = 569; + vrLoc = 720; + }; + 8EC4BD460872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; + name = "Sound.m: 73"; + rLen = 0; + rLoc = 2357; + rType = 0; + vrLen = 979; + vrLoc = 2157; + }; + 8EC4BD470872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */; + name = "SoundFile.m: 69"; + rLen = 0; + rLoc = 1210; + rType = 0; + vrLen = 918; + vrLoc = 1546; + }; + 8EC4BD480872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 36"; + rLen = 0; + rLoc = 787; + rType = 0; + vrLen = 624; + vrLoc = 670; + }; + 8EC4BD490872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC4BB770872E2FB00ACF986 /* InfoView.h */; + name = "InfoView.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 79; + vrLoc = 0; + }; + 8EC4BD4A0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC4BB750872E2FB00ACF986 /* ClickField.h */; + name = "ClickField.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 160; + vrLoc = 0; + }; + 8EC4BD4B0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA67082DA526006F7BE6 /* MonkeysFile.h */; + name = "MonkeysFile.h: 14"; + rLen = 0; + rLoc = 232; + rType = 0; + vrLen = 308; + vrLoc = 0; + }; + 8EC4BD4C0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 9"; + rLen = 0; + rLoc = 308; + rType = 0; + vrLen = 990; + vrLoc = 0; + }; + 8EC4BD4D0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC8221E086CE2D50088347D /* shn.h */; + name = "#define\tmin(a,b)\t\t\t(((a)<(b))?(a):(b))"; + rLen = 39; + rLoc = 1361; + rType = 0; + vrLen = 565; + vrLoc = 1127; + }; + 8EC4BD4E0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA65082DA526006F7BE6 /* FlacFile.h */; + name = "#import \"FLAC/all.h\""; + rLen = 21; + rLoc = 163; + rType = 0; + vrLen = 617; + vrLoc = 0; + }; + 8EC4BD4F0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 10"; + rLen = 0; + rLoc = 443; + rType = 0; + vrLen = 1142; + vrLoc = 0; + }; + 8EC4BD500872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E847F72086DEBD600162B93 /* TODO */; + name = "TODO: 5"; + rLen = 0; + rLoc = 89; + rType = 0; + vrLen = 89; + vrLoc = 0; + }; + 8EC4BD510872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E847F72086DEBD600162B93 /* TODO */; + name = "TODO: 1"; + rLen = 0; + rLoc = 89; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 8EC4BD520872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; + name = "Sound.m: 73"; + rLen = 0; + rLoc = 2357; + rType = 0; + vrLen = 979; + vrLoc = 2157; + }; + 8EC4BD530872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E847F72086DEBD600162B93 /* TODO */; + name = "TODO: 1"; + rLen = 0; + rLoc = 89; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + 8EC4BD540872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 10"; + rLen = 0; + rLoc = 76; + rType = 0; + vrLen = 1276; + vrLoc = 233; + }; + 8EC4BD550872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 9"; + rLen = 0; + rLoc = 308; + rType = 0; + vrLen = 990; + vrLoc = 0; + }; + 8EC4BD560872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */; + name = "SoundFile.m: 69"; + rLen = 0; + rLoc = 1210; + rType = 0; + vrLen = 918; + vrLoc = 1546; + }; + 8EC4BD570872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218808318D7A001F89FA /* PlaylistController.m */; + name = "PlaylistController.m: 36"; + rLen = 0; + rLoc = 787; + rType = 0; + vrLen = 624; + vrLoc = 670; + }; + 8EC4BD580872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC4BB770872E2FB00ACF986 /* InfoView.h */; + name = "InfoView.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 79; + vrLoc = 0; + }; + 8EC4BD590872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC4BB750872E2FB00ACF986 /* ClickField.h */; + name = "ClickField.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 160; + vrLoc = 0; + }; + 8EC4BD5A0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA67082DA526006F7BE6 /* MonkeysFile.h */; + name = "MonkeysFile.h: 14"; + rLen = 0; + rLoc = 232; + rType = 0; + vrLen = 308; + vrLoc = 0; + }; + 8EC4BD5B0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 10"; + rLen = 0; + rLoc = 76; + rType = 0; + vrLen = 1276; + vrLoc = 233; + }; + 8EC4BD5C0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 4"; + rLen = 0; + rLoc = 97; + rType = 0; + vrLen = 990; + vrLoc = 0; + }; + 8EC4BD5D0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 7"; + rLen = 0; + rLoc = 366; + rType = 0; + vrLen = 1216; + vrLoc = 0; + }; + 8EC4BD5E0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 4"; + rLen = 0; + rLoc = 97; + rType = 0; + vrLen = 990; + vrLoc = 0; + }; + 8EC4BD5F0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 3"; + rLen = 0; + rLoc = 90; + rType = 0; + vrLen = 1177; + vrLoc = 0; + }; + 8EC4BD600872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 9"; + rLen = 0; + rLoc = 308; + rType = 0; + vrLen = 990; + vrLoc = 0; + }; + 8EC4BD610872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E847F72086DEBD600162B93 /* TODO */; + name = "TODO: 3"; + rLen = 0; + rLoc = 89; + rType = 0; + vrLen = 43; + vrLoc = 0; + }; + 8EC4BD620872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 3"; + rLen = 0; + rLoc = 90; + rType = 0; + vrLen = 1177; + vrLoc = 0; + }; + 8EC4BD630872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 9"; + rLen = 0; + rLoc = 308; + rType = 0; + vrLen = 990; + vrLoc = 0; + }; + 8EC4BD640872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 3"; + rLen = 0; + rLoc = 90; + rType = 0; + vrLen = 1177; + vrLoc = 0; + }; + 8EC4BD650872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E847F72086DEBD600162B93 /* TODO */; + name = "TODO: 5"; + rLen = 0; + rLoc = 89; + rType = 0; + vrLen = 89; + vrLoc = 0; + }; + 8EC4BD660872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E5A90B0084CBC2F00AE6D62 /* Changelog */; + name = "Changelog: 9"; + rLen = 0; + rLoc = 308; + rType = 0; + vrLen = 990; + vrLoc = 0; + }; + 8EC4BD670872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 14"; + rLen = 0; + rLoc = 585; + rType = 0; + vrLen = 1142; + vrLoc = 0; + }; + 8EC4BD680872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC8221E086CE2D50088347D /* shn.h */; + name = "#define\tmin(a,b)\t\t\t(((a)<(b))?(a):(b))"; + rLen = 39; + rLoc = 1361; + rType = 0; + vrLen = 565; + vrLoc = 1127; + }; + 8EC4BD690872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA65082DA526006F7BE6 /* FlacFile.h */; + name = "#import \"FLAC/all.h\""; + rLen = 21; + rLoc = 163; + rType = 0; + vrLen = 617; + vrLoc = 0; + }; + 8EC4BD6A0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E8F3F9B0855499500BCF803 /* README */; + name = "README: 10"; + rLen = 0; + rLoc = 443; + rType = 0; + vrLen = 1142; + vrLoc = 0; + }; + 8EC4BD6B0872EFD900ACF986 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E847F72086DEBD600162B93 /* TODO */; + name = "TODO: 5"; + rLen = 0; + rLoc = 89; + rType = 0; + vrLen = 89; + vrLoc = 0; + }; + 8EC82088086CD56B0088347D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E4721D208319294001F89FA /* AppController.m */; + name = "AppController.m: 16"; + rLen = 0; + rLoc = 624; + rType = 0; + vrLen = 947; + vrLoc = 1452; + }; + 8EC8208A086CD56B0088347D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E287E480855F2EC00562C66 /* InfoView.h */; + name = "InfoView.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 79; + vrLoc = 0; + }; + 8EC820C1086CD8890088347D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E7DAB4D0867423900615930 /* ClickField.h */; + name = "ClickField.h: 5"; + rLen = 0; + rLoc = 70; + rType = 0; + vrLen = 160; + vrLoc = 0; + }; + 8EC820C2086CD8890088347D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + name = "Info.plist: 96"; + rLen = 0; + rLoc = 2289; + rType = 0; + vrLen = 679; + vrLoc = 1806; + }; + 8EC82204086CE2330088347D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA67082DA526006F7BE6 /* MonkeysFile.h */; + name = "MonkeysFile.h: 14"; + rLen = 0; + rLoc = 232; + rType = 0; + vrLen = 308; + vrLoc = 0; + }; + 8EC8221E086CE2D50088347D /* shn.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = shn.h; + path = /Users/xugg/Projects/Cog/Libraries/Shorten/build/Deployment/Shorten.framework/Headers/shn.h; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {775, 3990}}"; + sepNavSelRange = "{1361, 39}"; + sepNavVisRect = "{{0, 506}, {775, 375}}"; + }; + }; + 8EC822A2086CE76C0088347D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218B08318D7A001F89FA /* PlaylistView.h */; + name = "PlaylistView.h: 12"; + rLen = 0; + rLoc = 206; + rType = 0; + vrLen = 369; + vrLoc = 0; + }; + 8EC822A3086CE76C0088347D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218908318D7A001F89FA /* PlaylistEntry.h */; + name = "PlaylistEntry.h: track"; + rLen = 0; + rLoc = 374; + rType = 0; + vrLen = 410; + vrLoc = 266; + }; + 8EC822A5086CE76C0088347D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218A08318D7A001F89FA /* PlaylistEntry.m */; + name = "PlaylistEntry.m: 181"; + rLen = 0; + rLoc = 2662; + rType = 0; + vrLen = 563; + vrLoc = 2262; + }; + 8EC822B1086CE76C0088347D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EC8221E086CE2D50088347D /* shn.h */; + name = "shn.h: 39"; + rLen = 0; + rLoc = 1156; + rType = 0; + vrLen = 565; + vrLoc = 1127; + }; + 8ECDC919086DDDCD007D9727 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */; + name = "SoundFile.m: 82"; + rLen = 0; + rLoc = 1900; + rType = 0; + vrLen = 918; + vrLoc = 1575; + }; + 8ECDC91A086DDDCD007D9727 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA68082DA526006F7BE6 /* MonkeysFile.m */; + name = "MonkeysFile.m: 39"; + rLen = 0; + rLoc = 825; + rType = 0; + vrLen = 493; + vrLoc = 735; + }; + 8EDA5C650869FCFD004E4A55 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218C08318D7A001F89FA /* PlaylistView.m */; + name = "PlaylistView.m: 59"; + rLen = 0; + rLoc = 951; + rType = 0; + vrLen = 338; + vrLoc = 252; + }; + 8EDA5C660869FCFD004E4A55 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E47218608318D7A001F89FA /* DNDArrayController.m */; name = "DNDArrayController.m: 131"; rLen = 0; rLoc = 3343; rType = 0; - vrLen = 625; - vrLoc = 3014; + vrLen = 840; + vrLoc = 1633; }; - 8EDC87BA0842F2A4007D1532 /* SoundFile.m:124 */ = { + 8EDA5C670869FCFD004E4A55 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E47218708318D7A001F89FA /* PlaylistController.h */; + name = "PlaylistController.h: 43"; + rLen = 0; + rLoc = 990; + rType = 0; + vrLen = 645; + vrLoc = 434; + }; + 8EDC87BA0842F2A4007D1532 /* SoundFile.m:135 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2464,8 +2778,8 @@ fileReference = 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */; functionName = "+readInfo:"; hitCount = 0; - lineNumber = 124; - modificationTime = 139882034.259393; + lineNumber = 135; + modificationTime = 141441159.809556; state = 2; }; 8EDC88A90842F8DE007D1532 /* PBXTextBookmark */ = { @@ -2478,16 +2792,6 @@ vrLen = 668; vrLoc = 947; }; - 8EDC88B50842F936007D1532 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EDCBDCC0840618900F5C7E3 /* Cog.scriptSuite */; - name = "Cog.scriptSuite: 68"; - rLen = 0; - rLoc = 1627; - rType = 0; - vrLen = 643; - vrLoc = 1228; - }; 8EDCBDCA0840617B00F5C7E3 /* Cog.scriptTerminology */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 1414}}"; @@ -2498,8 +2802,8 @@ 8EDCBDCC0840618900F5C7E3 /* Cog.scriptSuite */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {775, 1610}}"; - sepNavSelRange = "{1627, 0}"; - sepNavVisRect = "{{0, 717}, {775, 373}}"; + sepNavSelRange = "{1667, 0}"; + sepNavVisRect = "{{0, 0}, {775, 373}}"; }; }; 8EDCBDDB084061E500F5C7E3 /* PBXTextBookmark */ = { @@ -2572,17 +2876,75 @@ vrLen = 761; vrLoc = 0; }; - 8EE558070866A24B009E7F50 /* PBXTextBookmark */ = { + 8EEF9CAF0872390300FCD68F /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 8E287E480855F2EC00562C66 /* InfoView.h */; - name = "InfoView.h: 1"; + fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; + name = "Sound.m: 73"; + rLen = 0; + rLoc = 2357; + rType = 0; + vrLen = 979; + vrLoc = 2157; + }; + 8EEF9CB00872390300FCD68F /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E45227B0832898A00F8BA7C /* Sound.m */; + name = "Sound.m: 73"; + rLen = 0; + rLoc = 2357; + rType = 0; + vrLen = 979; + vrLoc = 2157; + }; + 8EEF9CDD0872398D00FCD68F /* all.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = all.h; + path = "/Users/xugg/Projects/Cog copy/Libraries/FLAC/build/Deployment/FLAC.framework/Versions/A/Headers/all.h"; + sourceTree = ""; + }; + 8EEF9D0D08723A4D00FCD68F /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA65082DA526006F7BE6 /* FlacFile.h */; + name = "FlacFile.h: 10"; + rLen = 0; + rLoc = 176; + rType = 0; + vrLen = 617; + vrLoc = 0; + }; + 8EEF9D0E08723A4D00FCD68F /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 8EEF9CDD0872398D00FCD68F /* all.h */; + }; + 8EEF9D0F08723A4D00FCD68F /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EF6FA65082DA526006F7BE6 /* FlacFile.h */; + name = "FlacFile.h: 10"; + rLen = 0; + rLoc = 176; + rType = 0; + vrLen = 617; + vrLoc = 0; + }; + 8EEF9D1008723A4D00FCD68F /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8EEF9D1108723A4D00FCD68F /* all.h */; + name = "(null): 1"; rLen = 0; rLoc = 0; rType = 0; - vrLen = 79; + vrLen = 1476; vrLoc = 0; }; - 8EEFDF8808410C00008BB533 /* SoundController.m:296 */ = { + 8EEF9D1108723A4D00FCD68F /* all.h */ = { + isa = PBXFileReference; + lastKnownFileType = file; + name = all.h; + path = "/Users/xugg/Projects/Cog copy/Libraries/FLAC/build/Deployment/FLAC.framework/Versions/A/Headers/all.h"; + sourceTree = ""; + }; + 8EEFDF8808410C00008BB533 /* SoundController.m:302 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2591,11 +2953,11 @@ fileReference = 8E4721D5083192C2001F89FA /* SoundController.m */; functionName = "-handlePortMessage:"; hitCount = 0; - lineNumber = 296; - modificationTime = 139882034.259246; + lineNumber = 302; + modificationTime = 141441159.809542; state = 2; }; - 8EF1B97C083A49980095B236 /* PlaylistController.m:386 */ = { + 8EF1B97C083A49980095B236 /* PlaylistController.m:391 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -2604,8 +2966,8 @@ fileReference = 8E47218808318D7A001F89FA /* PlaylistController.m */; functionName = "-currentEntry"; hitCount = 0; - lineNumber = 386; - modificationTime = 139882034.217395; + lineNumber = 391; + modificationTime = 141441159.809464; state = 2; }; 8EF45A7A08557C4D00D2D5D0 /* PBXTextBookmark */ = { @@ -2620,44 +2982,44 @@ }; 8EF6FA65082DA526006F7BE6 /* FlacFile.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 406}}"; - sepNavSelRange = "{342, 0}"; - sepNavVisRect = "{{0, 0}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {983, 406}}"; + sepNavSelRange = "{163, 21}"; + sepNavVisRect = "{{0, 0}, {983, 310}}"; }; }; 8EF6FA66082DA526006F7BE6 /* FlacFile.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1130, 2646}}"; - sepNavSelRange = "{4219, 0}"; - sepNavVisRect = "{{0, 2078}, {775, 372}}"; + sepNavSelRange = "{139, 21}"; + sepNavVisRect = "{{0, 0}, {983, 310}}"; }; }; 8EF6FA67082DA526006F7BE6 /* MonkeysFile.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 372}}"; - sepNavSelRange = "{267, 0}"; - sepNavVisRect = "{{0, 0}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 375}}"; + sepNavSelRange = "{232, 0}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; }; }; 8EF6FA68082DA526006F7BE6 /* MonkeysFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 1246}}"; - sepNavSelRange = "{1738, 0}"; - sepNavVisRect = "{{0, 832}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 1078}}"; + sepNavSelRange = "{822, 0}"; + sepNavVisRect = "{{0, 436}, {775, 375}}"; }; }; 8EF6FA69082DA526006F7BE6 /* MPEGFile.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 375}}"; sepNavSelRange = "{245, 0}"; - sepNavVisRect = "{{0, 0}, {775, 372}}"; + sepNavVisRect = "{{0, 0}, {775, 375}}"; }; }; 8EF6FA6A082DA526006F7BE6 /* MPEGFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 1540}}"; - sepNavSelRange = "{2304, 0}"; - sepNavVisRect = "{{0, 1154}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 1568}}"; + sepNavSelRange = "{1941, 0}"; + sepNavVisRect = "{{0, 1066}, {775, 375}}"; }; }; 8EF6FA6B082DA526006F7BE6 /* MusepackFile.h */ = { @@ -2669,24 +3031,24 @@ }; 8EF6FA6C082DA526006F7BE6 /* MusepackFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 2982}}"; - sepNavSelRange = "{2381, 0}"; - sepNavVisRect = "{{0, 1358}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 2996}}"; + sepNavSelRange = "{1887, 0}"; + sepNavVisRect = "{{0, 1071}, {775, 375}}"; }; }; 8EF6FA6D082DA526006F7BE6 /* SoundFile.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 826}}"; - sepNavSelRange = "{859, 0}"; - sepNavVisRect = "{{0, 280}, {775, 546}}"; + sepNavIntBoundsRect = "{{0, 0}, {983, 826}}"; + sepNavSelRange = "{928, 51}"; + sepNavVisRect = "{{0, 468}, {983, 310}}"; sepNavWindowFrame = "{{15, 61}, {1016, 680}}"; }; }; 8EF6FA6E082DA526006F7BE6 /* SoundFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1010, 3066}}"; - sepNavSelRange = "{3471, 0}"; - sepNavVisRect = "{{0, 134}, {983, 310}}"; + sepNavIntBoundsRect = "{{0, 0}, {1478, 3276}}"; + sepNavSelRange = "{1210, 0}"; + sepNavVisRect = "{{0, 1036}, {775, 375}}"; sepNavWindowFrame = "{{15, 61}, {750, 680}}"; }; }; @@ -2699,9 +3061,9 @@ }; 8EF6FA70082DA526006F7BE6 /* VorbisFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {775, 1120}}"; - sepNavSelRange = "{868, 333}"; - sepNavVisRect = "{{0, 510}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {775, 1148}}"; + sepNavSelRange = "{808, 0}"; + sepNavVisRect = "{{0, 504}, {775, 375}}"; }; }; 8EF6FA71082DA526006F7BE6 /* WaveFile.h */ = { @@ -2713,9 +3075,9 @@ }; 8EF6FA72082DA526006F7BE6 /* WaveFile.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {782, 1736}}"; - sepNavSelRange = "{2003, 0}"; - sepNavVisRect = "{{0, 1326}, {775, 372}}"; + sepNavIntBoundsRect = "{{0, 0}, {983, 1764}}"; + sepNavSelRange = "{1824, 6}"; + sepNavVisRect = "{{0, 1266}, {983, 310}}"; }; }; 8EF6FACD082DAA2B006F7BE6 /* PBXTextBookmark */ = { @@ -2886,16 +3248,6 @@ path = /Users/xugg/Projects/zyGora/FlacFile.m; sourceTree = ""; }; - 8EFC6D18085376D100C67D06 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA69082DA526006F7BE6 /* MPEGFile.h */; - name = "MPEGFile.h: 14"; - rLen = 0; - rLoc = 245; - rType = 0; - vrLen = 272; - vrLoc = 0; - }; 8EFC6DE8085380B800C67D06 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8EF6FA6B082DA526006F7BE6 /* MusepackFile.h */; @@ -2916,14 +3268,4 @@ vrLen = 309; vrLoc = 0; }; - 8EFC6E29085386CE00C67D06 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8EF6FA65082DA526006F7BE6 /* FlacFile.h */; - name = "FlacFile.h: SAMPLE_BUFFER_SIZE"; - rLen = 0; - rLoc = 342; - rType = 0; - vrLen = 617; - vrLoc = 0; - }; } diff --git a/English.lproj/MainMenu.nib/classes.nib b/English.lproj/MainMenu.nib/classes.nib index d6154bd27..685e28de3 100644 --- a/English.lproj/MainMenu.nib/classes.nib +++ b/English.lproj/MainMenu.nib/classes.nib @@ -69,6 +69,7 @@ }, { ACTIONS = { + changeVolume = id; next = id; pause = id; pauseResume = id; diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib index 16efa9003..dad8186b9 100644 --- a/English.lproj/MainMenu.nib/info.nib +++ b/English.lproj/MainMenu.nib/info.nib @@ -19,9 +19,9 @@ IBOpenObjects - 463 21 29 + 463 IBSystem Version 8B15 diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index 89998e01c..48e5c3f21 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Info.plist b/Info.plist index 6b5a5988f..fa13cd478 100644 --- a/Info.plist +++ b/Info.plist @@ -93,7 +93,7 @@ CFBundleSignature ???? CFBundleVersion - 0.01 + 0.04 NSAppleScriptEnabled YES NSMainNibFile diff --git a/Libraries/FLAC/Files/src/libFLAC/format.c b/Libraries/FLAC/Files/src/libFLAC/format.c index 25ec7d98b..6ca78b639 100644 --- a/Libraries/FLAC/Files/src/libFLAC/format.c +++ b/Libraries/FLAC/Files/src/libFLAC/format.c @@ -51,6 +51,8 @@ #define FLAC__U64L(x) x##LLU #endif +#define VERSION "1.1.2" + /* VERSION should come from configure */ FLAC_API const char *FLAC__VERSION_STRING = VERSION; diff --git a/Libraries/MAC/.DS_Store b/Libraries/MAC/.DS_Store index 0ce1f6eea..a65b922e8 100644 Binary files a/Libraries/MAC/.DS_Store and b/Libraries/MAC/.DS_Store differ diff --git a/Libraries/MAC/Files/Source/MACLib/NNFilter.cpp b/Libraries/MAC/Files/Source/MACLib/NNFilter.cpp index ed909c2b3..7aad4e689 100755 --- a/Libraries/MAC/Files/Source/MACLib/NNFilter.cpp +++ b/Libraries/MAC/Files/Source/MACLib/NNFilter.cpp @@ -12,7 +12,7 @@ CNNFilter::CNNFilter(int nOrder, int nShift, int nVersion) //m_bMMXAvailable = GetMMXAvailable(); m_AltiVecAvailable = IsAltiVecAvailable(); - + m_rbInput.Create(NN_WINDOW_ELEMENTS, m_nOrder); m_rbDeltaM.Create(NN_WINDOW_ELEMENTS, m_nOrder); m_paryM = new short [m_nOrder]; diff --git a/Libraries/TagLib/Files/taglib/mpeg/id3v1/id3v1tag.cpp b/Libraries/TagLib/Files/taglib/mpeg/id3v1/id3v1tag.cpp index 624f56b89..2e7233eb2 100644 --- a/Libraries/TagLib/Files/taglib/mpeg/id3v1/id3v1tag.cpp +++ b/Libraries/TagLib/Files/taglib/mpeg/id3v1/id3v1tag.cpp @@ -55,7 +55,7 @@ const ID3v1::StringHandler *ID3v1::Tag::TagPrivate::stringHandler = new StringHa String ID3v1::StringHandler::parse(const ByteVector &data) const { - return String(data, String::Latin1); + return clean(String(data, String::Latin1)); } ByteVector ID3v1::StringHandler::render(const String &s) const @@ -63,6 +63,23 @@ ByteVector ID3v1::StringHandler::render(const String &s) const return s.data(String::Latin1); } +String ID3v1::StringHandler::clean(const String &s) const +{ + String newString; + int i; + + newString = s; + + i = newString.size() - 1; + while (s[i] == ' ' && i >= 0) + { + newString[i] = '\0'; + i--; + } + + return newString; +} + //////////////////////////////////////////////////////////////////////////////// // public methods //////////////////////////////////////////////////////////////////////////////// diff --git a/Libraries/TagLib/Files/taglib/mpeg/id3v1/id3v1tag.h b/Libraries/TagLib/Files/taglib/mpeg/id3v1/id3v1tag.h index 37b7c5a09..3c474dcb5 100644 --- a/Libraries/TagLib/Files/taglib/mpeg/id3v1/id3v1tag.h +++ b/Libraries/TagLib/Files/taglib/mpeg/id3v1/id3v1tag.h @@ -70,6 +70,10 @@ namespace TagLib { * ISO-8859-1. */ virtual ByteVector render(const String &s) const; + + + //Fixes buggy taggers which do spaces instead of 0s. + String ID3v1::StringHandler::clean(const String &s) const; }; //! The main class in the ID3v1 implementation diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index 0c59678ac..d824ede07 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -36,7 +36,7 @@ - (int)insertFile:(NSString *)filename atIndex:(int)index { - if ([acceptableFileTypes containsObject:[filename pathExtension]] && [[NSFileManager defaultManager] fileExistsAtPath:filename]) + if ([acceptableFileTypes containsObject:[[filename pathExtension] lowercaseString]] && [[NSFileManager defaultManager] fileExistsAtPath:filename]) { PlaylistEntry *pe = [[PlaylistEntry alloc] init]; @@ -101,9 +101,14 @@ count = 0; if (sort == YES) + { sortedFiles = [paths sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]; + [paths release]; + } else + { sortedFiles = paths; + } for(i=0; i < [sortedFiles count]; i++) { @@ -391,7 +396,7 @@ [currentEntry setCurrent:NO]; [pe setCurrent:YES]; - [tableView scrollRowToVisible:[pe index]]; + [tableView scrollRowToVisible:[(PlaylistEntry *)pe index]]; [pe retain]; [currentEntry release]; diff --git a/Playlist/PlaylistEntry.m b/Playlist/PlaylistEntry.m index ca6f3a5a2..44f289070 100644 --- a/Playlist/PlaylistEntry.m +++ b/Playlist/PlaylistEntry.m @@ -165,7 +165,9 @@ - (void)readInfo { + SoundFile *sp; SoundFile *sf = [SoundFile readInfo:filename]; + sp= sf; length = [sf length]; bitRate = [sf bitRate]; @@ -176,7 +178,8 @@ [self setLengthString:length]; // DBLog(@"Length: %f bitRate: %i channels: %i bps: %i samplerate: %f", length, bitRate, channels, bitsPerSample, sampleRate); - [sf close]; + //[(SoundFile *)sf close]; +// [sp close]; } - (NSString *)lengthString diff --git a/README b/README index 4a862a0a6..bb2e80cc7 100644 --- a/README +++ b/README @@ -1,14 +1,11 @@ --------------------------------------------------------------------------- - NOTE ABOUT BUTTONS: - If you are under impression that the buttons are acting strange, -they actually may be acting as intended. The back button goes through -the history of the songs played, that is,it goes to the "previously played" -song, not just the one before it in the playlist. So, for example, if you -had shuffle mode on, and then turned it off, you could go back through the -songs played during shuffle mode. The forward button acts as expected, where -if shuffle is on, it will pick a random song, and if not it goes to the next -song in the playlist. - Please comment, whether you like this behaviour or not! +10.3 USERS!!! + +If you are using 10.3.8 or below, I'd like to hear from you. I'm trying to +support all 10.3 systems, as I heard some people have had troubles with +10.3.9, and won't upgrade to it. +I can only fix this if people who actually run those systems wish to help +me debug Cog. Thanks! --------------------------------------------------------------------------- Cog is released under the GPL. See COPYING for details. @@ -24,7 +21,7 @@ unsuitable for virgin ears. All Cog code is copywrited by me, and is licensed under the GPL. - If you would like the photoshop sources for the various icons and + If you would like the photoshop sources for the various icons and graphics, please send me an email, and I will be happy to get them to you. Share and enjoy. diff --git a/Sound.h b/Sound.h index 28417e74d..19dec99ce 100644 --- a/Sound.h +++ b/Sound.h @@ -27,6 +27,7 @@ enum kCogStopMessage, kCogSeekMessage, kCogEndOfPlaylistMessage, + kCogSetVolumeMessage, //sound to controller kCogCheckinMessage, @@ -127,6 +128,7 @@ enum - (double)calculateTime:(unsigned long) pos; - (unsigned long)calculatePos:(double) time; +- (void)setVolume:(float)v; @end \ No newline at end of file diff --git a/Sound.m b/Sound.m index 463194694..20dae2073 100644 --- a/Sound.m +++ b/Sound.m @@ -59,6 +59,9 @@ static OSStatus Sound_ACInputProc(AudioConverterRef inAudioConverter, UInt32* io Sound *sound = (Sound *)inUserData; OSStatus err = noErr; + DBLog(@"Convert input proc"); + DBLog(@"Numpackets: %i %i", *ioNumberDataPackets, ioData->mNumberBuffers); + int amountToWrite; int amountWritten; void *sourceBuf; @@ -67,6 +70,7 @@ static OSStatus Sound_ACInputProc(AudioConverterRef inAudioConverter, UInt32* io sourceBuf = malloc(amountToWrite); sound->conversionBuffer = sourceBuf; + DBLog(@"Requesting: %i", amountToWrite); amountWritten = [sound->soundFile fillBuffer:sourceBuf ofSize:amountToWrite]; // DBLog(@"PACKET NUMBER RECEIVED: %i", *ioNumberDataPackets); @@ -74,7 +78,9 @@ static OSStatus Sound_ACInputProc(AudioConverterRef inAudioConverter, UInt32* io ioData->mBuffers[0].mDataByteSize = amountWritten; ioData->mBuffers[0].mNumberChannels = sound->sourceStreamFormat.mChannelsPerFrame; ioData->mNumberBuffers = 1; - + + DBLog(@"Input complete"); + return err; } @@ -145,8 +151,8 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc readLock = [[NSLock alloc] init]; writeLock = [[NSLock alloc] init]; - ringBuffer = [[VirtualRingBuffer alloc] initWithLength:RING_BUFFER_SIZE]; - auxRingBuffer = [[VirtualRingBuffer alloc] initWithLength:RING_BUFFER_SIZE]; + ringBuffer = [(VirtualRingBuffer *)[VirtualRingBuffer alloc] initWithLength:RING_BUFFER_SIZE]; + auxRingBuffer = [(VirtualRingBuffer *)[VirtualRingBuffer alloc] initWithLength:RING_BUFFER_SIZE]; readRingBuffer = ringBuffer; writeRingBuffer = ringBuffer; @@ -256,8 +262,7 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc NS_DURING [portMessage sendBeforeDate:date]; NS_HANDLER - NSRunAlertPanel(@"Error Panel", @"%@", @"OK", nil, nil, - localException); + NSRunAlertPanel(@"Error Panel", @"%@", @"OK", nil, nil, localException); NS_ENDHANDLER [date release]; @@ -352,6 +357,16 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc { [self setPlaybackStatus:kCogStatusEndOfPlaylist]; } + else if (msgid == kCogSetVolumeMessage) + { + NSArray* components = [portMessage components]; + NSData *data = [components objectAtIndex:0]; + float vol; + + vol = (*(float *)[data bytes]); + + [self setVolume:vol]; + } } - (void)startPositionTimer @@ -750,5 +765,19 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc return YES; } +- (void)setVolume:(float)v +{ + DBLog(@"Setting volume to: %f", v); + //Get the current stream format of the output + OSStatus err = AudioUnitSetParameter (outputUnit, + kHALOutputParam_Volume, + kAudioUnitScope_Global, + 0, + v * 0.01f, + 0); + + DBLog(@"Error: %lu", err); +} + @end diff --git a/SoundController.h b/SoundController.h index 9368f0d33..922aecb41 100644 --- a/SoundController.h +++ b/SoundController.h @@ -33,6 +33,7 @@ } - (IBAction)toggleShowTimeRemaining:(id)sender; +- (IBAction)changeVolume:(id)sender; - (IBAction)playPauseResume:(id)sender; - (IBAction)pauseResume:(id)sender; diff --git a/SoundController.m b/SoundController.m index 1b204e0cf..ba78a83e4 100644 --- a/SoundController.m +++ b/SoundController.m @@ -209,6 +209,12 @@ [playButton setAlternateImage:alt]; } +- (IBAction)changeVolume:(id)sender +{ + float v = (float)[sender floatValue]; + [self sendPortMessage:kCogSetVolumeMessage withData:&v ofSize:sizeof(float)]; +} + - (IBAction)toggleShowTimeRemaining:(id)sender { NSString *text; diff --git a/SoundFile/AACFile.m b/SoundFile/AACFile.m index 0e788ef9e..d7a6fb7fe 100644 --- a/SoundFile/AACFile.m +++ b/SoundFile/AACFile.m @@ -68,7 +68,9 @@ - (BOOL)readInfo:(const char *)filename { - return [self open:filename]; //they both would do the same damn thing + [self open:filename]; + + return YES; } - (int)fillBuffer:(void *)buf ofSize:(UInt32)size diff --git a/SoundFile/FlacFile.h b/SoundFile/FlacFile.h index 2e639cd48..b067b1c33 100644 --- a/SoundFile/FlacFile.h +++ b/SoundFile/FlacFile.h @@ -7,7 +7,7 @@ // #import -#import "flac/all.h" +#import "FLAC/all.h" #import "SoundFile.h" #define SAMPLES_PER_WRITE 512 diff --git a/SoundFile/MPEGFile.m b/SoundFile/MPEGFile.m index 6a5136930..f23a7b962 100644 --- a/SoundFile/MPEGFile.m +++ b/SoundFile/MPEGFile.m @@ -66,7 +66,9 @@ - (BOOL)readInfo:(const char *)filename { - return [self open:filename]; //does the same damn thing + [self open:filename]; + + return YES; } - (int)fillBuffer:(void *)buf ofSize:(UInt32)size diff --git a/SoundFile/MonkeysFile.m b/SoundFile/MonkeysFile.m index 491236da6..4ca3dee52 100644 --- a/SoundFile/MonkeysFile.m +++ b/SoundFile/MonkeysFile.m @@ -34,19 +34,7 @@ - (BOOL)readInfo:(const char *)filename { - int err; - CAPEInfo apeInfo(&err, filename, NULL); - - frequency = apeInfo.GetInfo(APE_INFO_SAMPLE_RATE); - bitsPerSample = apeInfo.GetInfo(APE_INFO_BITS_PER_SAMPLE); - channels = apeInfo.GetInfo(APE_INFO_CHANNELS); - - totalSize = apeInfo.GetInfo(APE_INFO_TOTAL_BLOCKS)*bitsPerSample/8*channels; - bitRate = apeInfo.GetInfo(APE_INFO_AVERAGE_BITRATE); - - DBLog(@"INFO READ: %i %i %i %i", frequency, bitsPerSample, channels, totalSize); - - return YES; + return [self open:filename]; } - (int)fillBuffer:(void *)buf ofSize:(UInt32)size diff --git a/SoundFile/MusepackFile.m b/SoundFile/MusepackFile.m index 08653c9b8..1b3062749 100644 --- a/SoundFile/MusepackFile.m +++ b/SoundFile/MusepackFile.m @@ -54,7 +54,8 @@ BOOL CanSeekProc(void *data) //real ish - (BOOL)open:(const char *)filename { - [self readInfo:filename]; + if ([self readInfo:filename] == NO) + return NO; /* instantiate a decoder with our file reader */ mpc_decoder_setup(&decoder, &reader); @@ -91,7 +92,7 @@ BOOL CanSeekProc(void *data) channels = 2; totalSize = mpc_streaminfo_get_length_samples(&info)*channels*bitsPerSample/8; - + return YES; } diff --git a/SoundFile/ShnFile.m b/SoundFile/ShnFile.m index e2eae7bab..f0858a6f9 100644 --- a/SoundFile/ShnFile.m +++ b/SoundFile/ShnFile.m @@ -13,10 +13,7 @@ - (BOOL)open:(const char *)filename { - BOOL r; - - r = [self readInfo:filename]; - if (!r) + if ([self readInfo:filename] == NO) return NO; bufferSize = shn_get_buffer_block_size(handle, 512); @@ -54,6 +51,7 @@ bitRate = (int)((double)totalSize/((double)length/1000.0)); DBLog(@"Bitrate; %i", bitRate); + return YES; } diff --git a/SoundFile/SoundFile.h b/SoundFile/SoundFile.h index 8d9c34cf0..1ba193ab4 100644 --- a/SoundFile/SoundFile.h +++ b/SoundFile/SoundFile.h @@ -42,7 +42,7 @@ - (BOOL)readInfo:(const char *)filename; //for getting information -- (UInt32)fillBuffer:(void *)buf ofSize:(UInt32)size; +- (int)fillBuffer:(void *)buf ofSize:(UInt32)size; //- (BOOL)seek:(unsigned long)position; - (double)seekToTime:(double)milliseconds; diff --git a/SoundFile/SoundFile.m b/SoundFile/SoundFile.m index 2637e5c82..5d4ea73c5 100644 --- a/SoundFile/SoundFile.m +++ b/SoundFile/SoundFile.m @@ -8,6 +8,15 @@ #import "SoundFile.h" +#import "FlacFile.h" +#import "AACFile.h" +#import "MonkeysFile.h" +#import "MPEGFile.h" +#import "MusepackFile.h" +#import "VorbisFile.h" +#import "WaveFile.h" +#import "WavPackFile.h" +#import "ShnFile.h" @implementation SoundFile @@ -38,10 +47,11 @@ //this should be done by the soundfile....not seek... - (double)seekToTime:(double)milliseconds { + return -1.0; } - +/* @class FlacFile; @class MonkeysFile; @class MPEGFile; @@ -51,44 +61,46 @@ @class AACFile; @class WavPackFile; @class ShnFile; - +*/ + (SoundFile *)soundFileFromFilename:(NSString *)filename { SoundFile *soundFile; - if ([[filename pathExtension] isEqualToString:@"wav"] || [[filename pathExtension] isEqualToString:@"aiff"] || [[filename pathExtension] isEqualToString:@"aif"]) + DBLog(@"FILENAME: %@", [filename pathExtension]); + + if (([[filename pathExtension] caseInsensitiveCompare:@"wav"] == NSOrderedSame) || ([[filename pathExtension] caseInsensitiveCompare:@"aiff"] == NSOrderedSame) || ([[filename pathExtension] caseInsensitiveCompare:@"aif"] == NSOrderedSame)) { soundFile = [[WaveFile alloc] init]; } - else if ([[filename pathExtension] isEqualToString:@"ogg"]) + else if ([[filename pathExtension] caseInsensitiveCompare:@"ogg"] == NSOrderedSame) { soundFile = [[VorbisFile alloc] init]; } - else if ([[filename pathExtension] isEqualToString:@"mpc"]) + else if ([[filename pathExtension] caseInsensitiveCompare:@"mpc"] == NSOrderedSame) { soundFile = [[MusepackFile alloc] init]; } - else if ([[filename pathExtension] isEqualToString:@"flac"]) + else if ([[filename pathExtension] caseInsensitiveCompare:@"flac"] == NSOrderedSame) { soundFile = [[FlacFile alloc] init]; } - else if ([[filename pathExtension] isEqualToString:@"ape"]) + else if ([[filename pathExtension] caseInsensitiveCompare:@"ape"] == NSOrderedSame) { soundFile = [[MonkeysFile alloc] init]; } - else if ([[filename pathExtension] isEqualToString:@"mp3"]) + else if ([[filename pathExtension] caseInsensitiveCompare:@"mp3"] == NSOrderedSame) { soundFile = [[MPEGFile alloc] init]; } - else if ([[filename pathExtension] isEqualToString:@"aac"]) + else if ([[filename pathExtension] caseInsensitiveCompare:@"aac"] == NSOrderedSame) { soundFile = [[AACFile alloc] init]; } - else if ([[filename pathExtension] isEqualToString:@"wv"]) + else if ([[filename pathExtension] caseInsensitiveCompare:@"wv"] == NSOrderedSame) { soundFile = [[WavPackFile alloc] init]; } - else if ([[filename pathExtension] isEqualToString:@"shn"]) + else if ([[filename pathExtension] caseInsensitiveCompare:@"shn"] == NSOrderedSame) { soundFile = [[ShnFile alloc] init]; } @@ -122,6 +134,9 @@ soundFile = [SoundFile soundFileFromFilename:filename]; b = [soundFile readInfo:[filename UTF8String]]; + + [soundFile close]; + if (b == YES) return soundFile; @@ -165,7 +180,7 @@ { } -- (UInt32)fillBuffer:(void *)buf ofSize:(UInt32)size +- (int)fillBuffer:(void *)buf ofSize:(UInt32)size { return 0; } diff --git a/SoundFile/VorbisFile.m b/SoundFile/VorbisFile.m index 8a1f0ea11..9460f269c 100644 --- a/SoundFile/VorbisFile.m +++ b/SoundFile/VorbisFile.m @@ -42,7 +42,9 @@ - (BOOL)readInfo:(const char *)filename { - return [self open:filename]; //automatically invokes readInfo + [self open:filename]; //automatically invokes readInfo + + return YES; } - (int)fillBuffer:(void *)buf ofSize:(UInt32)size diff --git a/SoundFile/WavPackFile.m b/SoundFile/WavPackFile.m index e6c0e6760..c05979def 100644 --- a/SoundFile/WavPackFile.m +++ b/SoundFile/WavPackFile.m @@ -11,12 +11,6 @@ @implementation WavPackFile -- (UInt32)frequency -{ - //HACK ALERT - return frequency/2; -} - - (BOOL)open:(const char *)filename { int open_flags = 0; @@ -27,8 +21,10 @@ return NO; channels = WavpackGetNumChannels(wpc); - bitsPerSample = WavpackGetBitsPerSample(wpc); - frequency = WavpackGetSampleRate(wpc)*2; +// bitsPerSample = WavpackGetBitsPerSample(wpc); + bitsPerSample = 32; + + frequency = WavpackGetSampleRate(wpc); int samples; samples = WavpackGetNumSamples(wpc); @@ -36,14 +32,16 @@ bitRate = (int)(WavpackGetAverageBitrate(wpc, TRUE)/1000.0); - isBigEndian = YES; + //isBigEndian = YES; return YES; } - (BOOL)readInfo:(const char *)filename { - return [self open:filename]; //does the same damn thing + [self open:filename]; //does the same damn thing + + return YES; } - (int)fillBuffer:(void *)buf ofSize:(UInt32)size @@ -56,8 +54,14 @@ n = WavpackUnpackSamples(wpc, buf, numsamples); n *= 4*channels; -// DBLog(@"Read: %i", n); + int i; + for (i = 0; i < n/2; i++) + { +// ((UInt32 *)buf)[i] = CFSwapInt32LittleToHost(((UInt32 *)buf)[i]); + ((UInt16 *)buf)[i] = CFSwapInt16LittleToHost(((UInt16 *)buf)[i]); + } + return n; } diff --git a/SoundFile/WaveFile.m b/SoundFile/WaveFile.m index aaa9134ab..43d9106e5 100644 --- a/SoundFile/WaveFile.m +++ b/SoundFile/WaveFile.m @@ -83,7 +83,9 @@ - (BOOL)readInfo:(const char *)filename { - return [self open:filename]; + [self open:filename]; + + return YES; } - (int)fillBuffer:(void *)buf ofSize:(UInt32)size