diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index ff136ec5a..1c2e8eb4c 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 171B57DE0C091F2B00F6AFAF /* m4a.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DA0C091F2B00F6AFAF /* m4a.icns */; }; 171B57DF0C091F2B00F6AFAF /* mp3.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DB0C091F2B00F6AFAF /* mp3.icns */; }; 171B57E00C091F2B00F6AFAF /* ogg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DC0C091F2B00F6AFAF /* ogg.icns */; }; - 1727C1940C1CA0EF0084363D /* Quicktime.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1727C1710C1CA0D40084363D /* Quicktime.bundle */; }; 1755E1F90BA0D2B600CA3560 /* PlaylistLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1755E1F70BA0D2B600CA3560 /* PlaylistLoader.m */; }; 1766C6930B911DF1004A7AE4 /* AudioScrobbler.m in Sources */ = {isa = PBXBuildFile; fileRef = 1766C68F0B911DF1004A7AE4 /* AudioScrobbler.m */; }; 1766C6950B911DF1004A7AE4 /* AudioScrobblerClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 1766C6910B911DF1004A7AE4 /* AudioScrobblerClient.m */; }; @@ -58,14 +57,6 @@ 177EC0530B8BC2FF0000BC8C /* remove_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 177EC03D0B8BC2FF0000BC8C /* remove_gray.png */; }; 177EC0580B8BC2FF0000BC8C /* volume_high.png in Resources */ = {isa = PBXBuildFile; fileRef = 177EC0420B8BC2FF0000BC8C /* volume_high.png */; }; 177EC0590B8BC2FF0000BC8C /* volume_low.png in Resources */ = {isa = PBXBuildFile; fileRef = 177EC0430B8BC2FF0000BC8C /* volume_low.png */; }; - 177FD1040B90CB5F0011C3B5 /* Vorbis.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FD02F0B90CAEC0011C3B5 /* Vorbis.bundle */; }; - 177FD1050B90CB5F0011C3B5 /* TagLib.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FD02B0B90CAE50011C3B5 /* TagLib.bundle */; }; - 177FD1060B90CB5F0011C3B5 /* Shorten.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FD0270B90CADE0011C3B5 /* Shorten.bundle */; }; - 177FD1070B90CB5F0011C3B5 /* Musepack.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FD0230B90CAD60011C3B5 /* Musepack.bundle */; }; - 177FD1080B90CB5F0011C3B5 /* MonkeysAudio.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FD01F0B90CACE0011C3B5 /* MonkeysAudio.bundle */; }; - 177FD1090B90CB5F0011C3B5 /* MAD.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FD01B0B90CAC60011C3B5 /* MAD.bundle */; }; - 177FD10A0B90CB5F0011C3B5 /* Flac.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FD0170B90CABF0011C3B5 /* Flac.bundle */; }; - 177FD10B0B90CB5F0011C3B5 /* CoreAudio.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FD0130B90CAB50011C3B5 /* CoreAudio.bundle */; }; 17818A950C0B27AC001C4916 /* aiff.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17818A8E0C0B27AC001C4916 /* aiff.icns */; }; 17818A960C0B27AC001C4916 /* ape.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17818A8F0C0B27AC001C4916 /* ape.icns */; }; 17818A970C0B27AC001C4916 /* m3u.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17818A900C0B27AC001C4916 /* m3u.icns */; }; @@ -75,17 +66,26 @@ 17818A9B0C0B27AC001C4916 /* wv.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17818A940C0B27AC001C4916 /* wv.icns */; }; 179790E10C087AB7001D6996 /* OpenURLPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 179790DF0C087AB7001D6996 /* OpenURLPanel.m */; }; 179790F20C087B46001D6996 /* OpenURLPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 179790F00C087B46001D6996 /* OpenURLPanel.nib */; }; - 17ADB4580B979C7C00257CA2 /* FileSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB4450B979C5700257CA2 /* FileSource.bundle */; }; - 17ADB6650B97A97100257CA2 /* HTTPSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB65C0B97A96400257CA2 /* HTTPSource.bundle */; }; 17BB5CED0B8A86010009ACB1 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5CEC0B8A86010009ACB1 /* AudioToolbox.framework */; }; 17BB5CF90B8A86350009ACB1 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5CF60B8A86350009ACB1 /* AudioUnit.framework */; }; 17BB5CFA0B8A86350009ACB1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5CF70B8A86350009ACB1 /* CoreAudio.framework */; }; 17BB5CFB0B8A86350009ACB1 /* CoreAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5CF80B8A86350009ACB1 /* CoreAudioKit.framework */; }; 17BB5EA60B8A87850009ACB1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17BB5EA50B8A87850009ACB1 /* IOKit.framework */; }; + 17C809910C3BD201005707C4 /* WavPack.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808C80C3BD1DD005707C4 /* WavPack.bundle */; }; + 17C809920C3BD206005707C4 /* Vorbis.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808BF0C3BD1D2005707C4 /* Vorbis.bundle */; }; + 17C809930C3BD21D005707C4 /* TagLib.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808B60C3BD1C5005707C4 /* TagLib.bundle */; }; + 17C809940C3BD220005707C4 /* Shorten.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808AF0C3BD1BA005707C4 /* Shorten.bundle */; }; + 17C809950C3BD223005707C4 /* Musepack.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808A60C3BD1AB005707C4 /* Musepack.bundle */; }; + 17C809960C3BD226005707C4 /* MonkeysAudio.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8089D0C3BD19F005707C4 /* MonkeysAudio.bundle */; }; + 17C809970C3BD22A005707C4 /* MAD.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808940C3BD192005707C4 /* MAD.bundle */; }; + 17C809980C3BD22E005707C4 /* HTTPSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C8088B0C3BD181005707C4 /* HTTPSource.bundle */; }; + 17C809990C3BD231005707C4 /* Flac.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808820C3BD173005707C4 /* Flac.bundle */; }; + 17C8099A0C3BD233005707C4 /* FileSource.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C808790C3BD167005707C4 /* FileSource.bundle */; }; + 17C809E60C3BD487005707C4 /* CoreAudio.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17C809E30C3BD46D005707C4 /* CoreAudio.bundle */; }; 17E41E070C130DFF00AC744D /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 17E41E060C130DFF00AC744D /* Credits.html */; }; 17E41E230C130EE200AC744D /* Help in Resources */ = {isa = PBXBuildFile; fileRef = 17E41E220C130EE200AC744D /* Help */; }; - 17E94E530C03B09500D92B9B /* CogAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17E94E520C03B09500D92B9B /* CogAudio.framework */; }; - 17E94E560C03B09A00D92B9B /* CogAudio.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17E94E520C03B09500D92B9B /* CogAudio.framework */; }; + 17F561400C3BD4F30019975C /* CogAudio.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F561330C3BD4DC0019975C /* CogAudio.framework */; }; + 17F562390C3BD91B0019975C /* General.preferencePane in Resources */ = {isa = PBXBuildFile; fileRef = 17F5622E0C3BD8FB0019975C /* General.preferencePane */; }; 17F94CC20B8D08FB00A34E87 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F94CC10B8D08FB00A34E87 /* Sparkle.framework */; }; 17F94CCD0B8D090800A34E87 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F94CC10B8D08FB00A34E87 /* Sparkle.framework */; }; 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; @@ -94,9 +94,7 @@ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 8E07AAF30AAC910500A4B32F /* SS_PrefsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AAF00AAC910500A4B32F /* SS_PrefsController.m */; }; 8E07AB790AAC930B00A4B32F /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AB770AAC930B00A4B32F /* PreferencesController.m */; }; - 8E07AEEA0AACA08100A4B32F /* General.preferencePane in Resources */ = {isa = PBXBuildFile; fileRef = 8E07AEE90AACA08100A4B32F /* General.preferencePane */; }; 8E1296DB0A2BA9CE00443124 /* PlaylistHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E1296D90A2BA9CE00443124 /* PlaylistHeaderView.m */; }; - 8E2B90320B9B64BD00F2D9E8 /* WavPack.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E2B8F5E0B9B62F800F2D9E8 /* WavPack.bundle */; }; 8E6889240AAA403C00AD3950 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E6889230AAA403C00AD3950 /* Carbon.framework */; }; 8E75756E09F31D5A0080F1EE /* FeedbackController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E75752509F31D5A0080F1EE /* FeedbackController.m */; }; 8E75756F09F31D5A0080F1EE /* FeedbackSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E75752709F31D5A0080F1EE /* FeedbackSocket.m */; }; @@ -122,6 +120,191 @@ 8EFFCD6F0AA093AF00C458A5 /* PathNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EFFCD530AA093AF00C458A5 /* PathNode.m */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 17C808780C3BD167005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808710C3BD167005707C4 /* FileSource.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = FileSource; + }; + 17C808810C3BD173005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C8087A0C3BD173005707C4 /* Flac.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = Flac; + }; + 17C8088A0C3BD181005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808830C3BD181005707C4 /* HTTPSource.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = HTTPSource; + }; + 17C808930C3BD192005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C8088C0C3BD192005707C4 /* MAD.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = MAD; + }; + 17C8089C0C3BD19F005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808950C3BD19F005707C4 /* MonkeysAudio.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = MonkeysAudio; + }; + 17C808A50C3BD1AB005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = Musepack; + }; + 17C808AE0C3BD1BA005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = Shorten; + }; + 17C808B50C3BD1C5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = TagLib; + }; + 17C808BE0C3BD1D2005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = Vorbis; + }; + 17C808C70C3BD1DD005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = WavPack; + }; + 17C8097D0C3BD1F5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = Musepack; + }; + 17C8097F0C3BD1F5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808950C3BD19F005707C4 /* MonkeysAudio.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = MonkeysAudio; + }; + 17C809810C3BD1F5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = WavPack; + }; + 17C809830C3BD1F5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = Shorten; + }; + 17C809850C3BD1F5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808710C3BD167005707C4 /* FileSource.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = FileSource; + }; + 17C809870C3BD1F5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808830C3BD181005707C4 /* HTTPSource.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = HTTPSource; + }; + 17C809890C3BD1F5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = TagLib; + }; + 17C8098B0C3BD1F5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C8087A0C3BD173005707C4 /* Flac.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = Flac; + }; + 17C8098D0C3BD1F5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C8088C0C3BD192005707C4 /* MAD.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = MAD; + }; + 17C8098F0C3BD1F5005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = Vorbis; + }; + 17C809E20C3BD46D005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808660C3BD0F8005707C4 /* CoreAudio.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = CoreAudio; + }; + 17C809E40C3BD47C005707C4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17C808660C3BD0F8005707C4 /* CoreAudio.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = CoreAudio; + }; + 17F561320C3BD4DC0019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F5612A0C3BD4DC0019975C /* CogAudio.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = CogAudio; + }; + 17F5613E0C3BD4E90019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F5612A0C3BD4DC0019975C /* CogAudio.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = CogAudio; + }; + 17F5622D0C3BD8FB0019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F562260C3BD8FB0019975C /* General.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D5B49B6048680CD000E48DA; + remoteInfo = General; + }; + 17F5623A0C3BD9280019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F562260C3BD8FB0019975C /* General.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D5B49AC048680CD000E48DA; + remoteInfo = General; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 177FD1000B90CB570011C3B5 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -129,18 +312,17 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - 8E2B90320B9B64BD00F2D9E8 /* WavPack.bundle in CopyFiles */, - 17ADB6650B97A97100257CA2 /* HTTPSource.bundle in CopyFiles */, - 17ADB4580B979C7C00257CA2 /* FileSource.bundle in CopyFiles */, - 177FD1040B90CB5F0011C3B5 /* Vorbis.bundle in CopyFiles */, - 177FD1050B90CB5F0011C3B5 /* TagLib.bundle in CopyFiles */, - 177FD1060B90CB5F0011C3B5 /* Shorten.bundle in CopyFiles */, - 177FD1070B90CB5F0011C3B5 /* Musepack.bundle in CopyFiles */, - 177FD1080B90CB5F0011C3B5 /* MonkeysAudio.bundle in CopyFiles */, - 177FD1090B90CB5F0011C3B5 /* MAD.bundle in CopyFiles */, - 177FD10A0B90CB5F0011C3B5 /* Flac.bundle in CopyFiles */, - 177FD10B0B90CB5F0011C3B5 /* CoreAudio.bundle in CopyFiles */, - 1727C1940C1CA0EF0084363D /* Quicktime.bundle in CopyFiles */, + 17C809E60C3BD487005707C4 /* CoreAudio.bundle in CopyFiles */, + 17C8099A0C3BD233005707C4 /* FileSource.bundle in CopyFiles */, + 17C809990C3BD231005707C4 /* Flac.bundle in CopyFiles */, + 17C809980C3BD22E005707C4 /* HTTPSource.bundle in CopyFiles */, + 17C809970C3BD22A005707C4 /* MAD.bundle in CopyFiles */, + 17C809960C3BD226005707C4 /* MonkeysAudio.bundle in CopyFiles */, + 17C809950C3BD223005707C4 /* Musepack.bundle in CopyFiles */, + 17C809940C3BD220005707C4 /* Shorten.bundle in CopyFiles */, + 17C809930C3BD21D005707C4 /* TagLib.bundle in CopyFiles */, + 17C809920C3BD206005707C4 /* Vorbis.bundle in CopyFiles */, + 17C809910C3BD201005707C4 /* WavPack.bundle in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -150,7 +332,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 17E94E560C03B09A00D92B9B /* CogAudio.framework in CopyFiles */, + 17F561400C3BD4F30019975C /* CogAudio.framework in CopyFiles */, 170680840B950164006BA573 /* Growl.framework in CopyFiles */, 17F94CCD0B8D090800A34E87 /* Sparkle.framework in CopyFiles */, ); @@ -169,7 +351,6 @@ 171B57DA0C091F2B00F6AFAF /* m4a.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = m4a.icns; sourceTree = ""; }; 171B57DB0C091F2B00F6AFAF /* mp3.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = mp3.icns; sourceTree = ""; }; 171B57DC0C091F2B00F6AFAF /* ogg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = ogg.icns; sourceTree = ""; }; - 1727C1710C1CA0D40084363D /* Quicktime.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Quicktime.bundle; path = Plugins/Quicktime/build/Release/Quicktime.bundle; sourceTree = ""; }; 1755E1F60BA0D2B600CA3560 /* PlaylistLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlaylistLoader.h; sourceTree = ""; }; 1755E1F70BA0D2B600CA3560 /* PlaylistLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PlaylistLoader.m; sourceTree = ""; }; 1766C68E0B911DF1004A7AE4 /* AudioScrobbler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AudioScrobbler.h; sourceTree = ""; }; @@ -236,14 +417,6 @@ 177EC03D0B8BC2FF0000BC8C /* remove_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = remove_gray.png; path = Images/remove_gray.png; sourceTree = ""; }; 177EC0420B8BC2FF0000BC8C /* volume_high.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volume_high.png; path = Images/volume_high.png; sourceTree = ""; }; 177EC0430B8BC2FF0000BC8C /* volume_low.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volume_low.png; path = Images/volume_low.png; sourceTree = ""; }; - 177FD0130B90CAB50011C3B5 /* CoreAudio.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = CoreAudio.bundle; path = Plugins/CoreAudio/build/Release/CoreAudio.bundle; sourceTree = ""; }; - 177FD0170B90CABF0011C3B5 /* Flac.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Flac.bundle; path = Plugins/Flac/build/Release/Flac.bundle; sourceTree = ""; }; - 177FD01B0B90CAC60011C3B5 /* MAD.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MAD.bundle; path = Plugins/MAD/build/Release/MAD.bundle; sourceTree = ""; }; - 177FD01F0B90CACE0011C3B5 /* MonkeysAudio.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = MonkeysAudio.bundle; path = Plugins/MonkeysAudio/build/Release/MonkeysAudio.bundle; sourceTree = ""; }; - 177FD0230B90CAD60011C3B5 /* Musepack.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Musepack.bundle; path = Plugins/Musepack/build/Release/Musepack.bundle; sourceTree = ""; }; - 177FD0270B90CADE0011C3B5 /* Shorten.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Shorten.bundle; path = Plugins/Shorten/build/Release/Shorten.bundle; sourceTree = ""; }; - 177FD02B0B90CAE50011C3B5 /* TagLib.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = TagLib.bundle; path = Plugins/TagLib/build/Release/TagLib.bundle; sourceTree = ""; }; - 177FD02F0B90CAEC0011C3B5 /* Vorbis.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Vorbis.bundle; path = Plugins/Vorbis/build/Release/Vorbis.bundle; sourceTree = ""; }; 17818A8E0C0B27AC001C4916 /* aiff.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = aiff.icns; sourceTree = ""; }; 17818A8F0C0B27AC001C4916 /* ape.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = ape.icns; sourceTree = ""; }; 17818A900C0B27AC001C4916 /* m3u.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = m3u.icns; sourceTree = ""; }; @@ -254,17 +427,27 @@ 179790DE0C087AB7001D6996 /* OpenURLPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OpenURLPanel.h; sourceTree = ""; }; 179790DF0C087AB7001D6996 /* OpenURLPanel.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = OpenURLPanel.m; sourceTree = ""; }; 179790F10C087B46001D6996 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/OpenURLPanel.nib; sourceTree = ""; }; - 17ADB4450B979C5700257CA2 /* FileSource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = FileSource.bundle; path = Plugins/FileSource/build/Release/FileSource.bundle; sourceTree = ""; }; - 17ADB65C0B97A96400257CA2 /* HTTPSource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = HTTPSource.bundle; path = Plugins/HTTPSource/build/Release/HTTPSource.bundle; sourceTree = ""; }; 17BB5CEC0B8A86010009ACB1 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = ""; }; 17BB5CF60B8A86350009ACB1 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; 17BB5CF70B8A86350009ACB1 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; 17BB5CF80B8A86350009ACB1 /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = /System/Library/Frameworks/CoreAudioKit.framework; sourceTree = ""; }; 17BB5EA50B8A87850009ACB1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; + 17C808660C3BD0F8005707C4 /* CoreAudio.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CoreAudio.xcodeproj; path = Plugins/CoreAudio/CoreAudio.xcodeproj; sourceTree = SOURCE_ROOT; }; + 17C808710C3BD167005707C4 /* FileSource.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FileSource.xcodeproj; path = Plugins/FileSource/FileSource.xcodeproj; sourceTree = ""; }; + 17C8087A0C3BD173005707C4 /* Flac.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Flac.xcodeproj; path = Plugins/Flac/Flac.xcodeproj; sourceTree = ""; }; + 17C808830C3BD181005707C4 /* HTTPSource.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = HTTPSource.xcodeproj; path = Plugins/HTTPSource/HTTPSource.xcodeproj; sourceTree = ""; }; + 17C8088C0C3BD192005707C4 /* MAD.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MAD.xcodeproj; path = Plugins/MAD/MAD.xcodeproj; sourceTree = ""; }; + 17C808950C3BD19F005707C4 /* MonkeysAudio.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MonkeysAudio.xcodeproj; path = Plugins/MonkeysAudio/MonkeysAudio.xcodeproj; sourceTree = ""; }; + 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Musepack.xcodeproj; path = Plugins/Musepack/Musepack.xcodeproj; sourceTree = ""; }; + 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Shorten.xcodeproj; path = Plugins/Shorten/Shorten.xcodeproj; sourceTree = ""; }; + 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TagLib.xcodeproj; path = Plugins/TagLib/TagLib.xcodeproj; sourceTree = ""; }; + 17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Vorbis.xcodeproj; path = Plugins/Vorbis/Vorbis.xcodeproj; sourceTree = ""; }; + 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WavPack.xcodeproj; path = Plugins/WavPack/WavPack.xcodeproj; sourceTree = ""; }; 17E41C470C1304BB00AC744D /* Swedish */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Swedish; path = Swedish.lproj/MainMenu.nib; sourceTree = ""; }; 17E41C480C1304C700AC744D /* Swedish */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Swedish; path = Swedish.lproj/OpenURLPanel.nib; sourceTree = ""; }; 17E41C490C1304D200AC744D /* Swedish */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Swedish; path = Swedish.lproj/Localizable.strings; sourceTree = ""; }; - 17E94E520C03B09500D92B9B /* CogAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CogAudio.framework; path = Audio/build/Release/CogAudio.framework; sourceTree = ""; }; + 17F5612A0C3BD4DC0019975C /* CogAudio.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CogAudio.xcodeproj; path = Audio/CogAudio.xcodeproj; sourceTree = ""; }; + 17F562260C3BD8FB0019975C /* General.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = General.xcodeproj; path = Preferences/General/General.xcodeproj; sourceTree = ""; }; 17F94CC10B8D08FB00A34E87 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ThirdParty/Frameworks/Sparkle.framework; sourceTree = ""; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = ""; }; @@ -277,10 +460,8 @@ 8E07AAF00AAC910500A4B32F /* SS_PrefsController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SS_PrefsController.m; path = Preferences/SS_PrefsController.m; sourceTree = ""; }; 8E07AB760AAC930B00A4B32F /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PreferencesController.h; path = Preferences/PreferencesController.h; sourceTree = ""; }; 8E07AB770AAC930B00A4B32F /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PreferencesController.m; path = Preferences/PreferencesController.m; sourceTree = ""; }; - 8E07AEE90AACA08100A4B32F /* General.preferencePane */ = {isa = PBXFileReference; lastKnownFileType = folder; name = General.preferencePane; path = Preferences/General/build/Release/General.preferencePane; sourceTree = ""; }; 8E1296D80A2BA9CE00443124 /* PlaylistHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlaylistHeaderView.h; sourceTree = ""; }; 8E1296D90A2BA9CE00443124 /* PlaylistHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PlaylistHeaderView.m; sourceTree = ""; }; - 8E2B8F5E0B9B62F800F2D9E8 /* WavPack.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = WavPack.bundle; path = Plugins/WavPack/build/Release/WavPack.bundle; sourceTree = ""; }; 8E6889230AAA403C00AD3950 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; 8E75752409F31D5A0080F1EE /* FeedbackController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FeedbackController.h; sourceTree = ""; }; 8E75752509F31D5A0080F1EE /* FeedbackController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FeedbackController.m; sourceTree = ""; }; @@ -339,7 +520,6 @@ 17BB5EA60B8A87850009ACB1 /* IOKit.framework in Frameworks */, 17F94CC20B8D08FB00A34E87 /* Sparkle.framework in Frameworks */, 170680630B950158006BA573 /* Growl.framework in Frameworks */, - 17E94E530C03B09500D92B9B /* CogAudio.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -364,7 +544,7 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 17E94E520C03B09500D92B9B /* CogAudio.framework */, + 17F5612A0C3BD4DC0019975C /* CogAudio.xcodeproj */, 170680620B950158006BA573 /* Growl.framework */, 17F94CC10B8D08FB00A34E87 /* Sparkle.framework */, 8E6889230AAA403C00AD3950 /* Carbon.framework */, @@ -548,22 +728,125 @@ 17B619FF0B909ED400BC003F /* PlugIns */ = { isa = PBXGroup; children = ( - 1727C1710C1CA0D40084363D /* Quicktime.bundle */, - 8E2B8F5E0B9B62F800F2D9E8 /* WavPack.bundle */, - 17ADB65C0B97A96400257CA2 /* HTTPSource.bundle */, - 17ADB4450B979C5700257CA2 /* FileSource.bundle */, - 177FD02F0B90CAEC0011C3B5 /* Vorbis.bundle */, - 177FD02B0B90CAE50011C3B5 /* TagLib.bundle */, - 177FD0270B90CADE0011C3B5 /* Shorten.bundle */, - 177FD0230B90CAD60011C3B5 /* Musepack.bundle */, - 177FD01F0B90CACE0011C3B5 /* MonkeysAudio.bundle */, - 177FD01B0B90CAC60011C3B5 /* MAD.bundle */, - 177FD0170B90CABF0011C3B5 /* Flac.bundle */, - 177FD0130B90CAB50011C3B5 /* CoreAudio.bundle */, + 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */, + 17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */, + 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */, + 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */, + 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */, + 17C808950C3BD19F005707C4 /* MonkeysAudio.xcodeproj */, + 17C8088C0C3BD192005707C4 /* MAD.xcodeproj */, + 17C808830C3BD181005707C4 /* HTTPSource.xcodeproj */, + 17C8087A0C3BD173005707C4 /* Flac.xcodeproj */, + 17C808710C3BD167005707C4 /* FileSource.xcodeproj */, + 17C808660C3BD0F8005707C4 /* CoreAudio.xcodeproj */, ); name = PlugIns; sourceTree = ""; }; + 17C808720C3BD167005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C808790C3BD167005707C4 /* FileSource.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17C8087B0C3BD173005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C808820C3BD173005707C4 /* Flac.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17C808840C3BD181005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C8088B0C3BD181005707C4 /* HTTPSource.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17C8088D0C3BD192005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C808940C3BD192005707C4 /* MAD.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17C808960C3BD19F005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C8089D0C3BD19F005707C4 /* MonkeysAudio.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17C8089F0C3BD1AB005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C808A60C3BD1AB005707C4 /* Musepack.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17C808A80C3BD1BA005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C808AF0C3BD1BA005707C4 /* Shorten.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17C808B10C3BD1C5005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C808B60C3BD1C5005707C4 /* TagLib.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17C808B80C3BD1D2005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C808BF0C3BD1D2005707C4 /* Vorbis.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17C808C10C3BD1DD005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C808C80C3BD1DD005707C4 /* WavPack.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17C809DF0C3BD46D005707C4 /* Products */ = { + isa = PBXGroup; + children = ( + 17C809E30C3BD46D005707C4 /* CoreAudio.bundle */, + ); + name = Products; + sourceTree = ""; + }; + 17F5612B0C3BD4DC0019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F561330C3BD4DC0019975C /* CogAudio.framework */, + ); + name = Products; + sourceTree = ""; + }; + 17F562270C3BD8FB0019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F5622E0C3BD8FB0019975C /* General.preferencePane */, + ); + name = Products; + sourceTree = ""; + }; 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -637,7 +920,7 @@ 8E07AD280AAC9BE600A4B32F /* Preference Panes */ = { isa = PBXGroup; children = ( - 8E07AEE90AACA08100A4B32F /* General.preferencePane */, + 17F562260C3BD8FB0019975C /* General.xcodeproj */, ); name = "Preference Panes"; sourceTree = ""; @@ -738,6 +1021,19 @@ buildRules = ( ); dependencies = ( + 17C8097E0C3BD1F5005707C4 /* PBXTargetDependency */, + 17C809800C3BD1F5005707C4 /* PBXTargetDependency */, + 17C809820C3BD1F5005707C4 /* PBXTargetDependency */, + 17C809840C3BD1F5005707C4 /* PBXTargetDependency */, + 17C809860C3BD1F5005707C4 /* PBXTargetDependency */, + 17C809880C3BD1F5005707C4 /* PBXTargetDependency */, + 17C8098A0C3BD1F5005707C4 /* PBXTargetDependency */, + 17C8098C0C3BD1F5005707C4 /* PBXTargetDependency */, + 17C8098E0C3BD1F5005707C4 /* PBXTargetDependency */, + 17C809900C3BD1F5005707C4 /* PBXTargetDependency */, + 17C809E50C3BD47C005707C4 /* PBXTargetDependency */, + 17F5613F0C3BD4E90019975C /* PBXTargetDependency */, + 17F5623B0C3BD9280019975C /* PBXTargetDependency */, ); name = Cog; productInstallPath = "$(HOME)/Applications"; @@ -761,18 +1057,166 @@ ); mainGroup = 29B97314FDCFA39411CA2CEA /* Cog */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 17F5612B0C3BD4DC0019975C /* Products */; + ProjectRef = 17F5612A0C3BD4DC0019975C /* CogAudio.xcodeproj */; + }, + { + ProductGroup = 17C809DF0C3BD46D005707C4 /* Products */; + ProjectRef = 17C808660C3BD0F8005707C4 /* CoreAudio.xcodeproj */; + }, + { + ProductGroup = 17C808720C3BD167005707C4 /* Products */; + ProjectRef = 17C808710C3BD167005707C4 /* FileSource.xcodeproj */; + }, + { + ProductGroup = 17C8087B0C3BD173005707C4 /* Products */; + ProjectRef = 17C8087A0C3BD173005707C4 /* Flac.xcodeproj */; + }, + { + ProductGroup = 17F562270C3BD8FB0019975C /* Products */; + ProjectRef = 17F562260C3BD8FB0019975C /* General.xcodeproj */; + }, + { + ProductGroup = 17C808840C3BD181005707C4 /* Products */; + ProjectRef = 17C808830C3BD181005707C4 /* HTTPSource.xcodeproj */; + }, + { + ProductGroup = 17C8088D0C3BD192005707C4 /* Products */; + ProjectRef = 17C8088C0C3BD192005707C4 /* MAD.xcodeproj */; + }, + { + ProductGroup = 17C808960C3BD19F005707C4 /* Products */; + ProjectRef = 17C808950C3BD19F005707C4 /* MonkeysAudio.xcodeproj */; + }, + { + ProductGroup = 17C8089F0C3BD1AB005707C4 /* Products */; + ProjectRef = 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */; + }, + { + ProductGroup = 17C808A80C3BD1BA005707C4 /* Products */; + ProjectRef = 17C808A70C3BD1BA005707C4 /* Shorten.xcodeproj */; + }, + { + ProductGroup = 17C808B10C3BD1C5005707C4 /* Products */; + ProjectRef = 17C808B00C3BD1C5005707C4 /* TagLib.xcodeproj */; + }, + { + ProductGroup = 17C808B80C3BD1D2005707C4 /* Products */; + ProjectRef = 17C808B70C3BD1D2005707C4 /* Vorbis.xcodeproj */; + }, + { + ProductGroup = 17C808C10C3BD1DD005707C4 /* Products */; + ProjectRef = 17C808C00C3BD1DD005707C4 /* WavPack.xcodeproj */; + }, + ); targets = ( 8D1107260486CEB800E47090 /* Cog */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 17C808790C3BD167005707C4 /* FileSource.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = FileSource.bundle; + remoteRef = 17C808780C3BD167005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17C808820C3BD173005707C4 /* Flac.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = Flac.bundle; + remoteRef = 17C808810C3BD173005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17C8088B0C3BD181005707C4 /* HTTPSource.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = HTTPSource.bundle; + remoteRef = 17C8088A0C3BD181005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17C808940C3BD192005707C4 /* MAD.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = MAD.bundle; + remoteRef = 17C808930C3BD192005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17C8089D0C3BD19F005707C4 /* MonkeysAudio.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = MonkeysAudio.bundle; + remoteRef = 17C8089C0C3BD19F005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17C808A60C3BD1AB005707C4 /* Musepack.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = Musepack.bundle; + remoteRef = 17C808A50C3BD1AB005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17C808AF0C3BD1BA005707C4 /* Shorten.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = Shorten.bundle; + remoteRef = 17C808AE0C3BD1BA005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17C808B60C3BD1C5005707C4 /* TagLib.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = TagLib.bundle; + remoteRef = 17C808B50C3BD1C5005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17C808BF0C3BD1D2005707C4 /* Vorbis.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = Vorbis.bundle; + remoteRef = 17C808BE0C3BD1D2005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17C808C80C3BD1DD005707C4 /* WavPack.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = WavPack.bundle; + remoteRef = 17C808C70C3BD1DD005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17C809E30C3BD46D005707C4 /* CoreAudio.bundle */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = CoreAudio.bundle; + remoteRef = 17C809E20C3BD46D005707C4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17F561330C3BD4DC0019975C /* CogAudio.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = CogAudio.framework; + remoteRef = 17F561320C3BD4DC0019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17F5622E0C3BD8FB0019975C /* General.preferencePane */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = General.preferencePane; + remoteRef = 17F5622D0C3BD8FB0019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8D1107290486CEB800E47090 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8E07AEEA0AACA08100A4B32F /* General.preferencePane in Resources */, + 17F562390C3BD91B0019975C /* General.preferencePane in Resources */, 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */, 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, 8E7575BE09F31D800080F1EE /* wheel.icns in Resources */, @@ -875,6 +1319,74 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 17C8097E0C3BD1F5005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Musepack; + targetProxy = 17C8097D0C3BD1F5005707C4 /* PBXContainerItemProxy */; + }; + 17C809800C3BD1F5005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = MonkeysAudio; + targetProxy = 17C8097F0C3BD1F5005707C4 /* PBXContainerItemProxy */; + }; + 17C809820C3BD1F5005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = WavPack; + targetProxy = 17C809810C3BD1F5005707C4 /* PBXContainerItemProxy */; + }; + 17C809840C3BD1F5005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Shorten; + targetProxy = 17C809830C3BD1F5005707C4 /* PBXContainerItemProxy */; + }; + 17C809860C3BD1F5005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = FileSource; + targetProxy = 17C809850C3BD1F5005707C4 /* PBXContainerItemProxy */; + }; + 17C809880C3BD1F5005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = HTTPSource; + targetProxy = 17C809870C3BD1F5005707C4 /* PBXContainerItemProxy */; + }; + 17C8098A0C3BD1F5005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = TagLib; + targetProxy = 17C809890C3BD1F5005707C4 /* PBXContainerItemProxy */; + }; + 17C8098C0C3BD1F5005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Flac; + targetProxy = 17C8098B0C3BD1F5005707C4 /* PBXContainerItemProxy */; + }; + 17C8098E0C3BD1F5005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = MAD; + targetProxy = 17C8098D0C3BD1F5005707C4 /* PBXContainerItemProxy */; + }; + 17C809900C3BD1F5005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Vorbis; + targetProxy = 17C8098F0C3BD1F5005707C4 /* PBXContainerItemProxy */; + }; + 17C809E50C3BD47C005707C4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = CoreAudio; + targetProxy = 17C809E40C3BD47C005707C4 /* PBXContainerItemProxy */; + }; + 17F5613F0C3BD4E90019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = CogAudio; + targetProxy = 17F5613E0C3BD4E90019975C /* PBXContainerItemProxy */; + }; + 17F5623B0C3BD9280019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = General; + targetProxy = 17F5623A0C3BD9280019975C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { isa = PBXVariantGroup; diff --git a/Frameworks/FLAC/flac.xcodeproj/project.pbxproj b/Frameworks/FLAC/flac.xcodeproj/project.pbxproj index 05e8e8af6..7e4741fa6 100644 --- a/Frameworks/FLAC/flac.xcodeproj/project.pbxproj +++ b/Frameworks/FLAC/flac.xcodeproj/project.pbxproj @@ -286,12 +286,18 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = flac_Prefix.pch; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@loader_path/../Frameworks"; + OTHER_CFLAGS = ( + "-DHAVE_CONFIG_H", + "-DFLaC__INLINE=__inline__", + "-DNDEBUG", + ); + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRODUCT_NAME = FLAC; - USER_HEADER_SEARCH_PATHS = "flac-1.1.2 flac-1.1.2/include flac-1.1.2/src/libFLAC/include"; + USER_HEADER_SEARCH_PATHS = "flac-1.1.4/include flac-1.1.4/src/libFLAC/include"; WRAPPER_EXTENSION = framework; ZERO_LINK = YES; }; diff --git a/Frameworks/ID3Tag/ID3Tag.xcodeproj/project.pbxproj b/Frameworks/ID3Tag/ID3Tag.xcodeproj/project.pbxproj index 3bed001e1..e076611c4 100644 --- a/Frameworks/ID3Tag/ID3Tag.xcodeproj/project.pbxproj +++ b/Frameworks/ID3Tag/ID3Tag.xcodeproj/project.pbxproj @@ -213,9 +213,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8D07F2BC0486CC7A007CD1D0 /* ID3Tag */ = { + 8D07F2BC0486CC7A007CD1D0 /* ID3Tag Framework */ = { isa = PBXNativeTarget; - buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "ID3Tag" */; + buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "ID3Tag Framework" */; buildPhases = ( 8D07F2BD0486CC7A007CD1D0 /* Headers */, 8D07F2BF0486CC7A007CD1D0 /* Resources */, @@ -227,7 +227,7 @@ ); dependencies = ( ); - name = ID3Tag; + name = "ID3Tag Framework"; productInstallPath = "$(HOME)/Library/Frameworks"; productName = ID3Tag; productReference = 8D07F2C80486CC7A007CD1D0 /* ID3Tag.framework */; @@ -244,7 +244,7 @@ productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */; projectDirPath = ""; targets = ( - 8D07F2BC0486CC7A007CD1D0 /* ID3Tag */, + 8D07F2BC0486CC7A007CD1D0 /* ID3Tag Framework */, ); }; /* End PBXProject section */ @@ -320,12 +320,13 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ID3Tag_Prefix.pch; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@loader_path/../Frameworks"; LIBRARY_STYLE = DYNAMIC; MACH_O_TYPE = mh_dylib; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRODUCT_NAME = ID3Tag; WRAPPER_EXTENSION = framework; ZERO_LINK = YES; @@ -350,6 +351,7 @@ INSTALL_PATH = "@loader_path/../Frameworks"; LIBRARY_STYLE = DYNAMIC; MACH_O_TYPE = mh_dylib; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRODUCT_NAME = ID3Tag; WRAPPER_EXTENSION = framework; }; @@ -378,7 +380,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "ID3Tag" */ = { + 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "ID3Tag Framework" */ = { isa = XCConfigurationList; buildConfigurations = ( 4FADC24308B4156D00ABE55E /* Debug */, diff --git a/Frameworks/MAC/MAC.xcodeproj/project.pbxproj b/Frameworks/MAC/MAC.xcodeproj/project.pbxproj index d9eee2ce0..f2c7113c8 100644 --- a/Frameworks/MAC/MAC.xcodeproj/project.pbxproj +++ b/Frameworks/MAC/MAC.xcodeproj/project.pbxproj @@ -390,9 +390,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8DC2EF4F0486A6940098B216 /* MAC */ = { + 8DC2EF4F0486A6940098B216 /* MAC Framework */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "MAC" */; + buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "MAC Framework" */; buildPhases = ( 8DC2EF500486A6940098B216 /* Headers */, 8DC2EF520486A6940098B216 /* Resources */, @@ -403,7 +403,7 @@ ); dependencies = ( ); - name = MAC; + name = "MAC Framework"; productInstallPath = "$(HOME)/Library/Frameworks"; productName = MAC; productReference = 8DC2EF5B0486A6940098B216 /* MAC.framework */; @@ -420,7 +420,7 @@ productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; targets = ( - 8DC2EF4F0486A6940098B216 /* MAC */, + 8DC2EF4F0486A6940098B216 /* MAC Framework */, ); }; /* End PBXProject section */ @@ -564,7 +564,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "MAC" */ = { + 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "MAC Framework" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91AE08733DA50010E9CD /* Debug */, diff --git a/Frameworks/MAD/MAD.xcodeproj/project.pbxproj b/Frameworks/MAD/MAD.xcodeproj/project.pbxproj index 99bd9f87d..d3cda8990 100644 --- a/Frameworks/MAD/MAD.xcodeproj/project.pbxproj +++ b/Frameworks/MAD/MAD.xcodeproj/project.pbxproj @@ -171,9 +171,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8D07F2BC0486CC7A007CD1D0 /* MAD */ = { + 8D07F2BC0486CC7A007CD1D0 /* MAD Framework */ = { isa = PBXNativeTarget; - buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "MAD" */; + buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "MAD Framework" */; buildPhases = ( 8D07F2BD0486CC7A007CD1D0 /* Headers */, 8D07F2BF0486CC7A007CD1D0 /* Resources */, @@ -185,7 +185,7 @@ ); dependencies = ( ); - name = MAD; + name = "MAD Framework"; productInstallPath = "$(HOME)/Library/Frameworks"; productName = MAD; productReference = 8D07F2C80486CC7A007CD1D0 /* MAD.framework */; @@ -202,7 +202,7 @@ productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */; projectDirPath = ""; targets = ( - 8D07F2BC0486CC7A007CD1D0 /* MAD */, + 8D07F2BC0486CC7A007CD1D0 /* MAD Framework */, ); }; /* End PBXProject section */ @@ -272,12 +272,16 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = MAD_Prefix.pch; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@loader_path/../Frameworks"; LIBRARY_STYLE = DYNAMIC; MACH_O_TYPE = mh_dylib; + OTHER_CFLAGS = "-DHAVE_CONFIG_H"; + PER_ARCH_CFLAGS_i386 = "-DFPM_INTEL"; + PER_ARCH_CFLAGS_ppc = "-DFPM_PPC"; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRODUCT_NAME = MAD; WRAPPER_EXTENSION = framework; ZERO_LINK = YES; @@ -305,6 +309,7 @@ OTHER_CFLAGS = "-DHAVE_CONFIG_H"; PER_ARCH_CFLAGS_i386 = "-DFPM_INTEL"; PER_ARCH_CFLAGS_ppc = "-DFPM_PPC"; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRODUCT_NAME = MAD; WRAPPER_EXTENSION = framework; }; @@ -333,7 +338,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "MAD" */ = { + 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "MAD Framework" */ = { isa = XCConfigurationList; buildConfigurations = ( 4FADC24308B4156D00ABE55E /* Debug */, diff --git a/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj b/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj index 2c571f619..8a5251b13 100644 --- a/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj +++ b/Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj @@ -189,9 +189,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8DC2EF4F0486A6940098B216 /* MPCDec */ = { + 8DC2EF4F0486A6940098B216 /* MPCDec Framework */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "MPCDec" */; + buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "MPCDec Framework" */; buildPhases = ( 8DC2EF500486A6940098B216 /* Headers */, 8DC2EF520486A6940098B216 /* Resources */, @@ -202,7 +202,7 @@ ); dependencies = ( ); - name = MPCDec; + name = "MPCDec Framework"; productInstallPath = "$(HOME)/Library/Frameworks"; productName = MPCDec; productReference = 8DC2EF5B0486A6940098B216 /* MPCDec.framework */; @@ -219,7 +219,7 @@ productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; targets = ( - 8DC2EF4F0486A6940098B216 /* MPCDec */, + 8DC2EF4F0486A6940098B216 /* MPCDec Framework */, ); }; /* End PBXProject section */ @@ -332,7 +332,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "MPCDec" */ = { + 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "MPCDec Framework" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91AE08733DA50010E9CD /* Debug */, diff --git a/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj b/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj index 1ca64b948..c7f6e511e 100644 --- a/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj +++ b/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj @@ -147,9 +147,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8DC2EF4F0486A6940098B216 /* Shorten */ = { + 8DC2EF4F0486A6940098B216 /* Shorten Framework */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Shorten" */; + buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Shorten Framework" */; buildPhases = ( 597A374E0A2A2C5300730CFA /* Headers */, 8DC2EF520486A6940098B216 /* Resources */, @@ -160,7 +160,7 @@ ); dependencies = ( ); - name = Shorten; + name = "Shorten Framework"; productInstallPath = "$(HOME)/Library/Frameworks"; productName = Shorten; productReference = 8DC2EF5B0486A6940098B216 /* Shorten.framework */; @@ -177,7 +177,7 @@ productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; targets = ( - 8DC2EF4F0486A6940098B216 /* Shorten */, + 8DC2EF4F0486A6940098B216 /* Shorten Framework */, ); }; /* End PBXProject section */ @@ -303,7 +303,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Shorten" */ = { + 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Shorten Framework" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91AE08733DA50010E9CD /* Debug */, diff --git a/Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj b/Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj index 9d98a3707..94c82c695 100644 --- a/Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj +++ b/Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj @@ -109,23 +109,6 @@ 8E75712209F319570080F1EE /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E75712109F319570080F1EE /* config.h */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - 281899AC0BEC7212003176EE /* Development */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = NO; - }; - name = Development; - }; - 281899AD0BEC7212003176EE /* Deployment */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = YES; - }; - name = Deployment; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; @@ -565,9 +548,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8DC2EF4F0486A6940098B216 /* TagLib */ = { + 8DC2EF4F0486A6940098B216 /* TagLib Framework */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "TagLib" */; + buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "TagLib Framework" */; buildPhases = ( 8DC2EF500486A6940098B216 /* Headers */, 8DC2EF520486A6940098B216 /* Resources */, @@ -578,7 +561,7 @@ ); dependencies = ( ); - name = TagLib; + name = "TagLib Framework"; productInstallPath = "$(HOME)/Library/Frameworks"; productName = TagLib; productReference = 8DC2EF5B0486A6940098B216 /* TagLib.framework */; @@ -590,18 +573,12 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "TagLib" */; - buildSettings = { - }; - buildStyles = ( - 281899AC0BEC7212003176EE /* Development */, - 281899AD0BEC7212003176EE /* Deployment */, - ); hasScannedForEncodings = 1; mainGroup = 0867D691FE84028FC02AAC07 /* TagLib */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; targets = ( - 8DC2EF4F0486A6940098B216 /* TagLib */, + 8DC2EF4F0486A6940098B216 /* TagLib Framework */, ); }; /* End PBXProject section */ @@ -753,7 +730,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "TagLib" */ = { + 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "TagLib Framework" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91AE08733DA50010E9CD /* Debug */, diff --git a/Frameworks/Vorbis/Vorbis.xcodeproj/project.pbxproj b/Frameworks/Vorbis/Vorbis.xcodeproj/project.pbxproj index 1faa1d445..6786392d3 100644 --- a/Frameworks/Vorbis/Vorbis.xcodeproj/project.pbxproj +++ b/Frameworks/Vorbis/Vorbis.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 17C93DE70B8FDE20008627D6 /* Ogg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E75726F09F319F90080F1EE /* Ogg.framework */; }; - 17C93DEE0B8FDEE7008627D6 /* Ogg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E75726F09F319F90080F1EE /* Ogg.framework */; }; + 17F563540C3BDB130019975C /* Ogg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F563420C3BDAE80019975C /* Ogg.framework */; }; + 17F563570C3BDB150019975C /* Ogg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F563420C3BDAE80019975C /* Ogg.framework */; }; 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; 8E75727909F31A150080F1EE /* codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E75727609F31A150080F1EE /* codec.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8E75727A09F31A150080F1EE /* vorbisenc.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E75727709F31A150080F1EE /* vorbisenc.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -61,6 +61,23 @@ 8E75730309F31A200080F1EE /* window.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E7572D209F31A200080F1EE /* window.h */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 17F563410C3BDAE80019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F5633A0C3BDAE80019975C /* ogg.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = "Ogg Framework"; + }; + 17F563520C3BDB040019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F5633A0C3BDAE80019975C /* ogg.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = "Ogg Framework"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 17C93DEC0B8FDED8008627D6 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -68,7 +85,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 17C93DEE0B8FDEE7008627D6 /* Ogg.framework in CopyFiles */, + 17F563570C3BDB150019975C /* Ogg.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,9 +93,9 @@ /* Begin PBXFileReference section */ 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; + 17F5633A0C3BDAE80019975C /* ogg.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ogg.xcodeproj; path = ../Ogg/ogg.xcodeproj; sourceTree = SOURCE_ROOT; }; 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8DC2EF5B0486A6940098B216 /* Vorbis.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Vorbis.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 8E75726F09F319F90080F1EE /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = ../Ogg/build/Release/Ogg.framework; sourceTree = SOURCE_ROOT; }; 8E75727609F31A150080F1EE /* codec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = codec.h; path = Files/include/vorbis/codec.h; sourceTree = ""; }; 8E75727709F31A150080F1EE /* vorbisenc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vorbisenc.h; path = Files/include/vorbis/vorbisenc.h; sourceTree = ""; }; 8E75727809F31A150080F1EE /* vorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vorbisfile.h; path = Files/include/vorbis/vorbisfile.h; sourceTree = ""; }; @@ -138,7 +155,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 17C93DE70B8FDE20008627D6 /* Ogg.framework in Frameworks */, + 17F563540C3BDB130019975C /* Ogg.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -186,7 +203,7 @@ 1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 8E75726F09F319F90080F1EE /* Ogg.framework */, + 17F5633A0C3BDAE80019975C /* ogg.xcodeproj */, ); name = "Linked Frameworks"; sourceTree = ""; @@ -198,6 +215,14 @@ name = "Other Frameworks"; sourceTree = ""; }; + 17F5633B0C3BDAE80019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F563420C3BDAE80019975C /* Ogg.framework */, + ); + name = Products; + sourceTree = ""; + }; 8E75727409F31A000080F1EE /* Source */ = { isa = PBXGroup; children = ( @@ -299,9 +324,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8DC2EF4F0486A6940098B216 /* Vorbis */ = { + 8DC2EF4F0486A6940098B216 /* Vorbis Framework */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Vorbis" */; + buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Vorbis Framework" */; buildPhases = ( 8DC2EF500486A6940098B216 /* Headers */, 8DC2EF520486A6940098B216 /* Resources */, @@ -313,8 +338,9 @@ buildRules = ( ); dependencies = ( + 17F563530C3BDB040019975C /* PBXTargetDependency */, ); - name = Vorbis; + name = "Vorbis Framework"; productInstallPath = "$(HOME)/Library/Frameworks"; productName = Vorbis; productReference = 8DC2EF5B0486A6940098B216 /* Vorbis.framework */; @@ -330,12 +356,28 @@ mainGroup = 0867D691FE84028FC02AAC07 /* Vorbis */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 17F5633B0C3BDAE80019975C /* Products */; + ProjectRef = 17F5633A0C3BDAE80019975C /* ogg.xcodeproj */; + }, + ); targets = ( - 8DC2EF4F0486A6940098B216 /* Vorbis */, + 8DC2EF4F0486A6940098B216 /* Vorbis Framework */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 17F563420C3BDAE80019975C /* Ogg.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Ogg.framework; + remoteRef = 17F563410C3BDAE80019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8DC2EF520486A6940098B216 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -400,6 +442,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 17F563530C3BDB040019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Ogg Framework"; + targetProxy = 17F563520C3BDB040019975C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ 089C1666FE841158C02AAC07 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -500,7 +550,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Vorbis" */ = { + 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Vorbis Framework" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91AE08733DA50010E9CD /* Debug */, diff --git a/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj b/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj index e5fb702f5..5d485c15f 100644 --- a/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj +++ b/Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj @@ -166,9 +166,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8DC2EF4F0486A6940098B216 /* WavPack */ = { + 8DC2EF4F0486A6940098B216 /* WavPack Framework */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WavPack" */; + buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WavPack Framework" */; buildPhases = ( 8DC2EF500486A6940098B216 /* Headers */, 8DC2EF520486A6940098B216 /* Resources */, @@ -179,7 +179,7 @@ ); dependencies = ( ); - name = WavPack; + name = "WavPack Framework"; productInstallPath = "$(HOME)/Library/Frameworks"; productName = WavPack; productReference = 8DC2EF5B0486A6940098B216 /* WavPack.framework */; @@ -196,7 +196,7 @@ productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; targets = ( - 8DC2EF4F0486A6940098B216 /* WavPack */, + 8DC2EF4F0486A6940098B216 /* WavPack Framework */, ); }; /* End PBXProject section */ @@ -341,7 +341,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WavPack" */ = { + 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "WavPack Framework" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91AE08733DA50010E9CD /* Debug */, diff --git a/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj b/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj index f9c1c15b7..5ac0385d3 100644 --- a/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj +++ b/Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj @@ -130,9 +130,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* CoreAudio */ = { + 8D5B49AC048680CD000E48DA /* CoreAudio Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "CoreAudio" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "CoreAudio Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -142,7 +142,7 @@ ); dependencies = ( ); - name = CoreAudio; + name = "CoreAudio Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = CoreAudio; productReference = 8D5B49B6048680CD000E48DA /* CoreAudio.bundle */; @@ -158,7 +158,7 @@ mainGroup = 089C166AFE841209C02AAC07 /* CoreAudio */; projectDirPath = ""; targets = ( - 8D5B49AC048680CD000E48DA /* CoreAudio */, + 8D5B49AC048680CD000E48DA /* CoreAudio Plugin */, ); }; /* End PBXProject section */ @@ -246,7 +246,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "CoreAudio" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "CoreAudio Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj b/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj index 2ed4b1545..7b5b1e473 100644 --- a/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj +++ b/Plugins/FileSource/FileSource.xcodeproj/project.pbxproj @@ -117,9 +117,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* FileSource */ = { + 8D5B49AC048680CD000E48DA /* FileSource Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "FileSource" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "FileSource Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -129,7 +129,7 @@ ); dependencies = ( ); - name = FileSource; + name = "FileSource Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = FileSource; productReference = 8D5B49B6048680CD000E48DA /* FileSource.bundle */; @@ -145,7 +145,7 @@ mainGroup = 089C166AFE841209C02AAC07 /* FileSource */; projectDirPath = ""; targets = ( - 8D5B49AC048680CD000E48DA /* FileSource */, + 8D5B49AC048680CD000E48DA /* FileSource Plugin */, ); }; /* End PBXProject section */ @@ -232,7 +232,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "FileSource" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "FileSource Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Plugins/Flac/Flac.xcodeproj/project.pbxproj b/Plugins/Flac/Flac.xcodeproj/project.pbxproj index 3e579ae58..6c28f8c8d 100644 --- a/Plugins/Flac/Flac.xcodeproj/project.pbxproj +++ b/Plugins/Flac/Flac.xcodeproj/project.pbxproj @@ -9,14 +9,31 @@ /* Begin PBXBuildFile section */ 1745C2C50B90BAC700A6768C /* FlacPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C2C30B90BAC700A6768C /* FlacPropertiesReader.m */; }; 177FCFC20B90C9960011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCFC10B90C9960011C3B5 /* Plugin.h */; }; - 179CFDB20B90C73400C8C4DB /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 179CFDB10B90C73400C8C4DB /* FLAC.framework */; }; - 179CFDB50B90C73900C8C4DB /* FLAC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 179CFDB10B90C73400C8C4DB /* FLAC.framework */; }; 17ADB1B40B9793A600257CA2 /* FlacPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB1B20B9793A600257CA2 /* FlacPlugin.h */; }; 17ADB1B50B9793A600257CA2 /* FlacPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB1B30B9793A600257CA2 /* FlacPlugin.m */; }; 17C93F080B8FF67A008627D6 /* FlacDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93F040B8FF67A008627D6 /* FlacDecoder.m */; }; + 17F5643C0C3BDC820019975C /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F564220C3BDC460019975C /* FLAC.framework */; }; + 17F5643F0C3BDC840019975C /* FLAC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F564220C3BDC460019975C /* FLAC.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 17F564210C3BDC460019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F5641A0C3BDC460019975C /* flac.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = "FLAC Framework"; + }; + 17F564250C3BDC5F0019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F5641A0C3BDC460019975C /* flac.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = "FLAC Framework"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 17C93F300B8FF7CC008627D6 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -24,7 +41,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 179CFDB50B90C73900C8C4DB /* FLAC.framework in CopyFiles */, + 17F5643F0C3BDC840019975C /* FLAC.framework in CopyFiles */, 177FCFC20B90C9960011C3B5 /* Plugin.h in CopyFiles */, 17ADB1B40B9793A600257CA2 /* FlacPlugin.h in CopyFiles */, ); @@ -39,11 +56,11 @@ 1745C2C20B90BAC700A6768C /* FlacPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FlacPropertiesReader.h; sourceTree = ""; }; 1745C2C30B90BAC700A6768C /* FlacPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FlacPropertiesReader.m; sourceTree = ""; }; 177FCFC10B90C9960011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 179CFDB10B90C73400C8C4DB /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = ../../Frameworks/FLAC/build/Release/FLAC.framework; sourceTree = SOURCE_ROOT; }; 17ADB1B20B9793A600257CA2 /* FlacPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FlacPlugin.h; sourceTree = ""; }; 17ADB1B30B9793A600257CA2 /* FlacPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FlacPlugin.m; sourceTree = ""; }; 17C93F030B8FF67A008627D6 /* FlacDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FlacDecoder.h; sourceTree = ""; }; 17C93F040B8FF67A008627D6 /* FlacDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FlacDecoder.m; sourceTree = ""; }; + 17F5641A0C3BDC460019975C /* flac.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = flac.xcodeproj; path = ../../Frameworks/FLAC/flac.xcodeproj; sourceTree = SOURCE_ROOT; }; 32DBCF630370AF2F00C91783 /* Flac_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Flac_Prefix.pch; sourceTree = ""; }; 8D5B49B6048680CD000E48DA /* Flac.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Flac.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; @@ -55,8 +72,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 17F5643C0C3BDC820019975C /* FLAC.framework in Frameworks */, 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */, - 179CFDB20B90C73400C8C4DB /* FLAC.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -109,7 +126,7 @@ 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 179CFDB10B90C73400C8C4DB /* FLAC.framework */, + 17F5641A0C3BDC460019975C /* flac.xcodeproj */, 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -125,6 +142,14 @@ name = "Other Frameworks"; sourceTree = ""; }; + 17F5641B0C3BDC460019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F564220C3BDC460019975C /* FLAC.framework */, + ); + name = Products; + sourceTree = ""; + }; 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -144,9 +169,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* Flac */ = { + 8D5B49AC048680CD000E48DA /* Flac Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Flac" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Flac Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -156,8 +181,9 @@ buildRules = ( ); dependencies = ( + 17F564260C3BDC5F0019975C /* PBXTargetDependency */, ); - name = Flac; + name = "Flac Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = Flac; productReference = 8D5B49B6048680CD000E48DA /* Flac.bundle */; @@ -172,12 +198,28 @@ hasScannedForEncodings = 1; mainGroup = 089C166AFE841209C02AAC07 /* Flac */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 17F5641B0C3BDC460019975C /* Products */; + ProjectRef = 17F5641A0C3BDC460019975C /* flac.xcodeproj */; + }, + ); targets = ( - 8D5B49AC048680CD000E48DA /* Flac */, + 8D5B49AC048680CD000E48DA /* Flac Plugin */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 17F564220C3BDC460019975C /* FLAC.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = FLAC.framework; + remoteRef = 17F564210C3BDC460019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8D5B49AF048680CD000E48DA /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -201,6 +243,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 17F564260C3BDC5F0019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "FLAC Framework"; + targetProxy = 17F564250C3BDC5F0019975C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1DEB913B08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -274,7 +324,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Flac" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Flac Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj b/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj index a9cf2d478..21309d547 100644 --- a/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj +++ b/Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj @@ -130,9 +130,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* HTTPSource */ = { + 8D5B49AC048680CD000E48DA /* HTTPSource Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "HTTPSource" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "HTTPSource Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -142,7 +142,7 @@ ); dependencies = ( ); - name = HTTPSource; + name = "HTTPSource Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = HTTPSource; productReference = 8D5B49B6048680CD000E48DA /* HTTPSource.bundle */; @@ -158,7 +158,7 @@ mainGroup = 089C166AFE841209C02AAC07 /* HTTPSource */; projectDirPath = ""; targets = ( - 8D5B49AC048680CD000E48DA /* HTTPSource */, + 8D5B49AC048680CD000E48DA /* HTTPSource Plugin */, ); }; /* End PBXProject section */ @@ -246,7 +246,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "HTTPSource" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "HTTPSource Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Plugins/MAD/MAD.xcodeproj/project.pbxproj b/Plugins/MAD/MAD.xcodeproj/project.pbxproj index 07f3455c2..a8b466d2f 100644 --- a/Plugins/MAD/MAD.xcodeproj/project.pbxproj +++ b/Plugins/MAD/MAD.xcodeproj/project.pbxproj @@ -8,17 +8,48 @@ /* Begin PBXBuildFile section */ 170335470B8FC4EE00327265 /* MADDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 170335430B8FC4EE00327265 /* MADDecoder.m */; }; - 177FCEF40B90C8910011C3B5 /* MAD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 177FCEF30B90C8910011C3B5 /* MAD.framework */; }; - 177FCEF80B90C8990011C3B5 /* ID3Tag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 177FCEF70B90C8990011C3B5 /* ID3Tag.framework */; }; - 177FCF000B90C8A20011C3B5 /* ID3Tag.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCEF70B90C8990011C3B5 /* ID3Tag.framework */; }; - 177FCF010B90C8A20011C3B5 /* MAD.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCEF30B90C8910011C3B5 /* MAD.framework */; }; 177FCFBC0B90C98A0011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCFBB0B90C98A0011C3B5 /* Plugin.h */; }; 17ADB1D20B9793C500257CA2 /* MADPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB1D00B9793C500257CA2 /* MADPlugin.h */; }; 17ADB1D30B9793C500257CA2 /* MADPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB1D10B9793C500257CA2 /* MADPlugin.m */; }; 17B618AF0B90997E00BC003F /* MADPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 17B618AD0B90997E00BC003F /* MADPropertiesReader.m */; }; + 17F5648A0C3BDCEB0019975C /* ID3Tag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F564690C3BDCB70019975C /* ID3Tag.framework */; }; + 17F5648B0C3BDCEB0019975C /* MAD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F564600C3BDCAC0019975C /* MAD.framework */; }; + 17F5648E0C3BDCEE0019975C /* ID3Tag.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F564690C3BDCB70019975C /* ID3Tag.framework */; }; + 17F5648F0C3BDCEE0019975C /* MAD.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F564600C3BDCAC0019975C /* MAD.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 17F5645F0C3BDCAC0019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F564580C3BDCAC0019975C /* MAD.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D07F2C80486CC7A007CD1D0; + remoteInfo = MAD; + }; + 17F564680C3BDCB70019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F564610C3BDCB70019975C /* ID3Tag.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D07F2C80486CC7A007CD1D0; + remoteInfo = ID3Tag; + }; + 17F564900C3BDCF50019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F564580C3BDCAC0019975C /* MAD.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0; + remoteInfo = MAD; + }; + 17F564920C3BDCF50019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F564610C3BDCB70019975C /* ID3Tag.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D07F2BC0486CC7A007CD1D0; + remoteInfo = ID3Tag; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 170335510B8FC52B00327265 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -26,8 +57,8 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 177FCF000B90C8A20011C3B5 /* ID3Tag.framework in CopyFiles */, - 177FCF010B90C8A20011C3B5 /* MAD.framework in CopyFiles */, + 17F5648E0C3BDCEE0019975C /* ID3Tag.framework in CopyFiles */, + 17F5648F0C3BDCEE0019975C /* MAD.framework in CopyFiles */, 177FCFBC0B90C98A0011C3B5 /* Plugin.h in CopyFiles */, 17ADB1D20B9793C500257CA2 /* MADPlugin.h in CopyFiles */, ); @@ -41,13 +72,13 @@ 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 170335420B8FC4EE00327265 /* MADDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MADDecoder.h; sourceTree = ""; }; 170335430B8FC4EE00327265 /* MADDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MADDecoder.m; sourceTree = ""; }; - 177FCEF30B90C8910011C3B5 /* MAD.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MAD.framework; path = ../../Frameworks/MAD/build/Release/MAD.framework; sourceTree = SOURCE_ROOT; }; - 177FCEF70B90C8990011C3B5 /* ID3Tag.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ID3Tag.framework; path = ../../Frameworks/ID3Tag/build/Release/ID3Tag.framework; sourceTree = SOURCE_ROOT; }; 177FCFBB0B90C98A0011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; 17ADB1D00B9793C500257CA2 /* MADPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MADPlugin.h; sourceTree = ""; }; 17ADB1D10B9793C500257CA2 /* MADPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MADPlugin.m; sourceTree = ""; }; 17B618AC0B90997E00BC003F /* MADPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MADPropertiesReader.h; sourceTree = ""; }; 17B618AD0B90997E00BC003F /* MADPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MADPropertiesReader.m; sourceTree = ""; }; + 17F564580C3BDCAC0019975C /* MAD.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MAD.xcodeproj; path = ../../Frameworks/MAD/MAD.xcodeproj; sourceTree = SOURCE_ROOT; }; + 17F564610C3BDCB70019975C /* ID3Tag.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ID3Tag.xcodeproj; path = ../../Frameworks/ID3Tag/ID3Tag.xcodeproj; sourceTree = SOURCE_ROOT; }; 32DBCF630370AF2F00C91783 /* MAD_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAD_Prefix.pch; sourceTree = ""; }; 8D5B49B6048680CD000E48DA /* MAD.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MAD.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; @@ -59,9 +90,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 17F5648A0C3BDCEB0019975C /* ID3Tag.framework in Frameworks */, + 17F5648B0C3BDCEB0019975C /* MAD.framework in Frameworks */, 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */, - 177FCEF40B90C8910011C3B5 /* MAD.framework in Frameworks */, - 177FCEF80B90C8990011C3B5 /* ID3Tag.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -114,8 +145,8 @@ 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 177FCEF70B90C8990011C3B5 /* ID3Tag.framework */, - 177FCEF30B90C8910011C3B5 /* MAD.framework */, + 17F564610C3BDCB70019975C /* ID3Tag.xcodeproj */, + 17F564580C3BDCAC0019975C /* MAD.xcodeproj */, 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -131,6 +162,22 @@ name = "Other Frameworks"; sourceTree = ""; }; + 17F564590C3BDCAC0019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F564600C3BDCAC0019975C /* MAD.framework */, + ); + name = Products; + sourceTree = ""; + }; + 17F564620C3BDCB70019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F564690C3BDCB70019975C /* ID3Tag.framework */, + ); + name = Products; + sourceTree = ""; + }; 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -150,9 +197,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* MAD */ = { + 8D5B49AC048680CD000E48DA /* MAD Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "MAD" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "MAD Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -162,8 +209,10 @@ buildRules = ( ); dependencies = ( + 17F564910C3BDCF50019975C /* PBXTargetDependency */, + 17F564930C3BDCF50019975C /* PBXTargetDependency */, ); - name = MAD; + name = "MAD Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = MAD; productReference = 8D5B49B6048680CD000E48DA /* MAD.bundle */; @@ -178,12 +227,39 @@ hasScannedForEncodings = 1; mainGroup = 089C166AFE841209C02AAC07 /* MAD */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 17F564620C3BDCB70019975C /* Products */; + ProjectRef = 17F564610C3BDCB70019975C /* ID3Tag.xcodeproj */; + }, + { + ProductGroup = 17F564590C3BDCAC0019975C /* Products */; + ProjectRef = 17F564580C3BDCAC0019975C /* MAD.xcodeproj */; + }, + ); targets = ( - 8D5B49AC048680CD000E48DA /* MAD */, + 8D5B49AC048680CD000E48DA /* MAD Plugin */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 17F564600C3BDCAC0019975C /* MAD.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = MAD.framework; + remoteRef = 17F5645F0C3BDCAC0019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 17F564690C3BDCB70019975C /* ID3Tag.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = ID3Tag.framework; + remoteRef = 17F564680C3BDCB70019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8D5B49AF048680CD000E48DA /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -207,6 +283,19 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 17F564910C3BDCF50019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = MAD; + targetProxy = 17F564900C3BDCF50019975C /* PBXContainerItemProxy */; + }; + 17F564930C3BDCF50019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = ID3Tag; + targetProxy = 17F564920C3BDCF50019975C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1DEB913B08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -297,7 +386,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "MAD" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "MAD Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj b/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj index 48bbc6d3b..3b3b829f4 100644 --- a/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj +++ b/Plugins/MonkeysAudio/MonkeysAudio.xcodeproj/project.pbxproj @@ -10,15 +10,32 @@ 1745C2ED0B90BDD100A6768C /* MonkeysAudioDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1745C2E80B90BDD100A6768C /* MonkeysAudioDecoder.mm */; }; 1745C2EE0B90BDD100A6768C /* MonkeysAudioPropertiesReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1745C2EA0B90BDD100A6768C /* MonkeysAudioPropertiesReader.mm */; }; 177FCFB50B90C97E0011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCFB40B90C97E0011C3B5 /* Plugin.h */; }; - 179CFD770B90C70B00C8C4DB /* MAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 179CFD760B90C70B00C8C4DB /* MAC.framework */; }; - 179CFD7A0B90C70E00C8C4DB /* MAC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 179CFD760B90C70B00C8C4DB /* MAC.framework */; }; 17ADB1E80B9793E300257CA2 /* MonkeysAudioPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB1E60B9793E300257CA2 /* MonkeysAudioPlugin.h */; }; 17ADB1E90B9793E300257CA2 /* MonkeysAudioPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB1E70B9793E300257CA2 /* MonkeysAudioPlugin.mm */; }; + 17F564CC0C3BDDDB0019975C /* MAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F562970C3BD9E10019975C /* MAC.framework */; }; + 17F564CF0C3BDDDD0019975C /* MAC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F562970C3BD9E10019975C /* MAC.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; 8EB1E6F90B9B39AA008F9F45 /* SourceIO.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EB1E6F80B9B39AA008F9F45 /* SourceIO.h */; }; 8EB1E6FD0B9B39D4008F9F45 /* SourceIO.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8EB1E6FC0B9B39D4008F9F45 /* SourceIO.mm */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 17F562960C3BD9E10019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F5628F0C3BD9E10019975C /* MAC.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = MAC; + }; + 17F5629A0C3BDA010019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F5628F0C3BD9E10019975C /* MAC.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = MAC; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 1745C30E0B90BE7500A6768C /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -26,7 +43,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 179CFD7A0B90C70E00C8C4DB /* MAC.framework in CopyFiles */, + 17F564CF0C3BDDDD0019975C /* MAC.framework in CopyFiles */, 177FCFB50B90C97E0011C3B5 /* Plugin.h in CopyFiles */, 17ADB1E80B9793E300257CA2 /* MonkeysAudioPlugin.h in CopyFiles */, 8EB1E6F90B9B39AA008F9F45 /* SourceIO.h in CopyFiles */, @@ -44,9 +61,9 @@ 1745C2E90B90BDD100A6768C /* MonkeysAudioPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MonkeysAudioPropertiesReader.h; sourceTree = ""; }; 1745C2EA0B90BDD100A6768C /* MonkeysAudioPropertiesReader.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = MonkeysAudioPropertiesReader.mm; sourceTree = ""; }; 177FCFB40B90C97E0011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 179CFD760B90C70B00C8C4DB /* MAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MAC.framework; path = ../../Frameworks/MAC/build/Release/MAC.framework; sourceTree = SOURCE_ROOT; }; 17ADB1E60B9793E300257CA2 /* MonkeysAudioPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MonkeysAudioPlugin.h; sourceTree = ""; }; 17ADB1E70B9793E300257CA2 /* MonkeysAudioPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = MonkeysAudioPlugin.mm; sourceTree = ""; }; + 17F5628F0C3BD9E10019975C /* MAC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MAC.xcodeproj; path = ../../Frameworks/MAC/MAC.xcodeproj; sourceTree = SOURCE_ROOT; }; 32DBCF630370AF2F00C91783 /* MonkeysAudio_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MonkeysAudio_Prefix.pch; sourceTree = ""; }; 8D5B49B6048680CD000E48DA /* MonkeysAudio.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MonkeysAudio.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; @@ -60,8 +77,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 17F564CC0C3BDDDB0019975C /* MAC.framework in Frameworks */, 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */, - 179CFD770B90C70B00C8C4DB /* MAC.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -116,7 +133,7 @@ 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 179CFD760B90C70B00C8C4DB /* MAC.framework */, + 17F5628F0C3BD9E10019975C /* MAC.xcodeproj */, 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -132,6 +149,14 @@ name = "Other Frameworks"; sourceTree = ""; }; + 17F562900C3BD9E10019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F562970C3BD9E10019975C /* MAC.framework */, + ); + name = Products; + sourceTree = ""; + }; 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -151,9 +176,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* MonkeysAudio */ = { + 8D5B49AC048680CD000E48DA /* MonkeysAudio Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "MonkeysAudio" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "MonkeysAudio Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -163,8 +188,9 @@ buildRules = ( ); dependencies = ( + 17F5629B0C3BDA010019975C /* PBXTargetDependency */, ); - name = MonkeysAudio; + name = "MonkeysAudio Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = MonkeysAudio; productReference = 8D5B49B6048680CD000E48DA /* MonkeysAudio.bundle */; @@ -179,12 +205,28 @@ hasScannedForEncodings = 1; mainGroup = 089C166AFE841209C02AAC07 /* MonkeysAudio */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 17F562900C3BD9E10019975C /* Products */; + ProjectRef = 17F5628F0C3BD9E10019975C /* MAC.xcodeproj */; + }, + ); targets = ( - 8D5B49AC048680CD000E48DA /* MonkeysAudio */, + 8D5B49AC048680CD000E48DA /* MonkeysAudio Plugin */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 17F562970C3BD9E10019975C /* MAC.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = MAC.framework; + remoteRef = 17F562960C3BD9E10019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8D5B49AF048680CD000E48DA /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -209,6 +251,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 17F5629B0C3BDA010019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = MAC; + targetProxy = 17F5629A0C3BDA010019975C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1DEB913B08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -283,7 +333,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "MonkeysAudio" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "MonkeysAudio Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj b/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj index e4a8b4cfc..1dd6d969e 100644 --- a/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj +++ b/Plugins/Musepack/Musepack.xcodeproj/project.pbxproj @@ -9,14 +9,31 @@ /* Begin PBXBuildFile section */ 1703330D0B8FB64500327265 /* MusepackDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 1703330A0B8FB64500327265 /* MusepackDecoder.m */; }; 1745C1A40B90B57400A6768C /* MusepackPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C1A20B90B57400A6768C /* MusepackPropertiesReader.m */; }; - 177FCF280B90C8D00011C3B5 /* MPCDec.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 177FCF270B90C8D00011C3B5 /* MPCDec.framework */; }; - 177FCF2B0B90C8D20011C3B5 /* MPCDec.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCF270B90C8D00011C3B5 /* MPCDec.framework */; }; 17ADB2020B9793FF00257CA2 /* MusepackPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB2000B9793FF00257CA2 /* MusepackPlugin.h */; }; 17ADB2030B9793FF00257CA2 /* MusepackPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB2010B9793FF00257CA2 /* MusepackPlugin.m */; }; + 17F564B40C3BDD970019975C /* MPCDec.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F5625F0C3BD97C0019975C /* MPCDec.framework */; }; + 17F564B70C3BDD990019975C /* MPCDec.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F5625F0C3BD97C0019975C /* MPCDec.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; 8E2B8B4B0B9B48D000F2D9E8 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E2B8B4A0B9B48D000F2D9E8 /* Plugin.h */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 17F5625E0C3BD97C0019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F562570C3BD97B0019975C /* MPCDec.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = MPCDec; + }; + 17F562630C3BD9AA0019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F562570C3BD97B0019975C /* MPCDec.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = MPCDec; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 170333140B8FB66C00327265 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -24,7 +41,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 177FCF2B0B90C8D20011C3B5 /* MPCDec.framework in CopyFiles */, + 17F564B70C3BDD990019975C /* MPCDec.framework in CopyFiles */, 17ADB2020B9793FF00257CA2 /* MusepackPlugin.h in CopyFiles */, 8E2B8B4B0B9B48D000F2D9E8 /* Plugin.h in CopyFiles */, ); @@ -40,9 +57,9 @@ 1703330A0B8FB64500327265 /* MusepackDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MusepackDecoder.m; sourceTree = ""; }; 1745C1A10B90B57400A6768C /* MusepackPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MusepackPropertiesReader.h; sourceTree = ""; }; 1745C1A20B90B57400A6768C /* MusepackPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MusepackPropertiesReader.m; sourceTree = ""; }; - 177FCF270B90C8D00011C3B5 /* MPCDec.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MPCDec.framework; path = ../../Frameworks/MPCDec/build/Release/MPCDec.framework; sourceTree = SOURCE_ROOT; }; 17ADB2000B9793FF00257CA2 /* MusepackPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MusepackPlugin.h; sourceTree = ""; }; 17ADB2010B9793FF00257CA2 /* MusepackPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MusepackPlugin.m; sourceTree = ""; }; + 17F562570C3BD97B0019975C /* MPCDec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MPCDec.xcodeproj; path = ../../Frameworks/MPCDec/MPCDec.xcodeproj; sourceTree = SOURCE_ROOT; }; 32DBCF630370AF2F00C91783 /* Musepack_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Musepack_Prefix.pch; sourceTree = ""; }; 8D5B49B6048680CD000E48DA /* Musepack.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Musepack.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; @@ -55,8 +72,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 17F564B40C3BDD970019975C /* MPCDec.framework in Frameworks */, 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */, - 177FCF280B90C8D00011C3B5 /* MPCDec.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -109,7 +126,7 @@ 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 177FCF270B90C8D00011C3B5 /* MPCDec.framework */, + 17F562570C3BD97B0019975C /* MPCDec.xcodeproj */, 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -125,6 +142,14 @@ name = "Other Frameworks"; sourceTree = ""; }; + 17F562580C3BD97B0019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F5625F0C3BD97C0019975C /* MPCDec.framework */, + ); + name = Products; + sourceTree = ""; + }; 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -144,9 +169,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* Musepack */ = { + 8D5B49AC048680CD000E48DA /* Musepack Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Musepack" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Musepack Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -156,8 +181,9 @@ buildRules = ( ); dependencies = ( + 17F562640C3BD9AA0019975C /* PBXTargetDependency */, ); - name = Musepack; + name = "Musepack Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = Musepack; productReference = 8D5B49B6048680CD000E48DA /* Musepack.bundle */; @@ -172,12 +198,28 @@ hasScannedForEncodings = 1; mainGroup = 089C166AFE841209C02AAC07 /* Musepack */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 17F562580C3BD97B0019975C /* Products */; + ProjectRef = 17F562570C3BD97B0019975C /* MPCDec.xcodeproj */; + }, + ); targets = ( - 8D5B49AC048680CD000E48DA /* Musepack */, + 8D5B49AC048680CD000E48DA /* Musepack Plugin */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 17F5625F0C3BD97C0019975C /* MPCDec.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = MPCDec.framework; + remoteRef = 17F5625E0C3BD97C0019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8D5B49AF048680CD000E48DA /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -201,6 +243,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 17F562640C3BD9AA0019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = MPCDec; + targetProxy = 17F562630C3BD9AA0019975C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1DEB913B08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -277,7 +327,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Musepack" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Musepack Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Plugins/Quicktime/QuicktimeDecoder.h b/Plugins/Quicktime/QuicktimeDecoder.h index 209022ea1..670e8e709 100644 --- a/Plugins/Quicktime/QuicktimeDecoder.h +++ b/Plugins/Quicktime/QuicktimeDecoder.h @@ -19,6 +19,7 @@ Movie _movie; unsigned long _totalFrames; + int _bitrate; } @end diff --git a/Plugins/Quicktime/QuicktimeDecoder.m b/Plugins/Quicktime/QuicktimeDecoder.m index 678d75b6b..aea9a0207 100644 --- a/Plugins/Quicktime/QuicktimeDecoder.m +++ b/Plugins/Quicktime/QuicktimeDecoder.m @@ -19,12 +19,10 @@ OSErr error; Handle dataRef; OSType dataRefType; - AudioChannelLayout* layout = nil; - UInt32 size = 0; - + NSLog(@"EnterMovies..."); EnterMovies(); - + NSLog(@"Creating new data reference..."); error = QTNewDataReferenceFromCFURL((CFURLRef)url, 0, &dataRef, &dataRefType); NSLog(@" %d",error); @@ -33,87 +31,65 @@ short fileID = movieInDataForkResID; short flags = 0; error = NewMovieFromDataRef(&_movie, flags, &fileID, dataRef, dataRefType); - NSLog(@" %d",error); - + if (error != noErr) { + NSLog(@" %d",error); + return NO; + } + + NSLog(@"Setting movie active..."); SetMovieActive(_movie, TRUE); - + NSLog(@"Beginning extraction session..."); error = MovieAudioExtractionBegin(_movie, 0, &_extractionSessionRef); - NSLog(@" %d",error); - - NSLog(@"Getting property info..."); - error = MovieAudioExtractionGetPropertyInfo(_extractionSessionRef, - kQTPropertyClass_MovieAudioExtraction_Audio, - kQTMovieAudioExtractionAudioPropertyID_AudioChannelLayout, - NULL, &size, NULL); - NSLog(@" %d",error); - - if (error == noErr) { - // Allocate memory for the channel layout - layout = (AudioChannelLayout *) calloc(1, size); - if (layout == nil) { - error = memFullErr; - NSLog(@"Oops, out of memory"); - } - // Get the layout for the current extraction configuration. - // This will have already been expanded into channel descriptions. - NSLog(@"Getting property..."); - error = MovieAudioExtractionGetProperty(_extractionSessionRef, - kQTPropertyClass_MovieAudioExtraction_Audio, - kQTMovieAudioExtractionAudioPropertyID_AudioChannelLayout, - size, layout, nil); + if (error != noErr) { NSLog(@" %d",error); + return NO; } NSLog(@"Getting audio stream basic description (absd)..."); error = MovieAudioExtractionGetProperty(_extractionSessionRef, - kQTPropertyClass_MovieAudioExtraction_Audio, - kQTMovieAudioExtractionAudioPropertyID_AudioStreamBasicDescription, - sizeof (_asbd), &_asbd, nil); - NSLog(@" %d",error); - - NSLog(@" format flags = %d",_asbd.mFormatFlags); - NSLog(@" sample rate = %f",_asbd.mSampleRate); - NSLog(@" b/packet = %d",_asbd.mBytesPerPacket); - NSLog(@" f/packet = %d",_asbd.mFramesPerPacket); - NSLog(@" b/frame = %d",_asbd.mBytesPerFrame); - NSLog(@" channels/frame = %d",_asbd.mChannelsPerFrame); - NSLog(@" b/channel = %d",_asbd.mBitsPerChannel); - - if (_asbd.mChannelsPerFrame != 2) { - NSLog(@"Cannot import non-stereo audio!"); + kQTPropertyClass_MovieAudioExtraction_Audio, + kQTMovieAudioExtractionAudioPropertyID_AudioStreamBasicDescription, + sizeof (_asbd), &_asbd, nil); + if (error != noErr) { + NSLog(@" %d",error); + return NO; } + NSLog(@"bits per sample: %i", _asbd.mBitsPerChannel); _asbd.mFormatID = kAudioFormatLinearPCM; _asbd.mFormatFlags = kAudioFormatFlagIsSignedInteger | kLinearPCMFormatFlagIsBigEndian; -// _asbd.mChannelsPerFrame = 2; - _asbd.mBitsPerChannel = 8*sizeof(int); + // _asbd.mBitsPerChannel = 8*sizeof(int); _asbd.mBytesPerFrame = (_asbd.mBitsPerChannel/8) * _asbd.mChannelsPerFrame; _asbd.mBytesPerPacket = _asbd.mBytesPerFrame; _asbd.mFramesPerPacket = 1; NSLog(@"Setting new _asbd..."); error = MovieAudioExtractionSetProperty(_extractionSessionRef, - kQTPropertyClass_MovieAudioExtraction_Audio, - kQTMovieAudioExtractionAudioPropertyID_AudioStreamBasicDescription, - sizeof (_asbd), &_asbd); - NSLog(@" %d",error); + kQTPropertyClass_MovieAudioExtraction_Audio, + kQTMovieAudioExtractionAudioPropertyID_AudioStreamBasicDescription, + sizeof (_asbd), &_asbd); + if (error != noErr) { + NSLog(@" %d",error); + return NO; + } + /* THIS IS BROKEN + error = MovieAudioExtractionGetProperty(_extractionSessionRef, + kQTPropertyClass_SoundDescription, + kQTSoundDescriptionPropertyID_BitRate, + sizeof(_bitrate),&_bitrate,nil); + if (error != noErr) { + NSLog(@" %d",error); + _bitrate = 0; + } + */ - - NSLog(@" format flags = %d",_asbd.mFormatFlags); - NSLog(@" sample rate = %f",_asbd.mSampleRate); - NSLog(@" b/packet = %d",_asbd.mBytesPerPacket); - NSLog(@" f/packet = %d",_asbd.mFramesPerPacket); - NSLog(@" b/frame = %d",_asbd.mBytesPerFrame); - NSLog(@" channels/frame = %d",_asbd.mChannelsPerFrame); - NSLog(@" b/channel = %d",_asbd.mBitsPerChannel); - _totalFrames = _asbd.mSampleRate * ((float) GetMovieDuration(_movie) / (float) GetMovieTimeScale(_movie)); - + [self willChangeValueForKey:@"properties"]; [self didChangeValueForKey:@"properties"]; - + return YES; } @@ -129,7 +105,7 @@ buffer.mBuffers[0].mDataByteSize = size; buffer.mBuffers[0].mData = buf; - + error = MovieAudioExtractionFillBuffer(_extractionSessionRef, &numFrames, &buffer, &extractionFlags); if (error) { NSLog(@" %d",error); @@ -142,11 +118,11 @@ - (void)close { OSErr error; - + NSLog(@"Ending extraction session..."); error = MovieAudioExtractionEnd(_extractionSessionRef); NSLog(@" %d",error); - + NSLog(@"ExitMovies..."); ExitMovies(); } @@ -174,17 +150,17 @@ + (NSArray *)fileTypes { NSMutableArray *extensions = [NSMutableArray array]; - + Component component = NULL; ComponentDescription looking; NSCharacterSet *spaceSet = [NSCharacterSet characterSetWithCharactersInString:@" '"]; - + looking.componentType = MovieImportType; looking.componentSubType = 0; // Any subtype is OK looking.componentManufacturer = 0; // Any manufacturer is OK looking.componentFlags = movieImportSubTypeIsFileExtension; looking.componentFlagsMask = movieImportSubTypeIsFileExtension; - + while (component = FindNextComponent(component, &looking)) { ComponentDescription description; @@ -200,11 +176,11 @@ // here's a quickie... char ext[5] = {0}; NSString *extension; - + bcopy(&description.componentSubType, ext, 4); - + extension = [[NSString stringWithCString:ext] stringByTrimmingCharactersInSet:spaceSet]; - + // do something with extension here ... [extensions addObject:extension]; } @@ -218,7 +194,7 @@ return [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInt:_asbd.mChannelsPerFrame],@"channels", [NSNumber numberWithInt:_asbd.mBitsPerChannel],@"bitsPerSample", - [NSNumber numberWithInt:0],@"bitrate", + [NSNumber numberWithInt:0/*_bitrate*/],@"bitrate", [NSNumber numberWithFloat:_asbd.mSampleRate],@"sampleRate", [NSNumber numberWithDouble:_totalFrames/(_asbd.mSampleRate/1000.0)],@"length", [NSNumber numberWithBool:YES], @"seekable", diff --git a/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj b/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj index e1959b5da..ad0d0ff2c 100644 --- a/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj +++ b/Plugins/Shorten/Shorten.xcodeproj/project.pbxproj @@ -10,13 +10,30 @@ 1745C4300B90C1DC00A6768C /* ShortenDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1745C42C0B90C1DC00A6768C /* ShortenDecoder.mm */; }; 1745C4310B90C1DC00A6768C /* ShortenPropertiesReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1745C42E0B90C1DC00A6768C /* ShortenPropertiesReader.mm */; }; 177FCFAD0B90C96B0011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCFAC0B90C96B0011C3B5 /* Plugin.h */; }; - 179CFD600B90C6F600C8C4DB /* Shorten.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 179CFD5F0B90C6F600C8C4DB /* Shorten.framework */; }; - 179CFD630B90C6F800C8C4DB /* Shorten.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 179CFD5F0B90C6F600C8C4DB /* Shorten.framework */; }; 17ADB2240B97942800257CA2 /* ShortenPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB2220B97942800257CA2 /* ShortenPlugin.h */; }; 17ADB2250B97942800257CA2 /* ShortenPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB2230B97942800257CA2 /* ShortenPlugin.mm */; }; + 17F564EE0C3BDE010019975C /* Shorten.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F563E50C3BDBF10019975C /* Shorten.framework */; }; + 17F564EF0C3BDE030019975C /* Shorten.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F563E50C3BDBF10019975C /* Shorten.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 17F563E40C3BDBF10019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F563DD0C3BDBF10019975C /* Shorten.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = Shorten; + }; + 17F563E90C3BDC0A0019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F563DD0C3BDBF10019975C /* Shorten.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = Shorten; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 1745C4400B90C21B00A6768C /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -24,7 +41,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 179CFD630B90C6F800C8C4DB /* Shorten.framework in CopyFiles */, + 17F564EF0C3BDE030019975C /* Shorten.framework in CopyFiles */, 177FCFAD0B90C96B0011C3B5 /* Plugin.h in CopyFiles */, 17ADB2240B97942800257CA2 /* ShortenPlugin.h in CopyFiles */, ); @@ -41,9 +58,9 @@ 1745C42D0B90C1DC00A6768C /* ShortenPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ShortenPropertiesReader.h; sourceTree = ""; }; 1745C42E0B90C1DC00A6768C /* ShortenPropertiesReader.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ShortenPropertiesReader.mm; sourceTree = ""; }; 177FCFAC0B90C96B0011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 179CFD5F0B90C6F600C8C4DB /* Shorten.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Shorten.framework; path = ../../Frameworks/Shorten/build/Release/Shorten.framework; sourceTree = SOURCE_ROOT; }; 17ADB2220B97942800257CA2 /* ShortenPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ShortenPlugin.h; sourceTree = ""; }; 17ADB2230B97942800257CA2 /* ShortenPlugin.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ShortenPlugin.mm; sourceTree = ""; }; + 17F563DD0C3BDBF10019975C /* Shorten.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Shorten.xcodeproj; path = ../../Frameworks/Shorten/Shorten.xcodeproj; sourceTree = SOURCE_ROOT; }; 32DBCF630370AF2F00C91783 /* Shorten_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shorten_Prefix.pch; sourceTree = ""; }; 8D5B49B6048680CD000E48DA /* Shorten.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Shorten.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; @@ -55,8 +72,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 17F564EE0C3BDE010019975C /* Shorten.framework in Frameworks */, 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */, - 179CFD600B90C6F600C8C4DB /* Shorten.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -109,7 +126,7 @@ 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 179CFD5F0B90C6F600C8C4DB /* Shorten.framework */, + 17F563DD0C3BDBF10019975C /* Shorten.xcodeproj */, 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -125,6 +142,14 @@ name = "Other Frameworks"; sourceTree = ""; }; + 17F563DE0C3BDBF10019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F563E50C3BDBF10019975C /* Shorten.framework */, + ); + name = Products; + sourceTree = ""; + }; 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -144,9 +169,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* Shorten */ = { + 8D5B49AC048680CD000E48DA /* Shorten Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Shorten" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Shorten Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -156,8 +181,9 @@ buildRules = ( ); dependencies = ( + 17F563EA0C3BDC0A0019975C /* PBXTargetDependency */, ); - name = Shorten; + name = "Shorten Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = Shorten; productReference = 8D5B49B6048680CD000E48DA /* Shorten.bundle */; @@ -172,12 +198,28 @@ hasScannedForEncodings = 1; mainGroup = 089C166AFE841209C02AAC07 /* Shorten */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 17F563DE0C3BDBF10019975C /* Products */; + ProjectRef = 17F563DD0C3BDBF10019975C /* Shorten.xcodeproj */; + }, + ); targets = ( - 8D5B49AC048680CD000E48DA /* Shorten */, + 8D5B49AC048680CD000E48DA /* Shorten Plugin */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 17F563E50C3BDBF10019975C /* Shorten.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Shorten.framework; + remoteRef = 17F563E40C3BDBF10019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8D5B49AF048680CD000E48DA /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -201,6 +243,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 17F563EA0C3BDC0A0019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Shorten; + targetProxy = 17F563E90C3BDC0A0019975C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1DEB913B08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -275,7 +325,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Shorten" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Shorten Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj b/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj index 2a9db15ec..204a83ed5 100644 --- a/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj +++ b/Plugins/TagLib/TagLib.xcodeproj/project.pbxproj @@ -8,29 +8,29 @@ /* Begin PBXBuildFile section */ 177FCFA50B90C9600011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCFA40B90C9600011C3B5 /* Plugin.h */; }; - 179CFD9F0B90C71E00C8C4DB /* TagLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 179CFD9E0B90C71E00C8C4DB /* TagLib.framework */; }; - 179CFDA20B90C72100C8C4DB /* TagLib.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 179CFD9E0B90C71E00C8C4DB /* TagLib.framework */; }; 17C93FBC0B900538008627D6 /* TagLibPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93FBB0B900538008627D6 /* TagLibPlugin.m */; }; 17C93FC30B90056C008627D6 /* TagLibMetadataReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93FC20B90056C008627D6 /* TagLibMetadataReader.m */; }; + 17F563B40C3BDBB30019975C /* TagLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F563A60C3BDB8F0019975C /* TagLib.framework */; }; + 17F563B60C3BDBB50019975C /* TagLib.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F563A60C3BDB8F0019975C /* TagLib.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - 281899860BEC71B6003176EE /* Development */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = NO; - }; - name = Development; +/* Begin PBXContainerItemProxy section */ + 17F563A50C3BDB8F0019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F563A00C3BDB8F0019975C /* TagLib.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = TagLib; }; - 281899870BEC71B6003176EE /* Deployment */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = YES; - }; - name = Deployment; + 17F563C00C3BDBC60019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F563A00C3BDB8F0019975C /* TagLib.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = TagLib; }; -/* End PBXBuildStyle section */ +/* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ 17C93FF20B900734008627D6 /* CopyFiles */ = { @@ -39,7 +39,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 179CFDA20B90C72100C8C4DB /* TagLib.framework in CopyFiles */, + 17F563B60C3BDBB50019975C /* TagLib.framework in CopyFiles */, 177FCFA50B90C9600011C3B5 /* Plugin.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; @@ -51,11 +51,11 @@ 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 177FCFA40B90C9600011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 179CFD9E0B90C71E00C8C4DB /* TagLib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TagLib.framework; path = ../../Frameworks/TagLib/build/Release/TagLib.framework; sourceTree = SOURCE_ROOT; }; 17C93FBA0B900538008627D6 /* TagLibPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TagLibPlugin.h; sourceTree = ""; }; 17C93FBB0B900538008627D6 /* TagLibPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = TagLibPlugin.m; sourceTree = ""; }; 17C93FC10B90056C008627D6 /* TagLibMetadataReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TagLibMetadataReader.h; sourceTree = ""; }; 17C93FC20B90056C008627D6 /* TagLibMetadataReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TagLibMetadataReader.m; sourceTree = ""; }; + 17F563A00C3BDB8F0019975C /* TagLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TagLib.xcodeproj; path = ../../Frameworks/TagLib/TagLib.xcodeproj; sourceTree = SOURCE_ROOT; }; 32DBCF630370AF2F00C91783 /* TagLib_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TagLib_Prefix.pch; sourceTree = ""; }; 8D5B49B6048680CD000E48DA /* TagLib.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TagLib.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; @@ -67,8 +67,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 17F563B40C3BDBB30019975C /* TagLib.framework in Frameworks */, 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */, - 179CFD9F0B90C71E00C8C4DB /* TagLib.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -119,7 +119,7 @@ 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 179CFD9E0B90C71E00C8C4DB /* TagLib.framework */, + 17F563A00C3BDB8F0019975C /* TagLib.xcodeproj */, 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -135,6 +135,14 @@ name = "Other Frameworks"; sourceTree = ""; }; + 17F563A10C3BDB8F0019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F563A60C3BDB8F0019975C /* TagLib.framework */, + ); + name = Products; + sourceTree = ""; + }; 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -154,9 +162,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* TagLib */ = { + 8D5B49AC048680CD000E48DA /* TagLib Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "TagLib" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "TagLib Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -166,8 +174,9 @@ buildRules = ( ); dependencies = ( + 17F563C10C3BDBC60019975C /* PBXTargetDependency */, ); - name = TagLib; + name = "TagLib Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = TagLib; productReference = 8D5B49B6048680CD000E48DA /* TagLib.bundle */; @@ -179,21 +188,31 @@ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "TagLib" */; - buildSettings = { - }; - buildStyles = ( - 281899860BEC71B6003176EE /* Development */, - 281899870BEC71B6003176EE /* Deployment */, - ); hasScannedForEncodings = 1; mainGroup = 089C166AFE841209C02AAC07 /* TagLib */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 17F563A10C3BDB8F0019975C /* Products */; + ProjectRef = 17F563A00C3BDB8F0019975C /* TagLib.xcodeproj */; + }, + ); targets = ( - 8D5B49AC048680CD000E48DA /* TagLib */, + 8D5B49AC048680CD000E48DA /* TagLib Plugin */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 17F563A60C3BDB8F0019975C /* TagLib.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = TagLib.framework; + remoteRef = 17F563A50C3BDB8F0019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8D5B49AF048680CD000E48DA /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -216,18 +235,20 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 17F563C10C3BDBC60019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = TagLib; + targetProxy = 17F563C00C3BDBC60019975C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1DEB913B08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../Frameworks/TagLib/build/Release\""; - FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../Frameworks/TagLib/build/Release\""; + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; @@ -249,13 +270,7 @@ ppc, i386, ); - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../Frameworks/TagLib/build/Release\""; - FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/../../Frameworks/TagLib/build/Release\""; + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -290,7 +305,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "TagLib" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "TagLib Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj b/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj index abb6985af..f203c36fc 100644 --- a/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj +++ b/Plugins/Vorbis/Vorbis.xcodeproj/project.pbxproj @@ -9,14 +9,31 @@ /* Begin PBXBuildFile section */ 1745C2840B90B9F200A6768C /* VorbisPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C2820B90B9F200A6768C /* VorbisPropertiesReader.m */; }; 177FCF9E0B90C9530011C3B5 /* Plugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 177FCF9D0B90C9530011C3B5 /* Plugin.h */; }; - 179CFDEE0B90C79800C8C4DB /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 179CFDED0B90C79800C8C4DB /* Vorbis.framework */; }; - 179CFDF20B90C79A00C8C4DB /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 179CFDED0B90C79800C8C4DB /* Vorbis.framework */; }; 17ADB2480B97944D00257CA2 /* VorbisPlugin.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17ADB2460B97944D00257CA2 /* VorbisPlugin.h */; }; 17ADB2490B97944D00257CA2 /* VorbisPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB2470B97944D00257CA2 /* VorbisPlugin.m */; }; 17C93D360B8FDA66008627D6 /* VorbisDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93D340B8FDA66008627D6 /* VorbisDecoder.m */; }; + 17F563820C3BDB670019975C /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F562F70C3BDAAC0019975C /* Vorbis.framework */; }; + 17F563850C3BDB6C0019975C /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F562F70C3BDAAC0019975C /* Vorbis.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 17F562F60C3BDAAC0019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = Vorbis; + }; + 17F562FA0C3BDAC10019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = Vorbis; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 17C93D770B8FDCA5008627D6 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -24,7 +41,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 179CFDF20B90C79A00C8C4DB /* Vorbis.framework in CopyFiles */, + 17F563850C3BDB6C0019975C /* Vorbis.framework in CopyFiles */, 177FCF9E0B90C9530011C3B5 /* Plugin.h in CopyFiles */, 17ADB2480B97944D00257CA2 /* VorbisPlugin.h in CopyFiles */, ); @@ -39,11 +56,11 @@ 1745C2810B90B9F200A6768C /* VorbisPropertiesReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VorbisPropertiesReader.h; sourceTree = ""; }; 1745C2820B90B9F200A6768C /* VorbisPropertiesReader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VorbisPropertiesReader.m; sourceTree = ""; }; 177FCF9D0B90C9530011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; - 179CFDED0B90C79800C8C4DB /* Vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Vorbis.framework; path = ../../Frameworks/Vorbis/build/Release/Vorbis.framework; sourceTree = SOURCE_ROOT; }; 17ADB2460B97944D00257CA2 /* VorbisPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VorbisPlugin.h; sourceTree = ""; }; 17ADB2470B97944D00257CA2 /* VorbisPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VorbisPlugin.m; sourceTree = ""; }; 17C93D330B8FDA66008627D6 /* VorbisDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VorbisDecoder.h; sourceTree = ""; }; 17C93D340B8FDA66008627D6 /* VorbisDecoder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VorbisDecoder.m; sourceTree = ""; }; + 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Vorbis.xcodeproj; path = ../../Frameworks/Vorbis/Vorbis.xcodeproj; sourceTree = SOURCE_ROOT; }; 32DBCF630370AF2F00C91783 /* Vorbis_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vorbis_Prefix.pch; sourceTree = ""; }; 8D5B49B6048680CD000E48DA /* Vorbis.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Vorbis.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; @@ -55,8 +72,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 17F563820C3BDB670019975C /* Vorbis.framework in Frameworks */, 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */, - 179CFDEE0B90C79800C8C4DB /* Vorbis.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -109,7 +126,7 @@ 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 179CFDED0B90C79800C8C4DB /* Vorbis.framework */, + 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */, 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -125,6 +142,14 @@ name = "Other Frameworks"; sourceTree = ""; }; + 17F562F00C3BDAAC0019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F562F70C3BDAAC0019975C /* Vorbis.framework */, + ); + name = Products; + sourceTree = ""; + }; 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -144,9 +169,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* Vorbis */ = { + 8D5B49AC048680CD000E48DA /* Vorbis Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Vorbis" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Vorbis Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -156,8 +181,9 @@ buildRules = ( ); dependencies = ( + 17F562FB0C3BDAC10019975C /* PBXTargetDependency */, ); - name = Vorbis; + name = "Vorbis Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = Vorbis; productReference = 8D5B49B6048680CD000E48DA /* Vorbis.bundle */; @@ -172,12 +198,28 @@ hasScannedForEncodings = 1; mainGroup = 089C166AFE841209C02AAC07 /* Vorbis */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 17F562F00C3BDAAC0019975C /* Products */; + ProjectRef = 17F562EF0C3BDAAC0019975C /* Vorbis.xcodeproj */; + }, + ); targets = ( - 8D5B49AC048680CD000E48DA /* Vorbis */, + 8D5B49AC048680CD000E48DA /* Vorbis Plugin */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 17F562F70C3BDAAC0019975C /* Vorbis.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Vorbis.framework; + remoteRef = 17F562F60C3BDAAC0019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8D5B49AF048680CD000E48DA /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -201,6 +243,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 17F562FB0C3BDAC10019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Vorbis; + targetProxy = 17F562FA0C3BDAC10019975C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1DEB913B08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -289,7 +339,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Vorbis" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "Vorbis Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Plugins/WavPack/Info.plist b/Plugins/WavPack/Info.plist index 97a48778a..2d803f349 100644 --- a/Plugins/WavPack/Info.plist +++ b/Plugins/WavPack/Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 NSPrincipalClass - WavPackCodec + WavPackPlugin diff --git a/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj b/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj index f0e980668..fb7a5dfd1 100644 --- a/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj +++ b/Plugins/WavPack/WavPack.xcodeproj/project.pbxproj @@ -10,11 +10,28 @@ 1745C4DA0B90C42500A6768C /* WavPackDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C4D60B90C42500A6768C /* WavPackDecoder.m */; }; 1745C4DB0B90C42500A6768C /* WavPackPropertiesReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1745C4D80B90C42500A6768C /* WavPackPropertiesReader.m */; }; 17ADB2630B97946600257CA2 /* WavPackPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 17ADB2610B97946600257CA2 /* WavPackPlugin.m */; }; + 17F562D80C3BDA6C0019975C /* WavPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17F562CA0C3BDA5A0019975C /* WavPack.framework */; }; + 17F562DB0C3BDA6E0019975C /* WavPack.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17F562CA0C3BDA5A0019975C /* WavPack.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; - 8E2B8FE40B9B63CD00F2D9E8 /* WavPack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E2B8FE30B9B63CD00F2D9E8 /* WavPack.framework */; }; - 8E2B8FE70B9B63CF00F2D9E8 /* WavPack.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E2B8FE30B9B63CD00F2D9E8 /* WavPack.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 17F562C90C3BDA5A0019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F562C20C3BDA5A0019975C /* WavPack.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = WavPack; + }; + 17F562DC0C3BDA830019975C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 17F562C20C3BDA5A0019975C /* WavPack.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = WavPack; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 1745C4FE0B90C4CD00A6768C /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -22,7 +39,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 8E2B8FE70B9B63CF00F2D9E8 /* WavPack.framework in CopyFiles */, + 17F562DB0C3BDA6E0019975C /* WavPack.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -39,10 +56,10 @@ 177FCF940B90C9450011C3B5 /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Plugin.h; path = ../../Audio/Plugin.h; sourceTree = SOURCE_ROOT; }; 17ADB2600B97946600257CA2 /* WavPackPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WavPackPlugin.h; sourceTree = ""; }; 17ADB2610B97946600257CA2 /* WavPackPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WavPackPlugin.m; sourceTree = ""; }; + 17F562C20C3BDA5A0019975C /* WavPack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WavPack.xcodeproj; path = ../../Frameworks/WavPack/WavPack.xcodeproj; sourceTree = SOURCE_ROOT; }; 32DBCF630370AF2F00C91783 /* WavPack_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WavPack_Prefix.pch; sourceTree = ""; }; 8D5B49B6048680CD000E48DA /* WavPack.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WavPack.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = ""; }; - 8E2B8FE30B9B63CD00F2D9E8 /* WavPack.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WavPack.framework; path = ../../Frameworks/WavPack/build/Release/WavPack.framework; sourceTree = SOURCE_ROOT; }; D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; /* End PBXFileReference section */ @@ -51,8 +68,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 17F562D80C3BDA6C0019975C /* WavPack.framework in Frameworks */, 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */, - 8E2B8FE40B9B63CD00F2D9E8 /* WavPack.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,7 +122,7 @@ 1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 8E2B8FE30B9B63CD00F2D9E8 /* WavPack.framework */, + 17F562C20C3BDA5A0019975C /* WavPack.xcodeproj */, 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -121,6 +138,14 @@ name = "Other Frameworks"; sourceTree = ""; }; + 17F562C30C3BDA5A0019975C /* Products */ = { + isa = PBXGroup; + children = ( + 17F562CA0C3BDA5A0019975C /* WavPack.framework */, + ); + name = Products; + sourceTree = ""; + }; 19C28FB8FE9D52D311CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -140,9 +165,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 8D5B49AC048680CD000E48DA /* WavPack */ = { + 8D5B49AC048680CD000E48DA /* WavPack Plugin */ = { isa = PBXNativeTarget; - buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "WavPack" */; + buildConfigurationList = 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "WavPack Plugin" */; buildPhases = ( 8D5B49AF048680CD000E48DA /* Resources */, 8D5B49B1048680CD000E48DA /* Sources */, @@ -152,8 +177,9 @@ buildRules = ( ); dependencies = ( + 17F562DD0C3BDA830019975C /* PBXTargetDependency */, ); - name = WavPack; + name = "WavPack Plugin"; productInstallPath = "$(HOME)/Library/Bundles"; productName = WavPack; productReference = 8D5B49B6048680CD000E48DA /* WavPack.bundle */; @@ -168,12 +194,28 @@ hasScannedForEncodings = 1; mainGroup = 089C166AFE841209C02AAC07 /* WavPack */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 17F562C30C3BDA5A0019975C /* Products */; + ProjectRef = 17F562C20C3BDA5A0019975C /* WavPack.xcodeproj */; + }, + ); targets = ( - 8D5B49AC048680CD000E48DA /* WavPack */, + 8D5B49AC048680CD000E48DA /* WavPack Plugin */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 17F562CA0C3BDA5A0019975C /* WavPack.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = WavPack.framework; + remoteRef = 17F562C90C3BDA5A0019975C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8D5B49AF048680CD000E48DA /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -197,6 +239,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 17F562DD0C3BDA830019975C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = WavPack; + targetProxy = 17F562DC0C3BDA830019975C /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1DEB913B08733D840010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -279,7 +329,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "WavPack" */ = { + 1DEB913A08733D840010E9CD /* Build configuration list for PBXNativeTarget "WavPack Plugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB913B08733D840010E9CD /* Debug */, diff --git a/Scripts/build_cog.sh b/Scripts/build_cog.sh deleted file mode 100755 index 14548ce3b..000000000 --- a/Scripts/build_cog.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -./Scripts/build_dependencies.sh - -xcodebuild -alltargets -configuration Release - diff --git a/Scripts/build_dependencies.sh b/Scripts/build_dependencies.sh deleted file mode 100755 index e741481ea..000000000 --- a/Scripts/build_dependencies.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -./Scripts/build_frameworks.sh -./Scripts/build_preferences.sh -./Scripts/build_plugins.sh - -cd Audio -xcodebuild -alltargets -configuration Release -cd .. - diff --git a/Scripts/build_frameworks.sh b/Scripts/build_frameworks.sh deleted file mode 100755 index b2a685e5d..000000000 --- a/Scripts/build_frameworks.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -libs=( MAC MPCDec Ogg FLAC Shorten TagLib Vorbis WavPack MAD ID3Tag ) - -for lib in "${libs[@]}" -do - cd Frameworks/$lib - xcodebuild -alltargets -configuration Release - cd ../.. -done diff --git a/Scripts/build_nightly.rb b/Scripts/build_nightly.rb index dcfbcd893..ae61ce67b 100755 --- a/Scripts/build_nightly.rb +++ b/Scripts/build_nightly.rb @@ -54,7 +54,7 @@ if appcast_revision < latest_revision newplist.close() #Build Cog! - %x[./Scripts/build_cog.sh 2>&1].each_line do |line| + %x[xcodebuild -alltargets -configuration Release 2>&1].each_line do |line| if line.match(/\*\* BUILD FAILED \*\*/) exit end diff --git a/Scripts/build_plugins.sh b/Scripts/build_plugins.sh deleted file mode 100755 index 2a7d34cc3..000000000 --- a/Scripts/build_plugins.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -plugins=( CoreAudio MonkeysAudio Musepack Flac Shorten TagLib Vorbis WavPack MAD Quicktime FileSource HTTPSource) - -for plugin in "${plugins[@]}" -do - cd Plugins/$plugin - xcodebuild -alltargets -configuration Release - cd ../.. -done diff --git a/Scripts/build_preferences.sh b/Scripts/build_preferences.sh deleted file mode 100755 index 6687a52e4..000000000 --- a/Scripts/build_preferences.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -prefs=( General ) - -for pref in "${prefs[@]}" -do - cd Preferences/$pref - xcodebuild -alltargets -configuration Release - cd ../.. -done