Refactor any to some.

shogo4405 · Jun 2, 2024 · 6914dbd · 6914dbd
1 parent d041959
commit 6914dbd
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 20 deletions.
diff --git a/Examples/iOS/IngestViewController.swift b/Examples/iOS/IngestViewController.swift
@@ -54,8 +54,6 @@ final class IngestViewController: UIViewController {
         stream.bitrateStrategy = IOStreamVideoAdaptiveBitRateStrategy(mamimumVideoBitrate: VideoCodecSettings.default.bitRate)
         videoBitrateSlider?.value = Float(VideoCodecSettings.default.bitRate) / 1000
         audioBitrateSlider?.value = Float(AudioCodecSettings.default.bitRate) / 1000
-
-        NotificationCenter.default.addObserver(self, selector: #selector(on(_:)), name: UIDevice.orientationDidChangeNotification, object: nil)
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -79,6 +77,7 @@ final class IngestViewController: UIViewController {
         }
         stream.addObserver(self, forKeyPath: "currentFPS", options: .new, context: nil)
         (view as? (any IOStreamView))?.attachStream(stream)
+        NotificationCenter.default.addObserver(self, selector: #selector(on(_:)), name: UIDevice.orientationDidChangeNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(didInterruptionNotification(_:)), name: AVAudioSession.interruptionNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(didRouteChangeNotification(_:)), name: AVAudioSession.routeChangeNotification, object: nil)
     }
@@ -91,8 +90,6 @@ final class IngestViewController: UIViewController {
         stream.attachAudio(nil)
         stream.attachCamera(nil, track: 0)
         stream.attachCamera(nil, track: 1)
-        // swiftlint:disable:next notification_center_detachment
-        NotificationCenter.default.removeObserver(self)
     }
 
     // swiftlint:disable:next block_based_kvo

diff --git a/Sources/IO/IOAudioMixer.swift b/Sources/IO/IOAudioMixer.swift
@@ -7,10 +7,10 @@ enum IOAudioMixerError: Swift.Error {
 }
 
 protocol IOAudioMixerDelegate: AnyObject {
-    func audioMixer(_ audioMixer: any IOAudioMixerConvertible, track: UInt8, didInput buffer: AVAudioPCMBuffer, when: AVAudioTime)
-    func audioMixer(_ audioMixer: any IOAudioMixerConvertible, didOutput audioFormat: AVAudioFormat)
-    func audioMixer(_ audioMixer: any IOAudioMixerConvertible, didOutput audioBuffer: AVAudioPCMBuffer, when: AVAudioTime)
-    func audioMixer(_ audioMixer: any IOAudioMixerConvertible, errorOccurred error: IOAudioUnitError)
+    func audioMixer(_ audioMixer: some IOAudioMixerConvertible, track: UInt8, didInput buffer: AVAudioPCMBuffer, when: AVAudioTime)
+    func audioMixer(_ audioMixer: some IOAudioMixerConvertible, didOutput audioFormat: AVAudioFormat)
+    func audioMixer(_ audioMixer: some IOAudioMixerConvertible, didOutput audioBuffer: AVAudioPCMBuffer, when: AVAudioTime)
+    func audioMixer(_ audioMixer: some IOAudioMixerConvertible, errorOccurred error: IOAudioUnitError)
 }
 
 protocol IOAudioMixerConvertible: AnyObject {

diff --git a/Sources/IO/IOAudioUnit.swift b/Sources/IO/IOAudioUnit.swift
@@ -158,19 +158,19 @@ extension IOAudioUnit: Running {
 
 extension IOAudioUnit: IOAudioMixerDelegate {
     // MARK: IOAudioMixerDelegate
-    func audioMixer(_ audioMixer: any IOAudioMixerConvertible, track: UInt8, didInput buffer: AVAudioPCMBuffer, when: AVAudioTime) {
+    func audioMixer(_ audioMixer: some IOAudioMixerConvertible, track: UInt8, didInput buffer: AVAudioPCMBuffer, when: AVAudioTime) {
         mixer?.audioUnit(self, track: track, didInput: buffer, when: when)
     }
 
-    func audioMixer(_ audioMixer: any IOAudioMixerConvertible, errorOccurred error: IOAudioUnitError) {
+    func audioMixer(_ audioMixer: some IOAudioMixerConvertible, errorOccurred error: IOAudioUnitError) {
         mixer?.audioUnit(self, errorOccurred: error)
     }
 
-    func audioMixer(_ audioMixer: any IOAudioMixerConvertible, didOutput audioFormat: AVAudioFormat) {
+    func audioMixer(_ audioMixer: some IOAudioMixerConvertible, didOutput audioFormat: AVAudioFormat) {
         monitor.inputFormat = audioFormat
     }
 
-    func audioMixer(_ audioMixer: any IOAudioMixerConvertible, didOutput audioBuffer: AVAudioPCMBuffer, when: AVAudioTime) {
+    func audioMixer(_ audioMixer: some IOAudioMixerConvertible, didOutput audioBuffer: AVAudioPCMBuffer, when: AVAudioTime) {
         mixer?.audioUnit(self, didOutput: audioBuffer, when: when)
         monitor.append(audioBuffer, when: when)
         codec.append(audioBuffer, when: when)

diff --git a/Sources/IO/MediaLink.swift b/Sources/IO/MediaLink.swift
@@ -124,7 +124,7 @@ final class MediaLink<T: MediaLinkDelegate> {
 
 extension MediaLink: ChoreographerDelegate {
     // MARK: ChoreographerDelegate
-    func choreographer(_ choreographer: any Choreographer, didFrame duration: Double) {
+    func choreographer(_ choreographer: some Choreographer, didFrame duration: Double) {
         guard let bufferQueue else {
             return
         }

diff --git a/Sources/RTMP/RTMPConnection.swift b/Sources/RTMP/RTMPConnection.swift
@@ -493,7 +493,7 @@ public class RTMPConnection: EventDispatcher {
 
 extension RTMPConnection: RTMPSocketDelegate {
     // MARK: RTMPSocketDelegate
-    func socket(_ socket: any RTMPSocketCompatible, readyState: RTMPSocketReadyState) {
+    func socket(_ socket: some RTMPSocketCompatible, readyState: RTMPSocketReadyState) {
         if logger.isEnabledFor(level: .debug) {
             logger.debug(readyState)
         }
@@ -520,7 +520,7 @@ extension RTMPConnection: RTMPSocketDelegate {
         }
     }
 
-    func socket(_ socket: any RTMPSocketCompatible, totalBytesIn: Int64) {
+    func socket(_ socket: some RTMPSocketCompatible, totalBytesIn: Int64) {
         guard windowSizeS * (sequence + 1) <= totalBytesIn else {
             return
         }
@@ -532,7 +532,7 @@ extension RTMPConnection: RTMPSocketDelegate {
         sequence += 1
     }
 
-    func socket(_ socket: any RTMPSocketCompatible, data: Data) {
+    func socket(_ socket: some RTMPSocketCompatible, data: Data) {
         guard let chunk = currentChunk ?? RTMPChunk(data, size: socket.chunkSizeC) else {
             socket.inputBuffer.append(data)
             return

diff --git a/Sources/RTMP/RTMPSocketCompatible.swift b/Sources/RTMP/RTMPSocketCompatible.swift
@@ -47,7 +47,7 @@ extension RTMPSocketCompatible {
 // MARK: -
 // swiftlint:disable:next class_delegate_protocol
 protocol RTMPSocketDelegate: EventDispatcherConvertible {
-    func socket(_ socket: any RTMPSocketCompatible, data: Data)
-    func socket(_ socket: any RTMPSocketCompatible, readyState: RTMPSocketReadyState)
-    func socket(_ socket: any RTMPSocketCompatible, totalBytesIn: Int64)
+    func socket(_ socket: some RTMPSocketCompatible, data: Data)
+    func socket(_ socket: some RTMPSocketCompatible, readyState: RTMPSocketReadyState)
+    func socket(_ socket: some RTMPSocketCompatible, totalBytesIn: Int64)
 }
diff --git a/Sources/Screen/Choreographer.swift b/Sources/Screen/Choreographer.swift
@@ -83,7 +83,7 @@ typealias DisplayLink = CADisplayLink
 #endif
 
 protocol ChoreographerDelegate: AnyObject {
-    func choreographer(_ choreographer: any Choreographer, didFrame duration: Double)
+    func choreographer(_ choreographer: some Choreographer, didFrame duration: Double)
 }
 
 protocol Choreographer: Running {