[AVKit] Update for Xcode 11 up to beta 7 (#6748)

This commit is contained in:
Jonathan CONTE 2019-08-28 16:24:02 +02:00 коммит произвёл Vincent Dondain
Родитель b8e9c83ce0
Коммит dab13aa9b8
6 изменённых файлов: 201 добавлений и 72 удалений

Просмотреть файл

@ -33,15 +33,38 @@ namespace AVKit {
}
#endif
#if !TVOS && (!MONOMAC || !XAMCORE_4_0)
#if !MONOMAC || !XAMCORE_4_0
[iOS (9,0)]
[TV (13,0)]
[Native]
[ErrorDomain ("AVKitErrorDomain")]
public enum AVKitError : long {
None = 0,
Unknown = -1000,
PictureInPictureStartFailed = -1001
PictureInPictureStartFailed = -1001,
ContentRatingUnknown = -1100,
ContentDisallowedByPasscode = -1101,
ContentDisallowedByProfile = -1102,
}
#endif
[NoWatch, NoTV, NoMac]
[iOS (13,0)]
[Native]
public enum AVAudioSessionRouteSelection : long {
None = 0,
Local = 1,
External = 2,
}
[NoiOS, NoWatch, NoTV]
[Mac (10,15)]
[Native]
public enum AVRoutePickerViewButtonState : long {
Normal,
NormalHighlighted,
Active,
ActiveHighlighted,
}
}

Просмотреть файл

@ -10870,8 +10870,9 @@ namespace AVFoundation {
[Export ("navigationMarkerGroups", ArgumentSemantic.Copy)]
AVNavigationMarkersGroup[] NavigationMarkerGroups { get; set; }
[NoiOS][NoMac]
[NoMac]
[TV (9,0)]
[iOS (13,0)]
[Export ("externalMetadata", ArgumentSemantic.Copy)]
AVMetadataItem[] ExternalMetadata { get; set; }
@ -10931,6 +10932,19 @@ namespace AVFoundation {
AVContentAuthorizationStatus GetContentAuthorizationRequestStatus ();
}
[NoWatch, NoMac, NoiOS]
[TV (13,0)]
[Category]
[BaseType (typeof (AVPlayerItem))]
interface AVPlayerItem_AVPlaybackRestrictions {
[Async]
[Export ("requestPlaybackRestrictionsAuthorization:")]
void RequestPlaybackRestrictionsAuthorization (Action<bool, NSError> completion);
[Export ("cancelPlaybackRestrictionsAuthorizationRequest")]
void CancelPlaybackRestrictionsAuthorizationRequest ();
}
[NoWatch]
[iOS (6,0)]
[BaseType (typeof (NSObject))]

Просмотреть файл

@ -11,16 +11,33 @@ using CoreMedia;
using CoreVideo;
using AVFoundation;
#if !MONOMAC
using AVCaptureViewControlsStyle = Foundation.NSObject;
using AVPlayerViewControlsStyle = Foundation.NSObject;
using AVPlayerViewTrimResult = Foundation.NSObject;
using NSColor = UIKit.UIColor;
using NSMenu = Foundation.NSObject;
using NSView = UIKit.UIView;
using OpenGLES;
using UIKit;
#else
using AppKit;
#endif
using AVAudioSession = Foundation.NSObject;
using AVContentProposal = Foundation.NSObject;
using AVPlayerViewController = Foundation.NSObject;
using IUIViewControllerTransitionCoordinator = Foundation.NSObject;
using UIColor = AppKit.NSColor;
using UIImage = AppKit.NSImage;
using UILayoutGuide = Foundation.NSObject;
using UITraitCollection = Foundation.NSObject;
using UIView = AppKit.NSView;
using UIViewController = Foundation.NSObject;
using UIWindow = Foundation.NSObject;
#endif // !MONOMAC
namespace AVKit {
#if !MONOMAC
[NoTV]
[iOS (9,0)]
[Mac (10,15)]
[BaseType (typeof(NSObject))]
[DisableDefaultCtor]
#if XAMCORE_4_0
@ -41,8 +58,7 @@ namespace AVKit {
[Wrap ("WeakDelegate")]
[NullAllowed]
[Protocolize]
AVPictureInPictureControllerDelegate Delegate { get; set; }
IAVPictureInPictureControllerDelegate Delegate { get; set; }
[NullAllowed, Export ("delegate", ArgumentSemantic.Weak)]
NSObject WeakDelegate { get; set; }
@ -62,17 +78,31 @@ namespace AVKit {
[Export ("pictureInPictureSuspended")]
bool PictureInPictureSuspended { [Bind ("isPictureInPictureSuspended")] get; }
[iOS (13,0)]
[Static]
[Export ("pictureInPictureButtonStartImage")]
UIImage PictureInPictureButtonStartImage { get; }
[iOS (13,0)]
[Static]
[Export ("pictureInPictureButtonStopImage")]
UIImage PictureInPictureButtonStopImage { get; }
[NoMac]
[Static]
[Export ("pictureInPictureButtonStartImageCompatibleWithTraitCollection:")]
UIImage CreateStartButton ([NullAllowed] UITraitCollection traitCollection);
[NoMac]
[Static]
[Export ("pictureInPictureButtonStopImageCompatibleWithTraitCollection:")]
UIImage CreateStopButton ([NullAllowed] UITraitCollection traitCollection);
}
interface IAVPictureInPictureControllerDelegate {}
[NoTV]
[iOS (9,0), Mac (10,15)]
[Protocol, Model]
[BaseType (typeof(NSObject))]
interface AVPictureInPictureControllerDelegate
@ -95,8 +125,8 @@ namespace AVKit {
[Export ("pictureInPictureController:restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:")]
void RestoreUserInterfaceForPictureInPicture (AVPictureInPictureController pictureInPictureController, Action<bool> completionHandler);
}
[NoMac]
[iOS (8,0)]
[BaseType (typeof (UIViewController))]
interface AVPlayerViewController {
@ -208,8 +238,17 @@ namespace AVKit {
[NoiOS, TV (11,2), NoMac, NoWatch]
[Export ("appliesPreferredDisplayCriteriaAutomatically")]
bool AppliesPreferredDisplayCriteriaAutomatically { get; set; }
[iOS (9,0), TV (13,0), NoWatch]
[NullAllowed, Export ("pixelBufferAttributes", ArgumentSemantic.Copy)]
NSDictionary<NSString, NSObject> PixelBufferAttributes { get; set; }
[NoiOS, TV (13,0), NoWatch]
[NullAllowed, Export ("customOverlayViewController", ArgumentSemantic.Strong)]
UIViewController CustomOverlayViewController { get; set; }
}
[NoMac]
[Protocol, Model]
[BaseType (typeof(NSObject))]
interface AVPlayerViewControllerDelegate
@ -309,6 +348,40 @@ namespace AVKit {
[NoiOS, TV (11,0), NoWatch, NoMac]
[Export ("playerViewController:willTransitionToVisibilityOfTransportBar:withAnimationCoordinator:")]
void WillTransitionToVisibilityOfTransportBar ([NullAllowed] AVPlayerViewController playerViewController, bool visible, [NullAllowed] IAVPlayerViewControllerAnimationCoordinator coordinator);
[iOS (13,0), NoTV, NoWatch, NoMac]
[Export ("playerViewController:willBeginFullScreenPresentationWithAnimationCoordinator:"), EventArgs ("AVPlayerViewFullScreenPresentationWillBegin")]
void WillBeginFullScreenPresentation (AVPlayerViewController playerViewController, IUIViewControllerTransitionCoordinator coordinator);
[iOS (13,0), NoTV, NoWatch, NoMac]
[Export ("playerViewController:willEndFullScreenPresentationWithAnimationCoordinator:"), EventArgs ("AVPlayerViewFullScreenPresentationWillEnd")]
void WillEndFullScreenPresentation (AVPlayerViewController playerViewController, IUIViewControllerTransitionCoordinator coordinator);
[TV (13,0), NoiOS, NoWatch, NoMac]
[Export ("nextChannelInterstitialViewControllerForPlayerViewController:")]
UIViewController GetNextChannelInterstitialViewController (AVPlayerViewController playerViewController);
[TV (13,0), NoiOS, NoWatch, NoMac]
[Export ("playerViewController:skipToNextChannel:"), EventArgs ("AVPlayerViewSkipToNextChannel")]
void SkipToNextChannel (AVPlayerViewController playerViewController, Action<bool> completion);
[TV (13,0), NoiOS, NoWatch, NoMac]
[Export ("playerViewController:skipToPreviousChannel:"), EventArgs ("AVPlayerViewSkipToPreviousChannel")]
void SkipToPreviousChannel (AVPlayerViewController playerViewController, Action<bool> completion);
[TV (13,0), NoiOS, NoWatch, NoMac]
[Export ("previousChannelInterstitialViewControllerForPlayerViewController:")]
UIViewController GetPreviousChannelInterstitialViewController (AVPlayerViewController playerViewController);
}
[NoWatch, NoTV, NoMac, iOS (13,0)]
[Category]
[BaseType (typeof(AVAudioSession))]
interface AVAudioSession_AVPlaybackRouteSelecting {
[Async (ResultTypeName="PreparingRouteSelectionForPlayback")]
[Export ("prepareRouteSelectionForPlaybackWithCompletionHandler:")]
void PrepareRouteSelectionForPlayback (Action<bool, AVAudioSessionRouteSelection> completionHandler);
}
interface IAVPlayerViewControllerAnimationCoordinator { }
@ -322,8 +395,7 @@ namespace AVKit {
void AddCoordinatedAnimations (Action animations, Action<bool> completion);
}
#else
[NoiOS, NoWatch, NoTV]
[Mac (10,9)]
[BaseType (typeof (NSView))]
interface AVPlayerView {
@ -383,8 +455,56 @@ namespace AVKit {
[Mac (10,9)]
[Export ("showsSharingServiceButton")]
bool ShowsSharingServiceButton { get; set; }
[Mac (10,15)]
[Export ("allowsPictureInPicturePlayback")]
bool AllowsPictureInPicturePlayback { get; set; }
[Mac (10,15)]
[Wrap ("WeakPictureInPictureDelegate")]
[NullAllowed]
IAVPlayerViewPictureInPictureDelegate PictureInPictureDelegate { get; set; }
[Mac (10,15)]
[NullAllowed, Export ("pictureInPictureDelegate", ArgumentSemantic.Weak)]
NSObject WeakPictureInPictureDelegate { get; set; }
[Mac (10,15)]
[Export ("showsTimecodes")]
bool ShowsTimecodes { get; set; }
}
interface IAVPlayerViewPictureInPictureDelegate {}
[NoiOS, NoWatch, NoTV]
[Mac (10,15)]
[Protocol, Model (AutoGeneratedName = true)]
[BaseType (typeof(NSObject))]
interface AVPlayerViewPictureInPictureDelegate {
[Export ("playerViewWillStartPictureInPicture:")]
void WillStart (AVPlayerView playerView);
[Export ("playerViewDidStartPictureInPicture:")]
void DidStart (AVPlayerView playerView);
[Export ("playerView:failedToStartPictureInPictureWithError:"), EventArgs ("AVPlayerViewFailedToStart")]
void FailedToStart (AVPlayerView playerView, NSError error);
[Export ("playerViewWillStopPictureInPicture:")]
void WillStop (AVPlayerView playerView);
[Export ("playerViewDidStopPictureInPicture:")]
void DidStop (AVPlayerView playerView);
[Export ("playerView:restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:"), EventArgs ("AVPlayerViewRestoreUserInterface")]
void RestoreUserInterface (AVPlayerView playerView, Action<bool> completionHandler);
[Export ("playerViewShouldAutomaticallyDismissAtPictureInPictureStart:")]
bool ShouldAutomaticallyDismiss (AVPlayerView playerView);
}
[NoiOS, NoWatch, NoTV]
[Mac (10,10)]
[BaseType (typeof (NSView))]
interface AVCaptureView {
@ -413,6 +533,7 @@ namespace AVKit {
interface IAVCaptureViewDelegate { }
[NoiOS, NoWatch, NoTV]
[Protocol, Model]
[Mac (10,10)]
[BaseType (typeof (NSObject))]
@ -421,7 +542,6 @@ namespace AVKit {
[Export ("captureView:startRecordingToFileOutput:")]
void StartRecording (AVCaptureView captureView, AVCaptureFileOutput fileOutput);
}
#endif
[NoiOS][NoMac]
[TV (9,0)]
@ -458,7 +578,7 @@ namespace AVKit {
AVDateRangeMetadataGroup[] DateRangeNavigationMarkers { get; }
}
#if !MONOMAC
[NoMac]
[NoiOS, TV (10,0), NoWatch]
[BaseType (typeof(UIViewController))]
interface AVContentProposalViewController
@ -487,6 +607,7 @@ namespace AVKit {
}
[Static]
[NoMac]
[NoiOS, TV (10,1), NoWatch]
interface AVKitMetadataIdentifier {
@ -518,6 +639,7 @@ namespace AVKit {
NSString ServiceIdentifier { get; }
}
[Mac (10,15)]
[TV (11,0), iOS (11,0)]
[BaseType (typeof (UIView))]
interface AVRoutePickerView {
@ -525,17 +647,45 @@ namespace AVKit {
[Export ("initWithFrame:")]
IntPtr Constructor (CGRect frame);
[NullAllowed, Export ("delegate", ArgumentSemantic.Weak)]
[Wrap ("WeakDelegate", IsVirtual = true)]
[NullAllowed]
IAVRoutePickerViewDelegate Delegate { get; set; }
[NullAllowed, Export ("delegate", ArgumentSemantic.Weak)]
NSObject WeakDelegate { get; set; }
[NoMac]
[Export ("activeTintColor", ArgumentSemantic.Assign), NullAllowed]
UIColor ActiveTintColor { get; set; }
[NoiOS]
[NoMac, NoWatch]
[Export ("routePickerButtonStyle", ArgumentSemantic.Assign)]
AVRoutePickerViewButtonStyle RoutePickerButtonStyle { get; set; }
[NoMac]
[TV (13,0), iOS (13,0)]
[Export ("prioritizesVideoDevices")]
bool PrioritizesVideoDevices { get; set; }
[NoiOS, NoTV, NoWatch]
[Export ("routePickerButtonColorForState:")]
NSColor GetRoutePickerButtonColor (AVRoutePickerViewButtonState state);
[NoiOS, NoTV, NoWatch]
[Export ("setRoutePickerButtonColor:forState:")]
void SetRoutePickerButtonColor ([NullAllowed] NSColor color, AVRoutePickerViewButtonState state);
[NoiOS, NoTV, NoWatch]
[Export ("routePickerButtonBordered")]
bool RoutePickerButtonBordered { [Bind ("isRoutePickerButtonBordered")] get; set; }
[NoiOS, NoTV, NoWatch]
[NullAllowed, Export ("player", ArgumentSemantic.Assign)]
AVPlayer Player { get; set; }
}
[NoMac]
[TV (11,0), NoiOS]
[Native]
public enum AVRoutePickerViewButtonStyle : long {
@ -547,6 +697,7 @@ namespace AVKit {
interface IAVRoutePickerViewDelegate { }
[TV (11,0), iOS (11,0)]
[Mac (10,15)]
[Protocol, Model]
[BaseType (typeof (NSObject))]
interface AVRoutePickerViewDelegate {
@ -597,5 +748,4 @@ namespace AVKit {
[Export ("avDisplayManager")]
AVDisplayManager GetAVDisplayManager ();
}
#endif
}

Просмотреть файл

@ -1,12 +0,0 @@
!missing-enum! AVAudioSessionRouteSelection not bound
!missing-protocol-member! AVPlayerViewControllerDelegate::playerViewController:willBeginFullScreenPresentationWithAnimationCoordinator: not found
!missing-protocol-member! AVPlayerViewControllerDelegate::playerViewController:willEndFullScreenPresentationWithAnimationCoordinator: not found
!missing-selector! +AVPictureInPictureController::pictureInPictureButtonStartImage not bound
!missing-selector! +AVPictureInPictureController::pictureInPictureButtonStopImage not bound
!missing-selector! AVAudioSession::prepareRouteSelectionForPlaybackWithCompletionHandler: not bound
!missing-selector! AVPlayerItem::externalMetadata not bound
!missing-selector! AVPlayerItem::setExternalMetadata: not bound
!missing-selector! AVPlayerViewController::pixelBufferAttributes not bound
!missing-selector! AVPlayerViewController::setPixelBufferAttributes: not bound
!missing-selector! AVRoutePickerView::prioritizesVideoDevices not bound
!missing-selector! AVRoutePickerView::setPrioritizesVideoDevices: not bound

Просмотреть файл

@ -1,32 +0,0 @@
!missing-enum! AVRoutePickerViewButtonState not bound
!missing-protocol! AVPictureInPictureControllerDelegate not bound
!missing-protocol! AVPlayerViewPictureInPictureDelegate not bound
!missing-protocol! AVRoutePickerViewDelegate not bound
!missing-selector! +AVPictureInPictureController::isPictureInPictureSupported not bound
!missing-selector! +AVPictureInPictureController::pictureInPictureButtonStartImage not bound
!missing-selector! +AVPictureInPictureController::pictureInPictureButtonStopImage not bound
!missing-selector! AVPictureInPictureController::delegate not bound
!missing-selector! AVPictureInPictureController::initWithPlayerLayer: not bound
!missing-selector! AVPictureInPictureController::isPictureInPictureActive not bound
!missing-selector! AVPictureInPictureController::isPictureInPicturePossible not bound
!missing-selector! AVPictureInPictureController::isPictureInPictureSuspended not bound
!missing-selector! AVPictureInPictureController::playerLayer not bound
!missing-selector! AVPictureInPictureController::setDelegate: not bound
!missing-selector! AVPictureInPictureController::startPictureInPicture not bound
!missing-selector! AVPictureInPictureController::stopPictureInPicture not bound
!missing-selector! AVPlayerView::allowsPictureInPicturePlayback not bound
!missing-selector! AVPlayerView::pictureInPictureDelegate not bound
!missing-selector! AVPlayerView::setAllowsPictureInPicturePlayback: not bound
!missing-selector! AVPlayerView::setPictureInPictureDelegate: not bound
!missing-selector! AVPlayerView::setShowsTimecodes: not bound
!missing-selector! AVPlayerView::showsTimecodes not bound
!missing-selector! AVRoutePickerView::delegate not bound
!missing-selector! AVRoutePickerView::isRoutePickerButtonBordered not bound
!missing-selector! AVRoutePickerView::player not bound
!missing-selector! AVRoutePickerView::routePickerButtonColorForState: not bound
!missing-selector! AVRoutePickerView::setDelegate: not bound
!missing-selector! AVRoutePickerView::setPlayer: not bound
!missing-selector! AVRoutePickerView::setRoutePickerButtonBordered: not bound
!missing-selector! AVRoutePickerView::setRoutePickerButtonColor:forState: not bound
!missing-type! AVPictureInPictureController not bound
!missing-type! AVRoutePickerView not bound

Просмотреть файл

@ -1,14 +0,0 @@
!missing-enum! AVKitError not bound
!missing-field! AVKitErrorDomain not bound
!missing-protocol-member! AVPlayerViewControllerDelegate::nextChannelInterstitialViewControllerForPlayerViewController: not found
!missing-protocol-member! AVPlayerViewControllerDelegate::playerViewController:skipToNextChannel: not found
!missing-protocol-member! AVPlayerViewControllerDelegate::playerViewController:skipToPreviousChannel: not found
!missing-protocol-member! AVPlayerViewControllerDelegate::previousChannelInterstitialViewControllerForPlayerViewController: not found
!missing-selector! AVPlayerItem::cancelPlaybackRestrictionsAuthorizationRequest not bound
!missing-selector! AVPlayerItem::requestPlaybackRestrictionsAuthorization: not bound
!missing-selector! AVPlayerViewController::customOverlayViewController not bound
!missing-selector! AVPlayerViewController::pixelBufferAttributes not bound
!missing-selector! AVPlayerViewController::setCustomOverlayViewController: not bound
!missing-selector! AVPlayerViewController::setPixelBufferAttributes: not bound
!missing-selector! AVRoutePickerView::prioritizesVideoDevices not bound
!missing-selector! AVRoutePickerView::setPrioritizesVideoDevices: not bound