Merge pull request #1484 from shogo4405/feature/update-srthaishinkit

Update libsrt.framework and SRTHaishinKit
shogo4405 · Jun 18, 2024 · 5b9092d · 5b9092d
2 parents acbd54c + 27c1678
commit 5b9092d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/SRTHaishinKit/SRTConnection.swift b/SRTHaishinKit/SRTConnection.swift
@@ -5,7 +5,9 @@ import libsrt
 public final class SRTConnection: NSObject {
     /// The error comain codes.
     public enum Error: Swift.Error {
+        // The uri isn’t supported.
         case notSupportedUri(_ uri: URL?)
+        // The fail to connect.
         case failedToConnect(_ message: String, reson: Int32)
     }
 
@@ -57,6 +59,7 @@ public final class SRTConnection: NSObject {
                 socket = .init()
                 try socket?.open(addr, mode: mode, options: options)
                 self.uri = uri
+                connected = socket?.status == SRTS_CONNECTED
                 continuation.resume()
             } catch {
                 continuation.resume(throwing: error)
@@ -74,6 +77,7 @@ public final class SRTConnection: NSObject {
         }
         socket?.close()
         clients.removeAll()
+        connected = false
     }
 
     private func sockaddr_in(_ host: String, port: UInt16) -> sockaddr_in {

diff --git a/Vendor/SRT/build-visionos.sh b/Vendor/SRT/build-visionos.sh
@@ -11,6 +11,7 @@ srt_visionos() {
 }
 
 # visionOS
+export XROS_DEPLOYMENT_TARGET=1.0
 srt_visionos visionsimulator SIMULATOR
 srt_visionos visionos OS
 mkdir -p ./build/visionos/_SIMULATOR

diff --git a/Vendor/SRT/libsrt.xcframework/Info.plist b/Vendor/SRT/libsrt.xcframework/Info.plist
@@ -29,102 +29,102 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsrt.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsrt.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>xros-arm64_x86_64-simulator</string>
+			<string>xros-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>xros</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsrt.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>xros-arm64</string>
+			<string>xros-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>xros</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsrt.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libsrt.a</string>
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libsrt.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>macos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/Vendor/SRT/libsrt.xcframework/xros-arm64/libsrt.a b/Vendor/SRT/libsrt.xcframework/xros-arm64/libsrt.a
diff --git a/Vendor/SRT/libsrt.xcframework/xros-arm64_x86_64-simulator/libsrt.a b/Vendor/SRT/libsrt.xcframework/xros-arm64_x86_64-simulator/libsrt.a