-
Notifications
You must be signed in to change notification settings - Fork 518
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.
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
[xcode13.3] Bring Xcode 13.3 support #14325
Changes from 15 commits
25d3ba4
fab5142
d6445e2
c2f75b8
d6c16f3
5cdd265
6e92117
64008a4
5f26b21
cbdf3c6
785577a
3cabb7c
2864ae2
da193b1
1659839
bc88863
e8d7cc8
de294bb
3d65404
e463927
a544459
1244854
c44a90f
6400f98
c9a1253
784e1df
0ff8e3a
3ebf2b6
da1e8b7
b91411c
1a0d1cd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
|
||
using System; | ||
using System.Runtime.Versioning; | ||
using System.Runtime.InteropServices; | ||
|
||
using ObjCRuntime; | ||
using Foundation; | ||
|
@@ -58,4 +59,58 @@ public struct GCQuaternion { | |
public double Z; | ||
public double W; | ||
} | ||
|
||
#if NET | ||
[SupportedOSPlatform ("ios15.4")] | ||
[SupportedOSPlatform ("macos12.3")] | ||
[SupportedOSPlatform ("tvos15.4")] | ||
#else | ||
[Introduced (PlatformName.iOS, 15, 4)] | ||
[Introduced (PlatformName.MacOSX, 12, 3)] | ||
[Introduced (PlatformName.TvOS, 15, 4)] | ||
#endif | ||
[StructLayout (LayoutKind.Sequential)] | ||
public struct GCDualSenseAdaptiveTriggerPositionalAmplitudes { | ||
|
||
const int DiscretePositionCount = 10; // From GCDualSenseAdaptiveTrigger.h | ||
[MarshalAs (UnmanagedType.ByValArray, SizeConst = DiscretePositionCount)] | ||
public float [] Values; | ||
|
||
public GCDualSenseAdaptiveTriggerPositionalAmplitudes (float [] values) | ||
{ | ||
if (values is null) | ||
ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (values)); | ||
if (values.Length > DiscretePositionCount) | ||
throw new ArgumentException ($"The '{nameof (values)}' array length can't be greater than {DiscretePositionCount}."); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. https://docs.microsoft.com/en-us/dotnet/api/system.argumentoutofrangeexception?view=net-6.0 is a nicer exception in this case. |
||
|
||
Values = values; | ||
} | ||
} | ||
|
||
#if NET | ||
[SupportedOSPlatform ("ios15.4")] | ||
[SupportedOSPlatform ("macos12.3")] | ||
[SupportedOSPlatform ("tvos15.4")] | ||
#else | ||
[Introduced (PlatformName.iOS, 15, 4)] | ||
[Introduced (PlatformName.MacOSX, 12, 3)] | ||
[Introduced (PlatformName.TvOS, 15, 4)] | ||
#endif | ||
[StructLayout (LayoutKind.Sequential)] | ||
public struct GCDualSenseAdaptiveTriggerPositionalResistiveStrengths { | ||
|
||
const int DiscretePositionCount = 10; // From GCDualSenseAdaptiveTrigger.h | ||
[MarshalAs (UnmanagedType.ByValArray, SizeConst = DiscretePositionCount)] | ||
public float [] Values; | ||
|
||
public GCDualSenseAdaptiveTriggerPositionalResistiveStrengths (float [] values) | ||
{ | ||
if (values is null) | ||
ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (values)); | ||
if (values.Length > DiscretePositionCount) | ||
throw new ArgumentException ($"The '{nameof (values)}' array length can't be greater than {DiscretePositionCount}."); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can it be less that DiscretePositionCount? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
Values = values; | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7181,6 +7181,30 @@ enum AVMetadataObjectType : ulong { | |
[NoTV][NoWatch] | ||
[Field ("AVMetadataObjectTypeSalientObject")] | ||
SalientObject = 1 << 17, | ||
|
||
[TV (15,4), NoWatch, MacCatalyst (15,4), Mac (12,3), iOS (15,4)] | ||
[Field ("AVMetadataObjectTypeCodabarCode")] | ||
CodabarCode = 1 << 18, | ||
|
||
[TV (15,4), NoWatch, MacCatalyst (15,4), Mac (12,3), iOS (15,4)] | ||
[Field ("AVMetadataObjectTypeGS1DataBarCode")] | ||
GS1DataBarCode = 1 << 19, | ||
|
||
[TV (15,4), NoWatch, MacCatalyst (15,4), Mac (12,3), iOS (15,4)] | ||
[Field ("AVMetadataObjectTypeGS1DataBarExpandedCode")] | ||
GS1DataBarExpandedCode = 1 << 20, | ||
|
||
[TV (15,4), NoWatch, MacCatalyst (15,4), Mac (12,3), iOS (15,4)] | ||
[Field ("AVMetadataObjectTypeGS1DataBarLimitedCode")] | ||
GS1DataBarLimitedCode = 1 << 21, | ||
|
||
[TV (15,4), NoWatch, MacCatalyst (15,4), Mac (12,3), iOS (15,4)] | ||
[Field ("AVMetadataObjectTypeMicroQRCode")] | ||
MicroQRCode = 1 << 22, | ||
|
||
[TV (15,4), NoWatch, MacCatalyst (15,4), Mac (12,3), iOS (15,4)] | ||
[Field ("AVMetadataObjectTypeMicroPDF417Code")] | ||
MicroPdf417Code = 1 << 23, | ||
} | ||
|
||
[Introduced (PlatformName.MacCatalyst, 14, 0)] | ||
|
@@ -8976,6 +9000,14 @@ interface AVCaptureSession { | |
[Field ("AVCaptureSessionInterruptionSystemPressureStateKey")] | ||
NSString InterruptionSystemPressureStateKey { get; } | ||
|
||
[NullAllowed] | ||
[MacCatalyst (15,4), Mac (12,3), iOS (15,4)] | ||
[Export ("synchronizationClock")] | ||
CMClock SynchronizationClock { get; } | ||
|
||
[Deprecated (PlatformName.MacOSX, 12, 3, message: "Use 'SynchronizationClock' instead.")] | ||
[Deprecated (PlatformName.iOS, 15, 4, message: "Use 'SynchronizationClock' instead.")] | ||
[Deprecated (PlatformName.MacCatalyst, 15, 4, message: "Use 'SynchronizationClock' instead.")] | ||
[iOS (7,0)] | ||
[Export ("masterClock"), NullAllowed] | ||
CMClock MasterClock { get; } | ||
|
@@ -10606,6 +10638,10 @@ enum AVCaptureDeviceType { | |
[NoWatch, NoTV, NoiOS, NoMacCatalyst] | ||
[Field ("AVCaptureDeviceTypeExternalUnknown")] | ||
ExternalUnknown, | ||
|
||
[NoWatch, NoTV, NoMac, MacCatalyst (15,4), iOS (15,4)] | ||
[Field ("AVCaptureDeviceTypeBuiltInLiDARDepthCamera")] | ||
BuiltInLiDarDepthCamera, | ||
} | ||
|
||
[NoTV, iOS (7,0), Mac (10,14), NoWatch] // matches API that uses it. | ||
|
@@ -10753,6 +10789,16 @@ interface AVCaptureDevice { | |
[Export ("exposurePointOfInterest")] | ||
CGPoint ExposurePointOfInterest { get; set; } | ||
|
||
[NoWatch] | ||
[NoTV, NoMac, MacCatalyst (15,4), iOS (15,4)] | ||
Comment on lines
+10792
to
+10793
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is NoWatch in the same line (curious more than anything). There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just to follow along the style in the file, see methods above |
||
[Export ("automaticallyAdjustsFaceDrivenAutoExposureEnabled")] | ||
bool AutomaticallyAdjustsFaceDrivenAutoExposureEnabled { get; set; } | ||
|
||
[NoWatch] | ||
[NoTV, NoMac, MacCatalyst (15,4), iOS (15,4)] | ||
[Export ("faceDrivenAutoExposureEnabled")] | ||
bool FaceDrivenAutoExposureEnabled { [Bind ("isFaceDrivenAutoExposureEnabled")] get; set; } | ||
|
||
[NoWatch] | ||
[Export ("adjustingExposure")] | ||
bool AdjustingExposure { [Bind ("isAdjustingExposure")] get; } | ||
|
@@ -10866,6 +10912,14 @@ interface AVCaptureDevice { | |
[Export ("smoothAutoFocusEnabled")] | ||
bool SmoothAutoFocusEnabled { [Bind ("isSmoothAutoFocusEnabled")] get; set; } | ||
|
||
[NoWatch, NoTV, NoMac, MacCatalyst (15,4), iOS (15,4)] | ||
[Export ("automaticallyAdjustsFaceDrivenAutoFocusEnabled")] | ||
bool AutomaticallyAdjustsFaceDrivenAutoFocusEnabled { get; set; } | ||
|
||
[NoWatch, NoTV, NoMac, MacCatalyst (15,4), iOS (15,4)] | ||
[Export ("faceDrivenAutoFocusEnabled")] | ||
bool FaceDrivenAutoFocusEnabled { [Bind ("isFaceDrivenAutoFocusEnabled")] get; set; } | ||
|
||
// Either AVMediaTypeVideo or AVMediaTypeAudio. | ||
[iOS (7,0), NoWatch] | ||
[Static] | ||
|
@@ -11226,23 +11280,26 @@ interface AVCaptureDevice { | |
|
||
// from AVCaptureDevice_AVCaptureDeviceCenterStage | ||
|
||
[NoWatch, NoTV, NoMac] | ||
[NoWatch, NoTV] | ||
[iOS (14,5)] | ||
[MacCatalyst (14,5)] | ||
[Mac (12,3)] | ||
[Static] | ||
[Export ("centerStageControlMode", ArgumentSemantic.Assign)] | ||
AVCaptureCenterStageControlMode CenterStageControlMode { get; set; } | ||
|
||
[NoWatch, NoTV, NoMac] | ||
[NoWatch, NoTV] | ||
[iOS (14,5)] | ||
[MacCatalyst (14,5)] | ||
[Mac (12,3)] | ||
[Static] | ||
[Export ("centerStageEnabled")] | ||
bool CenterStageEnabled { [Bind ("isCenterStageEnabled")] get; set; } | ||
|
||
[NoWatch, NoTV, NoMac] | ||
[NoWatch, NoTV] | ||
[iOS (14,5)] | ||
[MacCatalyst (14,5)] | ||
[Mac (12,3)] | ||
[Export ("centerStageActive")] | ||
bool CenterStageActive { [Bind ("isCenterStageActive")] get; } | ||
|
||
|
@@ -11433,27 +11490,31 @@ interface AVCaptureDeviceFormat { | |
|
||
// from AVCaptureDeviceFormat_AVCaptureDeviceFormatCenterStage | ||
|
||
[NoWatch, NoTV, NoMac] | ||
[NoWatch, NoTV] | ||
[iOS (14,5)] | ||
[MacCatalyst (14,5)] | ||
[Mac (12,3)] | ||
[Export ("centerStageSupported")] | ||
bool CenterStageSupported { [Bind ("isCenterStageSupported")] get; } | ||
|
||
[NoWatch, NoTV, NoMac] | ||
[NoWatch, NoTV] | ||
[iOS (14,5)] | ||
[MacCatalyst (14,5)] | ||
[Mac (12,3)] | ||
[Export ("videoMinZoomFactorForCenterStage")] | ||
nfloat VideoMinZoomFactorForCenterStage { get; } | ||
|
||
[NoWatch, NoTV, NoMac] | ||
[NoWatch, NoTV] | ||
[iOS (14,5)] | ||
[MacCatalyst (14,5)] | ||
[Mac (12,3)] | ||
[Export ("videoMaxZoomFactorForCenterStage")] | ||
nfloat VideoMaxZoomFactorForCenterStage { get; } | ||
|
||
[NoWatch, NoTV, NoMac] | ||
[NoWatch, NoTV] | ||
[iOS (14,5)] | ||
[MacCatalyst (14,5)] | ||
[Mac (12,3)] | ||
[Export ("videoFrameRateRangeForCenterStage")] | ||
[NullAllowed] | ||
AVFrameRateRange VideoFrameRateRangeForCenterStage { get; } | ||
|
@@ -14982,9 +15043,10 @@ interface AVAudioRoutingArbiter | |
void LeaveArbitration (); | ||
} | ||
|
||
[NoWatch, NoTV, NoMac] | ||
[NoWatch, NoTV] | ||
[iOS (14,5)] | ||
[MacCatalyst (14,5)] | ||
[Mac (12,3)] | ||
[Native] | ||
public enum AVCaptureCenterStageControlMode : long { | ||
User = 0, | ||
|
@@ -15325,6 +15387,10 @@ interface AVPlayerPlaybackCoordinatorDelegate | |
{ | ||
[Export ("playbackCoordinator:identifierForPlayerItem:")] | ||
string GetIdentifier (AVPlayerPlaybackCoordinator coordinator, AVPlayerItem playerItem); | ||
|
||
[TV (15,4), NoWatch, Mac (12,3), iOS (15,4), MacCatalyst (15,4)] | ||
[Export ("playbackCoordinator:interstitialTimeRangesForPlayerItem:")] | ||
NSValue [] GetInterstitialTimeRanges (AVPlayerPlaybackCoordinator coordinator, AVPlayerItem playerItem); | ||
} | ||
|
||
[TV (15,0), NoWatch, Mac (12,0), iOS (15,0), MacCatalyst (15,0)] | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What happened to 15.3?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No idea, what is shipped on Xcode 13.3 is 15.4 I wonder if they are moving to even numbers releases just like us, it seems that there is not 15.1 either heh