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.

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

[AVFoundation] Add support for xcode 13 beta 5. #12550

Merged
merged 20 commits into from
Sep 15, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1a970ff
[AVFoundation] Add support for xcdoe 13 beta 5.
mandel-macaque Aug 16, 2021
87c642c
Add missing using.
mandel-macaque Aug 25, 2021
aaa698a
Generator crashes when we use support os with no version.
mandel-macaque Aug 25, 2021
1ee4425
Address reviews.
mandel-macaque Aug 26, 2021
4fdca6e
Apply suggestions from code review
mandel-macaque Aug 27, 2021
adfeed7
Update src/avfoundation.cs
mandel-macaque Aug 27, 2021
a320726
Merge branch 'main' into avfoundation-xcode13-beta5
mandel-macaque Aug 27, 2021
bc8c875
Merge branch 'avfoundation-xcode13-beta5' of github.com:mandel-macaqu…
mandel-macaque Aug 27, 2021
b1dcdac
Fix compilation after applying comments.
mandel-macaque Aug 27, 2021
4d54edf
Fix intro tests by removing not present selector.
mandel-macaque Aug 30, 2021
c0e1067
Address reviews.
mandel-macaque Aug 31, 2021
2f84fd6
Merge branch 'main' into avfoundation-xcode13-beta5
mandel-macaque Sep 8, 2021
9457b4f
Fix issue with the catalyst intro tests.
mandel-macaque Sep 9, 2021
5c7d5c3
Merge branch 'main' into avfoundation-xcode13-beta5
mandel-macaque Sep 9, 2021
ebf0fd3
Fix API after xtro was fixed.
mandel-macaque Sep 13, 2021
f8cd240
Merge branch 'main' into avfoundation-xcode13-beta5
mandel-macaque Sep 13, 2021
b9c67d8
Address reviews.
mandel-macaque Sep 13, 2021
9690ab2
Simplify preprocessor #if
mandel-macaque Sep 13, 2021
656b890
Merge branch 'main' into avfoundation-xcode13-beta5
mandel-macaque Sep 14, 2021
de398b7
Remove not needed attrs.
mandel-macaque Sep 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/AVFoundation/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1232,6 +1232,7 @@ public enum AVContentKeyResponseDataType {
[Flags]
[Native]
public enum AVDelegatingPlaybackCoordinatorRateChangeOptions : ulong {
spouliot marked this conversation as resolved.
Show resolved Hide resolved
None = 0,
PlayImmediately = (1uL << 0),
}

Expand All @@ -1243,6 +1244,7 @@ public enum AVDelegatingPlaybackCoordinatorRateChangeOptions : ulong {
[Flags]
[Native]
public enum AVDelegatingPlaybackCoordinatorSeekOptions : ulong {
spouliot marked this conversation as resolved.
Show resolved Hide resolved
None = 0,
ResumeImmediately = (1uL << 0),
}

Expand Down
18 changes: 11 additions & 7 deletions src/avfoundation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11381,14 +11381,17 @@ interface AVPlayerRateDidChangeEventArgs {
NSString RateDidChangeOriginatingParticipant { get; }
}

[iOS (10, 0), TV (10,0), Mac (10,12), MacCatalyst (15,0)]
[iOS (10, 0), TV (10,0), Mac (10,12), MacCatalyst (14,0)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why 14,0 ? the oldest member is 14,5

enum AVPlayerWaitingReason {
[MacCatalyst (15,0)]
[Field ("AVPlayerWaitingToMinimizeStallsReason")]
WaitingToMinimizeStalls,

[MacCatalyst (15,0)]
[Field ("AVPlayerWaitingWhileEvaluatingBufferingRateReason")]
WaitingWhileEvaluatingBufferingRate,

[MacCatalyst (15,0)]
[Field ("AVPlayerWaitingWithNoItemToPlayReason")]
WaitingWithNoItemToPlay,

Expand Down Expand Up @@ -15142,7 +15145,7 @@ interface AVPlaybackCoordinator
AVCoordinatedPlaybackSuspension BeginSuspension (string suspensionReason);

[Export ("expectedItemTimeAtHostTime:")]
CMTime ExpectedItemTimeAtHostTime (CMTime hostClockTime);
CMTime GetExpectedItemTime (CMTime hostClockTime);

// AVPlaybackCoordinator_AVCoordinatedPlaybackPolicies
[Export ("setParticipantLimit:forWaitingOutSuspensionsWithReason:")]
Expand Down Expand Up @@ -15218,7 +15221,7 @@ interface AVAssetReaderOutputCaptionAdaptor

[NoMacCatalyst]
[Export ("captionsNotPresentInPreviousGroupsInCaptionGroup:")]
AVCaption[] GetCaptionsNotPresent (AVCaptionGroup captionGroup);
AVCaption[] GetCaptionsNotPresentInPreviousGroups (AVCaptionGroup captionGroup);

// interface AVAssetReaderOutputCaptionAdaptor_AVAssetReaderCaptionValidation
[Wrap ("WeakValidationDelegate")]
Expand Down Expand Up @@ -15255,6 +15258,7 @@ interface AVAssetWriterInputCaptionAdaptor

[NoWatch, NoTV, NoiOS, Mac (12,0), NoMacCatalyst]
[BaseType (typeof(NSObject))]
spouliot marked this conversation as resolved.
Show resolved Hide resolved
[DisableDefaultCtor]
interface AVCaptionGroup
{
[Export ("initWithCaptions:timeRange:")]
Expand Down Expand Up @@ -15399,19 +15403,19 @@ interface AVCaptionRegion : NSCopying, NSMutableCopying, NSSecureCoding
{
[Static]
[Export ("appleITTTopRegion")]
AVCaptionRegion AppleiTTTopRegion { get; }
AVCaptionRegion AppleITTTopRegion { get; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Itt

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's the same iTT as above, it should be AppleiTTTopRegion...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the same iTT, it stands I believe for iTunes Timed Text

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a 3 letters acronym so it would be Itt


[Static]
[Export ("appleITTBottomRegion")]
AVCaptionRegion AppleiTTBottomRegion { get; }
AVCaptionRegion AppleITTBottomRegion { get; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same


[Static]
[Export ("appleITTLeftRegion")]
AVCaptionRegion AppleiTTLeftRegion { get; }
AVCaptionRegion AppleITTLeftRegion { get; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same


[Static]
[Export ("appleITTRightRegion")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe not anything but, for me, Github shows the color of the code only being black from this point on. Is there perhaps a syntax thing going on somewhere?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, is that the file is too long and probably the js is not dealing with it.

AVCaptionRegion AppleiTTRightRegion { get; }
AVCaptionRegion AppleITTRightRegion { get; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same


[Static]
[Export ("subRipTextBottomRegion")]
Expand Down