Skip to content

Commit

Permalink
0.17.1: blacklist CADefaultAggregate or whatever in the mirrors.
Browse files Browse the repository at this point in the history
Also, update build instructions for macos 11.
  • Loading branch information
zhiayang committed Jan 23, 2022
1 parent cbae297 commit 6c2e085
Show file tree
Hide file tree
Showing 12 changed files with 234 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Carthage

Pods

# Xcode
#
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/VLCKit.json" "3.3.15"
binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/VLCKit.json" "3.3.17"
112 changes: 85 additions & 27 deletions MoeStreamer.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
LastUpgradeVersion = "1320"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
LastUpgradeVersion = "1320"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
10 changes: 10 additions & 0 deletions MoeStreamer.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions MoeStreamer.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
79 changes: 79 additions & 0 deletions MoeStreamer.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"object": {
"pins": [
{
"package": "Socket",
"repositoryURL": "https://github.com/Kitura/BlueSocket",
"state": {
"branch": null,
"revision": "c9894fd117457f1d006575fbfb2fdfd6f79eac03",
"version": "1.0.200"
}
},
{
"package": "Deque",
"repositoryURL": "https://github.com/attaswift/Deque.git",
"state": {
"branch": null,
"revision": "0ad91ef4c8cb7e86f5bd3e8518a61080515120dc",
"version": "3.1.1"
}
},
{
"package": "Just",
"repositoryURL": "https://github.com/dduan/Just.git",
"state": {
"branch": null,
"revision": "1824bf84cf52d11d69ae20cfb89f0ce5bffa5650",
"version": "0.8.0"
}
},
{
"package": "KeychainSwift",
"repositoryURL": "https://github.com/evgenyneu/keychain-swift.git",
"state": {
"branch": null,
"revision": "96fb84f45a96630e7583903bd7e08cf095c7a7ef",
"version": "19.0.0"
}
},
{
"package": "Starscream",
"repositoryURL": "https://github.com/daltoniam/Starscream.git",
"state": {
"branch": null,
"revision": "e6b65c6d9077ea48b4a7bdda8994a1d3c6969c8d",
"version": "3.1.1"
}
},
{
"package": "swift-nio-zlib-support",
"repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
"state": {
"branch": null,
"revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
"version": "1.0.0"
}
},
{
"package": "Introspect",
"repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git",
"state": {
"branch": null,
"revision": "2e09be8af614401bc9f87d40093ec19ce56ccaf2",
"version": "0.1.3"
}
},
{
"package": "SwiftyJSON",
"repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON.git",
"state": {
"branch": null,
"revision": "b3dcd7dbd0d488e1a7077cb33b00f2083e382f07",
"version": "5.0.1"
}
}
]
},
"version": 1
}
1 change: 1 addition & 0 deletions MoeStreamer/src/audio/coreaudio/AudioDevices.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ fileprivate func getOutputDevices() -> [AudioDevice]
return deviceIds
.map({ CoreAudioDeviceWrapper(deviceID: $0) })
.filter({ $0.name != nil && $0.uid != nil && $0.uid != systemDevice.uid && $0.hasOutput })
.filter({ !$0.name!.starts(with: "CADefaultDeviceAggregate") })
.map({ AudioDevice(uid: $0.uid!, dev: $0.audioDeviceID, name: $0.name!) })
}

Expand Down
11 changes: 11 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'

workspace 'MoeStreamer'
target 'MoeStreamer' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!
platform :macos, '10.15'
# Pods for MoeStreamer
pod 'VLCKit', '3.3.18b9'
end
16 changes: 16 additions & 0 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
PODS:
- VLCKit (3.3.18b9)

DEPENDENCIES:
- VLCKit (= 3.3.18b9)

SPEC REPOS:
trunk:
- VLCKit

SPEC CHECKSUMS:
VLCKit: 5e2fed104745f4bc4f5519a4ed2ee9efee5c0540

PODFILE CHECKSUM: 451b83d2e89ee77d711791f8cddedc4aacf3217e

COCOAPODS: 1.11.2
23 changes: 20 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,29 @@ At the moment, these shortcuts cannot be customised.


## Building

### macOS 11 (Bug Sir) or higher

Here, you should use CocoaPods to install VLCKit:

```
$ carthage update --platform macos
$ xcodebuild
pod install
```

Alternatively, open the Xcode project and build it there (you still need to run `carthage`).
Then, open `MoeStreamer.xcworkspace` instead of `xcproj` (because that's how CocoaPods works...). Once the VLCKit people release 3.3.18 with the fix for macOS 11 I'll get rid of cocoapods.


### macOS Catalina (10.15) or lower
You can install VLCKit via Carthage:

```
carthage update --platform macos
```

However, you need to open the project in Xcode, and add `VLCKit.framework`, under the *Frameworks, Libraries, and Embedded Content* list in the **Target Settings**. Choose "Embed and Sign".

Either way, after installing the dependencies, either run `xcodebuild` from the terminal, or open Xcode
and build it from there.

## License

Expand Down

0 comments on commit 6c2e085

Please sign in to comment.