tweaks in iOS imports

Brazol · Brazol · commit 7f0a160beb54 · 2025-11-11T11:32:45.000+01:00
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/AudioProcessingAdapter.m b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/AudioProcessingAdapter.m
@@ -1,9 +1,5 @@
 #import "include/stream_webrtc_flutter/AudioProcessingAdapter.h"
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/RTCAudioRenderer.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/RTCAudioRenderer.h>
-#endif
 #import <os/lock.h>
 
 @implementation AudioProcessingAdapter {
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterDataPacketCryptor.m b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterDataPacketCryptor.m
@@ -1,11 +1,7 @@
 #import "include/stream_webrtc_flutter/FlutterDataPacketCryptor.h"
 #import "include/stream_webrtc_flutter/FlutterRTCFrameCryptor.h"
 
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 #import <objc/runtime.h>
 
 @implementation FlutterWebRTCPlugin (DataPacketCryptor)
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCDataChannel.m b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCDataChannel.m
@@ -1,9 +1,5 @@
 #import "include/stream_webrtc_flutter/FlutterRTCDataChannel.h"
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/RTCDataChannelConfiguration.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/RTCDataChannelConfiguration.h>
-#endif
 #import <objc/runtime.h>
 #import "include/stream_webrtc_flutter/FlutterRTCPeerConnection.h"
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCDesktopCapturer.m b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCDesktopCapturer.m
@@ -2,12 +2,9 @@
 
 #import "include/stream_webrtc_flutter/FlutterRTCDesktopCapturer.h"
 
-#if TARGET_OS_IPHONE
 #import <ReplayKit/ReplayKit.h>
 #import "include/stream_webrtc_flutter/Broadcast/FlutterBroadcastScreenCapturer.h"
 #import "include/stream_webrtc_flutter/FlutterRPScreenRecorder.h"
-#endif
-
 #import "include/stream_webrtc_flutter/LocalVideoTrack.h"
 #import "include/stream_webrtc_flutter/VideoProcessingAdapter.h"
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCFrameCapturer.m b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCFrameCapturer.m
@@ -1,10 +1,5 @@
-#if TARGET_OS_IPHONE
-#import <Flutter/Flutter.h>
-#elif TARGET_OS_OSX
-#import <FlutterMacOS/FlutterMacOS.h>
-#endif
-
 #import "include/stream_webrtc_flutter/FlutterRTCFrameCapturer.h"
+#import <Flutter/Flutter.h>
 
 @import CoreImage;
 @import CoreVideo;
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCMediaRecorder.m b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCMediaRecorder.m
@@ -1,9 +1,5 @@
 #import "include/stream_webrtc_flutter/FlutterRTCMediaRecorder.h"
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 #import "include/stream_webrtc_flutter/FlutterRTCAudioSink.h"
 #import "include/stream_webrtc_flutter/FlutterRTCFrameCapturer.h"
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCVideoRenderer.m b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCVideoRenderer.m
@@ -2,15 +2,9 @@
 
 #import <AVFoundation/AVFoundation.h>
 #import <CoreGraphics/CGImage.h>
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/RTCYUVHelper.h>
 #import <StreamWebRTC/RTCYUVPlanarBuffer.h>
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/RTCYUVHelper.h>
-#import <WebRTC/RTCYUVPlanarBuffer.h>
-#import <WebRTC/WebRTC.h>
-#endif
 
 #import <objc/runtime.h>
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterWebRTCPlugin.m b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterWebRTCPlugin.m
@@ -2,37 +2,28 @@
 #import "include/stream_webrtc_flutter/AudioUtils.h"
 #import "include/stream_webrtc_flutter/CameraUtils.h"
 
+#import "include/stream_webrtc_flutter/AudioManager.h"
 #import "include/stream_webrtc_flutter/FlutterDataPacketCryptor.h"
 #import "include/stream_webrtc_flutter/FlutterRTCDataChannel.h"
 #import "include/stream_webrtc_flutter/FlutterRTCDesktopCapturer.h"
 #import "include/stream_webrtc_flutter/FlutterRTCFrameCryptor.h"
+#import "include/stream_webrtc_flutter/FlutterRTCMediaRecorder.h"
 #import "include/stream_webrtc_flutter/FlutterRTCMediaStream.h"
 #import "include/stream_webrtc_flutter/FlutterRTCPeerConnection.h"
+#import "include/stream_webrtc_flutter/FlutterRTCVideoPlatformViewController.h"
+#import "include/stream_webrtc_flutter/FlutterRTCVideoPlatformViewFactory.h"
 #import "include/stream_webrtc_flutter/FlutterRTCVideoRenderer.h"
 #import "include/stream_webrtc_flutter/ProcessorProvider.h"
 #import "include/stream_webrtc_flutter/VideoEffectProcessor.h"
 #import "include/stream_webrtc_flutter/VideoFrameProcessor.h"
-#if TARGET_OS_IPHONE
-#import "include/stream_webrtc_flutter/FlutterRTCMediaRecorder.h"
-#import "include/stream_webrtc_flutter/FlutterRTCVideoPlatformViewController.h"
-#import "include/stream_webrtc_flutter/FlutterRTCVideoPlatformViewFactory.h"
-#endif
-#import "include/stream_webrtc_flutter/AudioManager.h"
 
 #import <AVFoundation/AVFoundation.h>
 #import <AVKit/AVKit.h>
 
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/RTCCallbackLogger.h>
 #import <StreamWebRTC/RTCFieldTrials.h>
 #import <StreamWebRTC/RTCLogging.h>
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/RTCCallbackLogger.h>
-#import <WebRTC/RTCFieldTrials.h>
-#import <WebRTC/RTCLogging.h>
-#import <WebRTC/WebRTC.h>
-#endif
 
 #import "include/stream_webrtc_flutter/LocalAudioTrack.h"
 #import "include/stream_webrtc_flutter/LocalTrack.h"
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/VideoEffectProcessor.m b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/VideoEffectProcessor.m
@@ -1,9 +1,5 @@
 #import "include/stream_webrtc_flutter/VideoEffectProcessor.h"
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/RTCVideoCapturer.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/RTCVideoCapturer.h>
-#endif
 
 @implementation VideoEffectProcessor
 - (instancetype)initWithProcessors:
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/AudioManager.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/AudioManager.h
@@ -1,9 +1,5 @@
 #import <Foundation/Foundation.h>
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 #import "AudioProcessingAdapter.h"
 
 @interface AudioManager : NSObject
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/AudioProcessingAdapter.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/AudioProcessingAdapter.h
@@ -1,9 +1,5 @@
 #import <Foundation/Foundation.h>
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 
 @protocol ExternalAudioProcessingDelegate
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/AudioUtils.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/AudioUtils.h
@@ -1,4 +1,3 @@
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
 
 @interface AudioUtils : NSObject
@@ -10,5 +9,3 @@
 + (void)deactiveRtcAudioSession;
 + (void)setAppleAudioConfiguration:(NSDictionary*)configuration;
 @end
-
-#endif
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterDataPacketCryptor.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterDataPacketCryptor.h
@@ -1,14 +1,5 @@
-#if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_OSX
-#import <FlutterMacOS/FlutterMacOS.h>
-#endif
-
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 
 #import "FlutterWebRTCPlugin.h"
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRPScreenRecorder.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRPScreenRecorder.h
@@ -1,4 +1,3 @@
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
 @interface FlutterRPScreenRecorder : RTCVideoCapturer
 
@@ -10,4 +9,3 @@
 - (void)stopCapture;
 
 @end
-#endif
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCAudioSink.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCAudioSink.h
@@ -1,10 +1,6 @@
 #import <CoreMedia/CoreMedia.h>
 #import <Foundation/Foundation.h>
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 
 @interface FlutterRTCAudioSink : NSObject
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCDesktopCapturer.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCDesktopCapturer.h
@@ -1,14 +1,6 @@
-#if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_OSX
-#import <FlutterMacOS/FlutterMacOS.h>
-#endif
 #import <Foundation/Foundation.h>
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 
 #import "FlutterWebRTCPlugin.h"
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCFrameCapturer.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCFrameCapturer.h
@@ -1,14 +1,5 @@
-#if TARGET_OS_IPHONE
-#import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
-
-#if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_OSX
-#import <FlutterMacOS/FlutterMacOS.h>
-#endif
+#import <StreamWebRTC/StreamWebRTC.h>
 
 @interface FlutterRTCFrameCapturer : NSObject <RTCVideoRenderer>
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCFrameCryptor.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCFrameCryptor.h
@@ -1,14 +1,5 @@
-#if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_OSX
-#import <FlutterMacOS/FlutterMacOS.h>
-#endif
-
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 
 #import "FlutterWebRTCPlugin.h"
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCMediaRecorder.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCMediaRecorder.h
@@ -1,13 +1,5 @@
-#if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_OSX
-#import <FlutterMacOS/FlutterMacOS.h>
-#endif
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 
 @import Foundation;
 @import AVFoundation;
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCVideoPlatformView.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCVideoPlatformView.h
@@ -1,9 +1,4 @@
-#if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_OSX
-#import <FlutterMacOS/FlutterMacOS.h>
-#endif
-
 #import <StreamWebRTC/StreamWebRTC.h>
 
 @interface FlutterRTCVideoPlatformView : UIView
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCVideoPlatformViewController.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCVideoPlatformViewController.h
@@ -1,9 +1,4 @@
-#if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_OSX
-#import <FlutterMacOS/FlutterMacOS.h>
-#endif
-
 #import <StreamWebRTC/StreamWebRTC.h>
 
 @interface FlutterRTCVideoPlatformViewController
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCVideoPlatformViewFactory.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCVideoPlatformViewFactory.h
@@ -1,8 +1,4 @@
-#if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_OSX
-#import <FlutterMacOS/FlutterMacOS.h>
-#endif
 
 #define FLutterRTCVideoPlatformViewFactoryID @"rtc_video_platform_view"
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCVideoRenderer.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterRTCVideoRenderer.h
@@ -1,15 +1,8 @@
-#import "FlutterWebRTCPlugin.h"
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/RTCMediaStream.h>
 #import <StreamWebRTC/RTCVideoFrame.h>
 #import <StreamWebRTC/RTCVideoRenderer.h>
 #import <StreamWebRTC/RTCVideoTrack.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/RTCMediaStream.h>
-#import <WebRTC/RTCVideoFrame.h>
-#import <WebRTC/RTCVideoRenderer.h>
-#import <WebRTC/RTCVideoTrack.h>
-#endif
+#import "FlutterWebRTCPlugin.h"
 
 @interface FlutterRTCVideoRenderer
     : NSObject <FlutterTexture, RTCVideoRenderer, FlutterStreamHandler>
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterWebRTCPlugin.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/FlutterWebRTCPlugin.h
@@ -1,15 +1,6 @@
-#if TARGET_OS_IPHONE
 #import <Flutter/Flutter.h>
-#elif TARGET_OS_OSX
-#import <FlutterMacOS/FlutterMacOS.h>
-#endif
-
 #import <Foundation/Foundation.h>
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 #import "LocalTrack.h"
 
 @class VideoEffectProcessor;
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/LocalAudioTrack.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/LocalAudioTrack.h
@@ -1,8 +1,4 @@
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 #import "AudioProcessingAdapter.h"
 #import "LocalTrack.h"
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/LocalVideoTrack.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/LocalVideoTrack.h
@@ -1,8 +1,4 @@
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 #import "LocalTrack.h"
 #import "VideoProcessingAdapter.h"
 
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/RTCAudioSource+Private.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/RTCAudioSource+Private.h
@@ -1,9 +1,5 @@
 #ifdef __cplusplus
-#if TARGET_OS_IPHONE
 #import "StreamWebRTC/RTCAudioSource.h"
-#elif TARGET_OS_MAC
-#import "WebRTC/RTCAudioSource.h"
-#endif
 #include "media_stream_interface.h"
 
 @interface RTCAudioSource ()
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/VideoEffectProcessor.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/VideoEffectProcessor.h
@@ -1,9 +1,4 @@
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/RTCVideoSource.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/RTCVideoSource.h>
-#endif
-
 #import "VideoFrameProcessor.h"
 
 @interface VideoEffectProcessor : NSObject <RTCVideoCapturerDelegate>
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/VideoFrameProcessor.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/VideoFrameProcessor.h
@@ -1,11 +1,6 @@
 
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/RTCVideoCapturer.h>
 #import <StreamWebRTC/RTCVideoFrame.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/RTCVideoCapturer.h>
-#import <WebRTC/RTCVideoFrame.h>
-#endif
 
 @protocol VideoFrameProcessorDelegate
 - (RTCVideoFrame*)capturer:(RTCVideoCapturer*)capturer didCaptureVideoFrame:(RTCVideoFrame*)frame;
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/VideoProcessingAdapter.h b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/include/stream_webrtc_flutter/VideoProcessingAdapter.h
@@ -1,9 +1,5 @@
 #import <Foundation/Foundation.h>
-#if TARGET_OS_IPHONE
 #import <StreamWebRTC/StreamWebRTC.h>
-#elif TARGET_OS_MAC
-#import <WebRTC/WebRTC.h>
-#endif
 
 @protocol ExternalVideoProcessingDelegate
 - (RTC_OBJC_TYPE(RTCVideoFrame) * _Nonnull)onFrame:(RTC_OBJC_TYPE(RTCVideoFrame) * _Nonnull)frame;
