From eca473b72c49b876733b42a07ffa90e963b265e7 Mon Sep 17 00:00:00 2001 From: shogo4405 Date: Sun, 8 Jul 2018 20:53:48 +0900 Subject: [PATCH] Bump to up 0.9.1 --- HaishinKit.podspec | 2 +- Platforms/iOS/Info.plist | 2 +- Platforms/macOS/Info.plist | 2 +- Platforms/tvOS/Info.plist | 2 +- README.md | 2 +- Sources/Net/NetStream.swift | 8 +++----- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/HaishinKit.podspec b/HaishinKit.podspec index 17e2a99c4..568e59e49 100644 --- a/HaishinKit.podspec +++ b/HaishinKit.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "HaishinKit" - s.version = "0.9.0" + s.version = "0.9.1" s.summary = "Camera and Microphone streaming library via RTMP, HLS for iOS, macOS, tvOS." s.description = <<-DESC diff --git a/Platforms/iOS/Info.plist b/Platforms/iOS/Info.plist index aca33bf97..e9afaf3fb 100644 --- a/Platforms/iOS/Info.plist +++ b/Platforms/iOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.9.0 + 0.9.1 CFBundleSignature ???? CFBundleVersion diff --git a/Platforms/macOS/Info.plist b/Platforms/macOS/Info.plist index aca33bf97..e9afaf3fb 100644 --- a/Platforms/macOS/Info.plist +++ b/Platforms/macOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.9.0 + 0.9.1 CFBundleSignature ???? CFBundleVersion diff --git a/Platforms/tvOS/Info.plist b/Platforms/tvOS/Info.plist index 66dcfb958..409d645dc 100644 --- a/Platforms/tvOS/Info.plist +++ b/Platforms/tvOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.9.0 + 0.9.1 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/README.md b/README.md index 038879e81..2c642238a 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ end ``` ### Carthage ``` -github "shogo4405/HaishinKit.swift" ~> 0.9.0 +github "shogo4405/HaishinKit.swift" ~> 0.9.1 ``` ## License diff --git a/Sources/Net/NetStream.swift b/Sources/Net/NetStream.swift index f61d6e7df..a65bf92cf 100644 --- a/Sources/Net/NetStream.swift +++ b/Sources/Net/NetStream.swift @@ -97,8 +97,7 @@ open class NetStream: NSObject { set { if (DispatchQueue.getSpecific(key: NetStream.queueKey) == NetStream.queueValue) { self.mixer.videoIO.encoder.setValuesForKeys(newValue) - } - else { + } else { ensureLockQueue { self.mixer.videoIO.encoder.setValuesForKeys(newValue) } @@ -197,12 +196,11 @@ open class NetStream: NSObject { } } #endif - + func ensureLockQueue(callback: () -> Void) { if (DispatchQueue.getSpecific(key: NetStream.queueKey) == NetStream.queueValue) { callback() - } - else { + } else { lockQueue.sync { callback() }