diff --git a/AudioStreaming.xcodeproj/project.pbxproj b/AudioStreaming.xcodeproj/project.pbxproj index 92657b4..1730147 100644 --- a/AudioStreaming.xcodeproj/project.pbxproj +++ b/AudioStreaming.xcodeproj/project.pbxproj @@ -7,10 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 981DA0652EAD51B60062223D /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 981DA0632EAD51B60062223D /* README.md */; }; - 981DA0672EAD51B60062223D /* OggVorbisDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 981DA0622EAD51B60062223D /* OggVorbisDecoder.swift */; }; 981DA06B2EAD53650062223D /* opus in Frameworks */ = {isa = PBXBuildFile; productRef = 981DA06A2EAD53650062223D /* opus */; }; - 981DA06E2EAD53880062223D /* ogg in Frameworks */ = {isa = PBXBuildFile; productRef = 981DA06D2EAD53880062223D /* ogg */; }; 981DA0712EAD539A0062223D /* vorbis in Frameworks */ = {isa = PBXBuildFile; productRef = 981DA0702EAD539A0062223D /* vorbis */; }; 981DA0732EAD53D80062223D /* OggVorbisStreamProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 981DA0722EAD53D80062223D /* OggVorbisStreamProcessor.swift */; }; 98ABF69E2BAB07A20059C441 /* Mp4Restructure.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98ABF69D2BAB07A20059C441 /* Mp4Restructure.swift */; }; @@ -103,8 +100,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 981DA0622EAD51B60062223D /* OggVorbisDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OggVorbisDecoder.swift; sourceTree = ""; }; - 981DA0632EAD51B60062223D /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 981DA0722EAD53D80062223D /* OggVorbisStreamProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OggVorbisStreamProcessor.swift; sourceTree = ""; }; 98ABF69D2BAB07A20059C441 /* Mp4Restructure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mp4Restructure.swift; sourceTree = ""; }; 98C82AE52B8CA8BC00AED485 /* RemoteMp4Restructure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteMp4Restructure.swift; sourceTree = ""; }; @@ -185,7 +180,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 981DA06E2EAD53880062223D /* ogg in Frameworks */, 981DA0712EAD539A0062223D /* vorbis in Frameworks */, 981DA06B2EAD53650062223D /* opus in Frameworks */, ); @@ -202,15 +196,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 981DA0642EAD51B60062223D /* OggVorbis */ = { - isa = PBXGroup; - children = ( - 981DA0622EAD51B60062223D /* OggVorbisDecoder.swift */, - 981DA0632EAD51B60062223D /* README.md */, - ); - path = OggVorbis; - sourceTree = ""; - }; 98C82AE42B8CA8AA00AED485 /* Mp4 */ = { isa = PBXGroup; children = ( @@ -457,7 +442,6 @@ B5EF9553247E9235003E8FF8 /* Streaming */ = { isa = PBXGroup; children = ( - 981DA0642EAD51B60062223D /* OggVorbis */, B5E1DE2924B7179E00955BFB /* AudioPlayer */, B58BD7FC255DB653005B756D /* Audio Source */, B55A7369247FCB160050C53D /* Audio Entry */, @@ -523,7 +507,6 @@ name = AudioStreaming; packageProductDependencies = ( 981DA06A2EAD53650062223D /* opus */, - 981DA06D2EAD53880062223D /* ogg */, 981DA0702EAD539A0062223D /* vorbis */, ); productName = AudioStreaming; @@ -580,7 +563,6 @@ mainGroup = B5AEDBA424744153007D8101; packageReferences = ( 981DA0692EAD53650062223D /* XCRemoteSwiftPackageReference "opus-binary-xcframework" */, - 981DA06C2EAD53880062223D /* XCRemoteSwiftPackageReference "ogg-binary-xcframework" */, 981DA06F2EAD539A0062223D /* XCRemoteSwiftPackageReference "vorbis-binary-xcframework" */, ); productRefGroup = B5AEDBAF24744153007D8101 /* Products */; @@ -598,7 +580,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 981DA0652EAD51B60062223D /* README.md in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -653,7 +634,6 @@ B51B9F9A24DBE5BF00BDEAA2 /* AVAudioFormat+Convenience.swift in Sources */, B51FE0C624890CCB00F2A4D2 /* PlayerQueueEntries.swift in Sources */, B5EF9557247E9439003E8FF8 /* AudioStreamSource.swift in Sources */, - 981DA0672EAD51B60062223D /* OggVorbisDecoder.swift in Sources */, B5D4A40925D9321400E1450C /* IcycastHeaderParser.swift in Sources */, B59DF1A32493E90C0043C498 /* AudioFileStream+Helpers.swift in Sources */, B54D876D2490E4A000C361A0 /* UnitDescriptions.swift in Sources */, @@ -1010,14 +990,6 @@ minimumVersion = 0.2.2; }; }; - 981DA06C2EAD53880062223D /* XCRemoteSwiftPackageReference "ogg-binary-xcframework" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/sbooth/ogg-binary-xcframework?tab=readme-ov-file"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 0.1.2; - }; - }; 981DA06F2EAD539A0062223D /* XCRemoteSwiftPackageReference "vorbis-binary-xcframework" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/sbooth/vorbis-binary-xcframework"; @@ -1034,11 +1006,6 @@ package = 981DA0692EAD53650062223D /* XCRemoteSwiftPackageReference "opus-binary-xcframework" */; productName = opus; }; - 981DA06D2EAD53880062223D /* ogg */ = { - isa = XCSwiftPackageProductDependency; - package = 981DA06C2EAD53880062223D /* XCRemoteSwiftPackageReference "ogg-binary-xcframework" */; - productName = ogg; - }; 981DA0702EAD539A0062223D /* vorbis */ = { isa = XCSwiftPackageProductDependency; package = 981DA06F2EAD539A0062223D /* XCRemoteSwiftPackageReference "vorbis-binary-xcframework" */; diff --git a/AudioStreaming.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AudioStreaming.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 4071d0c..a916fbb 100644 --- a/AudioStreaming.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/AudioStreaming.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "84d61c22f4c9b9a6ddcf9f4529fa37841dcf93afb79bad55351f2ea228b3a0b0", + "originHash" : "cc93a2f9502b64d22ad433fbc0dceed9c810d39930c54a22639254c8c27b4ca4", "pins" : [ { "identity" : "opus-binary-xcframework", @@ -9,6 +9,15 @@ "revision" : "74201a6af424e7e3a007fd5e401e9d2ce6896628", "version" : "0.2.2" } + }, + { + "identity" : "vorbis-binary-xcframework", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sbooth/vorbis-binary-xcframework", + "state" : { + "revision" : "842020eabcebe410e698c68545d6597b2d232e51", + "version" : "0.1.2" + } } ], "version" : 3 diff --git a/AudioStreaming.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AudioStreaming.xcworkspace/xcshareddata/swiftpm/Package.resolved index 78e62ef..2174950 100644 --- a/AudioStreaming.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/AudioStreaming.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "1ea3e98859215ca12f48674ae21401ee15e132c5ca57c4ec4854c1d1cbb01b9a", + "originHash" : "e6d42d4369002806d6cd1714c8313d3339eddb956b7b34ddd072ebb73cfad768", "pins" : [ { "identity" : "ogg-binary-xcframework", @@ -10,15 +10,6 @@ "version" : "0.1.2" } }, - { - "identity" : "ogg-binary-xcframework?tab=readme-ov-file", - "kind" : "remoteSourceControl", - "location" : "https://github.com/sbooth/ogg-binary-xcframework?tab=readme-ov-file", - "state" : { - "revision" : "c0e822e18738ad913864e98d9614927ac1e9337c", - "version" : "0.1.2" - } - }, { "identity" : "opus-binary-xcframework", "kind" : "remoteSourceControl",