Skip to content

AVKit macOS xcode14.0 beta2

TJ Lambert edited this page Aug 30, 2022 · 3 revisions

#AVKit.framework https://github.com/xamarin/xamarin-macios/pull/15811

diff -ruN /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVKit.h /Applications/Xcode_14.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVKit.h
--- /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVKit.h	2022-05-21 08:58:58.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVKit.h	2022-06-13 00:36:01.000000000 -0400
@@ -36,7 +36,6 @@
 #import <AVKit/AVPictureInPictureController_AVSampleBufferDisplayLayerSupport.h>
 #import <AVKit/AVPictureInPictureController_VideoCallSupport.h>
 #import <AVKit/AVPlaybackSpeed.h>
-#import <AVKit/AVPlaybackSpeedCollection.h>
 #import <AVKit/AVPlayerItem+AVKitAdditions.h>
 #import <AVKit/AVPlayerViewController.h>
 #import <AVKit/AVPlaybackRouteSelecting.h>
@@ -47,7 +46,6 @@
 #import <AVKit/AVPictureInPictureController.h>
 #import <AVKit/AVPictureInPictureController_AVSampleBufferDisplayLayerSupport.h>
 #import <AVKit/AVPlaybackSpeed.h>
-#import <AVKit/AVPlaybackSpeedCollection.h>
 #import <AVKit/AVPlayerView.h>
 #import <AVKit/AVRoutePickerView.h>
 
diff -ruN /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVKitCore.h /Applications/Xcode_14.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVKitCore.h
--- /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVKitCore.h	2022-05-21 08:58:58.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVKitCore.h	2022-06-13 00:36:01.000000000 -0400
@@ -9,4 +9,3 @@
 #import <AVKit/AVKitDefines.h>
 
 #import <AVKit/AVPlaybackSpeed.h>
-#import <AVKit/AVPlaybackSpeedCollection.h>
diff -ruN /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVPlaybackSpeedCollection.h /Applications/Xcode_14.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVPlaybackSpeedCollection.h
--- /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVPlaybackSpeedCollection.h	2022-05-31 15:02:16.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVPlaybackSpeedCollection.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,81 +0,0 @@
-#if !__has_include(<AVKitCore/AVPlaybackSpeedCollection.h>)
-//
-//  AVPlaybackSpeedCollection.h
-//  AVKit
-//
-//  Created by adesjarlais on 11/13/21.
-//  Copyright © 2021 Apple Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-#if TARGET_OS_OSX || TARGET_OS_MACCATALYST
-#import <AVKit/AVKitDefines.h>
-#import <AVKit/AVPlaybackSpeed.h>
-#else
-#import <AVKit/AVKitDefines.h>
-#import <AVKit/AVPlaybackSpeed.h>
-#endif // #TARGET_OS_OSX || TARGET_OS_MACCATALYST
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-// MARK: -
-
-/*!
- @class         AVPlaybackSpeedCollection
- @abstract      A class representing a collection of user selectable playback speeds in a playback UI.
- */
-API_AVAILABLE(macos(13.0), ios(16.0), tvos(16.0)) API_UNAVAILABLE(watchos)
-@interface AVPlaybackSpeedCollection : NSObject
-
-AVKIT_INIT_UNAVAILABLE
-
-/*!
- @method      	defaultSpeedFromList
- @param         speeds
-				The playback speeds to select from
- @abstract      Returns the playback speed that should be used by default from the given list.
- */
-+ (AVPlaybackSpeed *)defaultSpeedFromList:(NSArray<AVPlaybackSpeed *> *)speeds;
-
-
-/*!
- @method        collectionWithSpeeds:
- @param         playbackSpeeds
-				A list of playback speeds to be used for this collection.
- @abstract      Creates a new instance of an AVPlaybackSpeedCollection with the given playback speeds.
- */
-+ (instancetype)collectionWithSpeeds:(NSArray<AVPlaybackSpeed *> *)playbackSpeeds;
-
-
-/*!
- @property      speeds
- @abstract      The list of playback speeds in this collection.
- */
-@property (nonatomic, readonly) NSArray<AVPlaybackSpeed *> *speeds;
-
-/*!
- @property      selectedSpeed
- @abstract      The currently selected playback speed in this collection.
- @discussion    Changes to the associated AVPlayer's defaultRate will be reflected in this property and vice versa. If the associated AVPlayer's defaultRate is set to a value that does not match a speed in the collection, the selected speed will be set to nil.
- */
-@property (nonatomic, readonly, nullable) AVPlaybackSpeed *selectedSpeed;
-
-
-/*!
- @method      selectSpeed
- @param         speed
-				The playback speed to select.
- @abstract      Selects the input AVPlaybackSpeed on this collection.
- @discussion    Calls to selectSpeed: with AVPlaybackSpeeds not contained within this collection will be ignored.
- */
-- (void)selectSpeed:(AVPlaybackSpeed *)speed;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#else
-#import <AVKitCore/AVPlaybackSpeedCollection.h>
-#endif
diff -ruN /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVPlayerView.h /Applications/Xcode_14.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVPlayerView.h
--- /Applications/Xcode_14.0.0-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVPlayerView.h	2022-05-31 15:02:16.000000000 -0400
+++ /Applications/Xcode_14.0.0-beta2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/AVKit.framework/Headers/AVPlayerView.h	2022-06-17 11:24:44.000000000 -0400
@@ -3,7 +3,7 @@
 	
 	Framework:  AVKit
 	
-	Copyright © 2013-2017 Apple Inc. All rights reserved.
+	Copyright © 2013-2022 Apple Inc. All rights reserved.
 	
  */
 
@@ -13,7 +13,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class AVPlaybackSpeedCollection;
+@class AVPlaybackSpeed;
 
 @protocol AVPlayerViewDelegate;
 @protocol AVPlayerViewPictureInPictureDelegate;
@@ -98,14 +98,31 @@
  */
 @property (nonatomic, readwrite, nullable, weak) id<AVPlayerViewDelegate> delegate API_AVAILABLE(macos(12.0));
 
+/**
+ @property		speeds
+ @abstract		A list of user selectable playback speeds to be shown in the playback speed control.
+ @discussion	By default this property will be set to the systemDefaultSpeeds class property. Setting this property to nil will hide the playback speed selection UI.
+	 
+				To set the currently selected playback speed programmatically, either set the defaultRate on the AVPlayer associated with this view controller or use the selectSpeed method on AVPlayerView.
+ */
+@property (copy) NSArray<AVPlaybackSpeed *> *speeds API_AVAILABLE(macos(13.0));
+
+/*!
+ @property		selectedSpeed
+ @abstract		The currently selected playback speed.
+ @discussion	Changes to the associated AVPlayer's defaultRate will be reflected in this property and vice versa. If the associated AVPlayer's defaultRate is set to a value that does not match a speed in the speeds list property, the selected speed will be nil.
+ */
+@property (readonly, nullable) AVPlaybackSpeed *selectedSpeed API_AVAILABLE(macos(13.0));
+
+
 /*!
-	@property	playbackSpeedCollection
-	@abstract	A collection of user selectable playback speeds to be shown in the standard playback controls UI.
-	@discussion	By default this property will be set to an AVPlaybackSpeedCollection with the platform default playback speeds (defined in [AVPlaybackSpeed systemDefaultSpeeds]). Setting this property to nil will hide the playback speed selection UI.
-				
-				To set the currently selected playback speed programmatically, either set the defaultRate on the AVPlayer associated with this view controller or call selectSpeed: the playback collection to the desired speed.
+ @property		selectSpeed
+ @param			speed
+				The playback speed to select.
+ @abstract		Sets the input AVPlaybackSpeed as the selected speed.
+ @discussion	Calls to selectSpeed with AVPlaybackSpeeds not contained within the speeds property array will be ignored.
  */
-@property (nonatomic, nullable) AVPlaybackSpeedCollection *playbackSpeedCollection API_AVAILABLE(macos(13.0));
+- (void)selectSpeed:(AVPlaybackSpeed *)speed API_AVAILABLE(macos(13.0));
 
 /*!
 	@property	allowsVideoFrameAnalysis
Clone this wiki locally