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.

Sign up for GitHub

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

Jump to bottom

Remove additions of AVKit removed in beta5 #2536

Merged
merged 1 commit into from
Aug 25, 2017
Merged

Remove additions of AVKit removed in beta5 #2536

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 4 additions & 35 deletions src/avkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ interface AVNavigationMarkersGroup {
}

#if !MONOMAC
[NoiOS, TV (10,0), NoWatch, NoMac]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Inside !MONOMAC block.

[NoiOS, TV (10,0), NoWatch]
[BaseType (typeof(UIViewController))]
interface AVContentProposalViewController
{
Expand Down Expand Up @@ -479,7 +479,7 @@ interface AVContentProposalViewController
}

[Static]
[NoiOS, TV (10,1), NoWatch, NoMac]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Inside !MONOMAC block.

[NoiOS, TV (10,1), NoWatch]
interface AVKitMetadataIdentifier {

[Field ("AVKitMetadataIdentifierExternalContentIdentifier")]
Expand Down Expand Up @@ -535,42 +535,10 @@ public enum AVRoutePickerViewButtonStyle : nint {
Plain,
Custom,
}
#else

[Mac (10,13)]
[BaseType (typeof (NSView))]
interface AVRoutePickerView {

[Export ("initWithFrame:")]
IntPtr Constructor (CGRect frame);

[Export ("delegate", ArgumentSemantic.Weak), NullAllowed]
IAVRoutePickerViewDelegate Delegate { get; set; }

[Export ("routePickerButtonColorForState:")]
NSColor GetRoutePickerButtonColor (AVRoutePickerViewButtonState state);

[Export ("setRoutePickerButtonColor:forState:")]
void SetRoutePickerButtonColor ([NullAllowed] NSColor color, AVRoutePickerViewButtonState state);

[Export ("routePickerButtonBordered")]
bool RoutePickerButtonBordered { [Bind ("isRoutePickerButtonBordered")] get; set; }
}

[Mac (10,13)]
[Native]
public enum AVRoutePickerViewButtonState : nint {
Normal,
NormalHighlighted,
Active,
ActiveHighlighted
}

#endif

interface IAVRoutePickerViewDelegate { }

[TV (11,0), iOS (11,0), Mac (10,13)]
[TV (11,0), iOS (11,0)]
[Protocol, Model]
[BaseType (typeof (NSObject))]
interface AVRoutePickerViewDelegate {
Expand All @@ -581,4 +549,5 @@ interface AVRoutePickerViewDelegate {
[Export ("routePickerViewDidEndPresentingRoutes:")]
void DidEndPresentingRoutes (AVRoutePickerView routePickerView);
}
#endif
Copy link
Contributor Author

Choose a reason for hiding this comment

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

New end of !MONOMAC block.

}