Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: build issue where mac catalyst target had AVCaptureSession extension redeclaration #1613

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Fix: build issue where mac catalyst target had AVCaptureSession extension redeclaration #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a425de1
fix: build issue where mac target had AVCaptureSession extesion redec…
AppPear Oct 31, 2024
980c3c6
fix: import errors, and target errors
AppPear Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Sources/Extension/AVCaptureSession+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ extension AVCaptureSession {
}
}
}
#endif
#else

@available(tvOS 17.0, *)
extension AVCaptureSession {
Expand All @@ -36,4 +36,5 @@ extension AVCaptureSession {
}
}
}
#endif
// swiftlint:enable unused_setter_value
1 change: 1 addition & 0 deletions Sources/Mixer/AudioMixerByMultiTrack.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import AVFoundation
import Foundation
import CoreAudio

final class AudioMixerByMultiTrack: AudioMixer {
private static let defaultSampleTime: AVAudioFramePosition = 0
Expand Down
1 change: 1 addition & 0 deletions Sources/Mixer/AudioMonitor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import AudioUnit
import AVFoundation
import CoreMedia
import Foundation
import CoreAudio

final class AudioMonitor {
var inputFormat: AVAudioFormat? {
Expand Down
1 change: 1 addition & 0 deletions Sources/Mixer/AudioRingBuffer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Accelerate
import AVFoundation
import CoreMedia
import Foundation
import CoreAudio

final class AudioRingBuffer {
private static let bufferCounts: UInt32 = 16
Expand Down
2 changes: 1 addition & 1 deletion Sources/RTMP/RTMPStream.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import UIKit
typealias View = UIView
#endif

#if canImport(AppKit)
#if canImport(AppKit) && !targetEnvironment(macCatalyst)
import AppKit
typealias View = NSView
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/Screen/Shape.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ final class RoundedSquareShape: Shape {
return nil
}
let path = CGPath(roundedRect: rect, cornerWidth: cornerRadius, cornerHeight: cornerRadius, transform: nil)
#if canImport(AppKit)
#if canImport(AppKit) && !targetEnvironment(macCatalyst)
context.setFillColor(NSColor.white.cgColor)
#endif
#if canImport(UIKit)
Expand Down
Loading