dnrops
/
Aperture
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Namespace errors under the `Aperture` name

This commit is contained in:
Sindre Sorhus 2020-02-14 18:50:48 +07:00
parent cc856ceb6c
commit 5f80b523c1
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/Aperture/Aperture.swift
View File

@ -1,7 +1,8 @@
import Foundation import Foundation
import AVFoundation import AVFoundation
public enum ApertureError: Error { public final class Aperture: NSObject {
public enum Error: Swift.Error {
case invalidScreen case invalidScreen
case invalidAudioDevice case invalidAudioDevice
case couldNotAddScreen case couldNotAddScreen
@ -9,7 +10,6 @@ public enum ApertureError: Error {
case couldNotAddOutput case couldNotAddOutput
} }
public final class Aperture: NSObject {
private let destination: URL private let destination: URL
private let session: AVCaptureSession private let session: AVCaptureSession
private let output: AVCaptureMovieFileOutput private let output: AVCaptureMovieFileOutput
@ -17,7 +17,7 @@ public final class Aperture: NSObject {
public var onStart: (() -> Void)? public var onStart: (() -> Void)?
public var onFinish: (() -> Void)? public var onFinish: (() -> Void)?
public var onError: ((Error) -> Void)? public var onError: ((Swift.Error) -> Void)?
public var onPause: (() -> Void)? public var onPause: (() -> Void)?
public var onResume: (() -> Void)? public var onResume: (() -> Void)?
public var isRecording: Bool { output.isRecording } public var isRecording: Bool { output.isRecording }
@ -42,7 +42,7 @@ public final class Aperture: NSObject {
if let audioDevice = audioDevice { if let audioDevice = audioDevice {
if !audioDevice.hasMediaType(.audio) { if !audioDevice.hasMediaType(.audio) {
throw ApertureError.invalidAudioDevice throw Error.invalidAudioDevice
} }
let audioInput = try AVCaptureDeviceInput(device: audioDevice) let audioInput = try AVCaptureDeviceInput(device: audioDevice)
@ -50,20 +50,20 @@ public final class Aperture: NSObject {
if session.canAddInput(audioInput) { if session.canAddInput(audioInput) {
session.addInput(audioInput) session.addInput(audioInput)
} else { } else {
throw ApertureError.couldNotAddMic throw Error.couldNotAddMic
} }
} }
if session.canAddInput(input) { if session.canAddInput(input) {
session.addInput(input) session.addInput(input)
} else { } else {
throw ApertureError.couldNotAddScreen throw Error.couldNotAddScreen
} }
if session.canAddOutput(output) { if session.canAddOutput(output) {
session.addOutput(output) session.addOutput(output)
} else { } else {
throw ApertureError.couldNotAddOutput throw Error.couldNotAddOutput
} }
// TODO: Default to HEVC when on 10.13 or newer and encoding is hardware supported. Without hardware encoding I got 3 FPS full screen recording. // TODO: Default to HEVC when on 10.13 or newer and encoding is hardware supported. Without hardware encoding I got 3 FPS full screen recording.
@ -103,7 +103,7 @@ public final class Aperture: NSObject {
audioDevice: AVCaptureDevice? = .default(for: .audio), audioDevice: AVCaptureDevice? = .default(for: .audio),
videoCodec: String? = nil videoCodec: String? = nil
) throws { ) throws {
let input = try AVCaptureScreenInput(displayID: screenId).unwrapOrThrow(ApertureError.invalidScreen) let input = try AVCaptureScreenInput(displayID: screenId).unwrapOrThrow(Error.invalidScreen)
input.minFrameDuration = CMTime(videoFramesPerSecond: framesPerSecond) input.minFrameDuration = CMTime(videoFramesPerSecond: framesPerSecond)
@ -195,7 +195,7 @@ extension Aperture: AVCaptureFileOutputRecordingDelegate {
onStart?() onStart?()
} }
public func fileOutput(_ captureOutput: AVCaptureFileOutput, didFinishRecordingTo outputFileURL: URL, from connections: [AVCaptureConnection], error: Error?) { public func fileOutput(_ captureOutput: AVCaptureFileOutput, didFinishRecordingTo outputFileURL: URL, from connections: [AVCaptureConnection], error: Swift.Error?) {
shouldPreventSleep = false shouldPreventSleep = false
let FINISHED_RECORDING_ERROR_CODE = -11_806 let FINISHED_RECORDING_ERROR_CODE = -11_806