Skip to content

Commit

Permalink
Bump to up 0.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
shogo4405 committed Jul 8, 2018
1 parent d40b50b commit eca473b
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion HaishinKit.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Platforms/iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.9.0</string>
<string>0.9.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/macOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.9.0</string>
<string>0.9.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/tvOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.9.0</string>
<string>0.9.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ end
```
### Carthage
```
github "shogo4405/HaishinKit.swift" ~> 0.9.0
github "shogo4405/HaishinKit.swift" ~> 0.9.1
```

## License
Expand Down
8 changes: 3 additions & 5 deletions Sources/Net/NetStream.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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()
}
Expand Down

0 comments on commit eca473b

Please sign in to comment.