xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[AVFoundation] Remove some obsolete API from .NET

This commit is contained in:
Rolf Bjarne Kvinge 2021-11-03 23:08:58 +01:00
Родитель 02e4d749c3
Коммит 9a67ae6f36
3 изменённых файлов: 18 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

30
src/avfoundation.cs
Просмотреть файл

@ -383,7 +383,7 @@ namespace AVFoundation {
} }
#if !XAMCORE_4_0 #if !NET
[NoWatch] [NoWatch]
[Obsolete ("Use AVMediaCharacteristics enum values")] [Obsolete ("Use AVMediaCharacteristics enum values")]
[BaseType (typeof (NSObject))][Static] [BaseType (typeof (NSObject))][Static]
@ -564,7 +564,7 @@ namespace AVFoundation {
Scc = 22, Scc = 22,
} }
#if !XAMCORE_4_0 #if !NET
[NoWatch] [NoWatch]
[BaseType (typeof (NSObject))][Static] [BaseType (typeof (NSObject))][Static]
[Obsolete ("Use AVFileTypes enum values")] [Obsolete ("Use AVFileTypes enum values")]
@ -3064,7 +3064,7 @@ namespace AVFoundation {
[Export ("availableMetadataFormats")] [Export ("availableMetadataFormats")]
string [] AvailableMetadataFormats { get; } string [] AvailableMetadataFormats { get; }
#if !XAMCORE_4_0 #if !NET
[Obsolete ("Use 'GetMetadataForFormat' with enum values AVMetadataFormat.")] [Obsolete ("Use 'GetMetadataForFormat' with enum values AVMetadataFormat.")]
[Wrap ("GetMetadataForFormat (new NSString (format))", IsVirtual = true)] [Wrap ("GetMetadataForFormat (new NSString (format))", IsVirtual = true)]
AVMetadataItem [] MetadataForFormat (string format); AVMetadataItem [] MetadataForFormat (string format);
@ -3383,7 +3383,7 @@ namespace AVFoundation {
[DisableDefaultCtor] [DisableDefaultCtor]
interface AVCaptureSynchronizedDataCollection : INSFastEnumeration interface AVCaptureSynchronizedDataCollection : INSFastEnumeration
{ {
#if !XAMCORE_4_0 #if !NET
[Obsolete ("Use 'GetSynchronizedData' instead.")] [Obsolete ("Use 'GetSynchronizedData' instead.")]
[Wrap ("GetSynchronizedData (captureOutput)", isVirtual: true)] [Wrap ("GetSynchronizedData (captureOutput)", isVirtual: true)]
[return: NullAllowed] [return: NullAllowed]
@ -5101,7 +5101,7 @@ namespace AVFoundation {
[Field ("AVMetadataCommonKeyAccessibilityDescription")] [Field ("AVMetadataCommonKeyAccessibilityDescription")]
NSString CommonKeyAccessibilityDescription { get; } NSString CommonKeyAccessibilityDescription { get; }
#if !XAMCORE_4_0 #if !NET
[Field ("AVMetadataFormatQuickTimeUserData")] [Field ("AVMetadataFormatQuickTimeUserData")]
[Obsolete ("Use 'AVMetadataFormat' enum values")] [Obsolete ("Use 'AVMetadataFormat' enum values")]
NSString FormatQuickTimeUserData { get; } NSString FormatQuickTimeUserData { get; }
@ -5283,7 +5283,7 @@ namespace AVFoundation {
[Field ("AVMetadata3GPUserDataKeyMediaRating")] [Field ("AVMetadata3GPUserDataKeyMediaRating")]
NSString K3GPUserDataKeyMediaRating { get; } NSString K3GPUserDataKeyMediaRating { get; }
#if !XAMCORE_4_0 #if !NET
[iOS (7,0), Mac (10, 9)] [iOS (7,0), Mac (10, 9)]
[Field ("AVMetadataFormatISOUserData")] [Field ("AVMetadataFormatISOUserData")]
[Obsolete ("Use 'AVMetadataFormat' enum values")] [Obsolete ("Use 'AVMetadataFormat' enum values")]
@ -5432,7 +5432,7 @@ namespace AVFoundation {
[Field ("AVMetadataQuickTimeMetadataKeyIsMontage")] [Field ("AVMetadataQuickTimeMetadataKeyIsMontage")]
NSString QuickTimeMetadataKeyIsMontage { get; } NSString QuickTimeMetadataKeyIsMontage { get; }
#if !XAMCORE_4_0 #if !NET
[Field ("AVMetadataFormatiTunesMetadata")] [Field ("AVMetadataFormatiTunesMetadata")]
[Obsolete ("Use 'AVMetadataFormat' enum values")] [Obsolete ("Use 'AVMetadataFormat' enum values")]
NSString FormatiTunesMetadata { get; } NSString FormatiTunesMetadata { get; }
@ -5586,7 +5586,7 @@ namespace AVFoundation {
[Field ("AVMetadataiTunesMetadataKeyExecProducer")] [Field ("AVMetadataiTunesMetadataKeyExecProducer")]
NSString iTunesMetadataKeyExecProducer { get; } NSString iTunesMetadataKeyExecProducer { get; }
#if !XAMCORE_4_0 #if !NET
[Field ("AVMetadataFormatID3Metadata")] [Field ("AVMetadataFormatID3Metadata")]
[Obsolete ("Use 'AVMetadataFormat' enum values")] [Obsolete ("Use 'AVMetadataFormat' enum values")]
NSString FormatID3Metadata { get; } NSString FormatID3Metadata { get; }
@ -5906,7 +5906,7 @@ namespace AVFoundation {
[Field ("AVMetadataIcyMetadataKeyStreamURL")] [Field ("AVMetadataIcyMetadataKeyStreamURL")]
NSString IcyMetadataKeyStreamUrl { get; } NSString IcyMetadataKeyStreamUrl { get; }
#if !XAMCORE_4_0 #if !NET
[iOS (8,0)][Mac (10,10)] [iOS (8,0)][Mac (10,10)]
[Field ("AVMetadataFormatHLSMetadata")] [Field ("AVMetadataFormatHLSMetadata")]
[Obsolete ("Use 'AVMetadataFormat' enum values")] [Obsolete ("Use 'AVMetadataFormat' enum values")]
@ -9907,7 +9907,7 @@ namespace AVFoundation {
[Export ("availableEmbeddedThumbnailPhotoCodecTypes")] [Export ("availableEmbeddedThumbnailPhotoCodecTypes")]
NSString[] _GetAvailableEmbeddedThumbnailPhotoCodecTypes { get; } NSString[] _GetAvailableEmbeddedThumbnailPhotoCodecTypes { get; }
#if !XAMCORE_4_0 #if !NET
[Obsolete ("Use 'AvailableEmbeddedThumbnailPhotoCodecTypes' instead.")] [Obsolete ("Use 'AvailableEmbeddedThumbnailPhotoCodecTypes' instead.")]
[iOS (11, 0)] [iOS (11, 0)]
[Wrap ("Array.ConvertAll (_GetAvailableEmbeddedThumbnailPhotoCodecTypes, s => AVVideoCodecTypeExtensions.GetValue (s))", IsVirtual = false)] [Wrap ("Array.ConvertAll (_GetAvailableEmbeddedThumbnailPhotoCodecTypes, s => AVVideoCodecTypeExtensions.GetValue (s))", IsVirtual = false)]
@ -10615,7 +10615,7 @@ namespace AVFoundation {
[return: NullAllowed] [return: NullAllowed]
AVCaptureDevice GetDefaultDevice (AVMediaTypes mediaType); AVCaptureDevice GetDefaultDevice (AVMediaTypes mediaType);
#if !XAMCORE_4_0 #if !NET
[NoWatch] [NoWatch]
[Obsolete ("Use 'GetDefaultDevice (AVMediaTypes)'.")] [Obsolete ("Use 'GetDefaultDevice (AVMediaTypes)'.")]
[Static] [Static]
@ -13284,7 +13284,7 @@ namespace AVFoundation {
[Export ("enqueueSampleBuffer:")] [Export ("enqueueSampleBuffer:")]
void Enqueue (CMSampleBuffer sampleBuffer); void Enqueue (CMSampleBuffer sampleBuffer);
#if !XAMCORE_4_0 #if !NET
[Wrap ("Enqueue (sampleBuffer)", IsVirtual = true)] [Wrap ("Enqueue (sampleBuffer)", IsVirtual = true)]
[Obsolete ("Use the 'Enqueue' method instead.")] [Obsolete ("Use the 'Enqueue' method instead.")]
void EnqueueSampleBuffer (CMSampleBuffer sampleBuffer); void EnqueueSampleBuffer (CMSampleBuffer sampleBuffer);
@ -13299,7 +13299,7 @@ namespace AVFoundation {
[Export ("requestMediaDataWhenReadyOnQueue:usingBlock:")] [Export ("requestMediaDataWhenReadyOnQueue:usingBlock:")]
void RequestMediaData (DispatchQueue queue, Action handler); void RequestMediaData (DispatchQueue queue, Action handler);
#if !XAMCORE_4_0 #if !NET
[Wrap ("RequestMediaData (queue, enqueuer)", IsVirtual = true)] [Wrap ("RequestMediaData (queue, enqueuer)", IsVirtual = true)]
[Obsolete ("Use the 'RequestMediaData' method instead.")] [Obsolete ("Use the 'RequestMediaData' method instead.")]
void RequestMediaDataWhenReadyOnQueue (DispatchQueue queue, Action enqueuer); void RequestMediaDataWhenReadyOnQueue (DispatchQueue queue, Action enqueuer);
@ -14769,7 +14769,7 @@ namespace AVFoundation {
interface AVAudioSourceNode : AVAudioMixing { interface AVAudioSourceNode : AVAudioMixing {
[Export ("initWithRenderBlock:")] [Export ("initWithRenderBlock:")]
[DesignatedInitializer] [DesignatedInitializer]
#if XAMCORE_4_0 #if NET
NativeHandle Constructor (AVAudioSourceNodeRenderHandler renderHandler); NativeHandle Constructor (AVAudioSourceNodeRenderHandler renderHandler);
#else #else
NativeHandle Constructor (AVAudioSourceNodeRenderHandler2 renderHandler); NativeHandle Constructor (AVAudioSourceNodeRenderHandler2 renderHandler);
@ -14777,7 +14777,7 @@ namespace AVFoundation {
[Export ("initWithFormat:renderBlock:")] [Export ("initWithFormat:renderBlock:")]
[DesignatedInitializer] [DesignatedInitializer]
#if XAMCORE_4_0 #if NET
NativeHandle Constructor (AVAudioFormat format, AVAudioSourceNodeRenderHandler renderHandler); NativeHandle Constructor (AVAudioFormat format, AVAudioSourceNodeRenderHandler renderHandler);
#else #else
NativeHandle Constructor (AVAudioFormat format, AVAudioSourceNodeRenderHandler2 renderHandler); NativeHandle Constructor (AVAudioFormat format, AVAudioSourceNodeRenderHandler2 renderHandler);

2
tests/monotouch-test/AVFoundation/CaptureMetadataOutputTest.cs
Просмотреть файл

@ -96,7 +96,7 @@ namespace MonoTouchFixtures.AVFoundation {
TestRuntime.RequestCameraPermission (AVMediaTypes.Video.GetConstant (), true); TestRuntime.RequestCameraPermission (AVMediaTypes.Video.GetConstant (), true);
using (var captureSession = new AVCaptureSession ()) { using (var captureSession = new AVCaptureSession ()) {
using (var videoDevice = AVCaptureDevice.DefaultDeviceWithMediaType (AVMediaTypes.Video.GetConstant ())) { using (var videoDevice = AVCaptureDevice.GetDefaultDevice (AVMediaTypes.Video.GetConstant ())) {
NSError error; NSError error;
using (var videoInput = new AVCaptureDeviceInput (videoDevice, out error)) { using (var videoInput = new AVCaptureDeviceInput (videoDevice, out error)) {

4
tests/monotouch-test/CoreMedia/CMFormatDescriptionTest.cs
Просмотреть файл

@ -63,7 +63,7 @@ namespace MonoTouchFixtures.CoreMedia {
// Assert.That (fde, Is.EqualTo (CMFormatDescriptionError.InvalidParameter), "CMFormatDescriptionError (authorized)"); // Assert.That (fde, Is.EqualTo (CMFormatDescriptionError.InvalidParameter), "CMFormatDescriptionError (authorized)");
using (var captureSession = new AVCaptureSession ()) { using (var captureSession = new AVCaptureSession ()) {
using (var videoDevice = AVCaptureDevice.DefaultDeviceWithMediaType (AVMediaTypes.Video.GetConstant ())) { using (var videoDevice = AVCaptureDevice.GetDefaultDevice (AVMediaTypes.Video.GetConstant ())) {
if (videoDevice == null) if (videoDevice == null)
Assert.Inconclusive ("Failed to create a video device for testing"); Assert.Inconclusive ("Failed to create a video device for testing");
NSError error; NSError error;
@ -96,7 +96,7 @@ namespace MonoTouchFixtures.CoreMedia {
} }
using (var captureSession = new AVCaptureSession ()) { using (var captureSession = new AVCaptureSession ()) {
using (var videoDevice = AVCaptureDevice.DefaultDeviceWithMediaType (AVMediaTypes.Video.GetConstant ())) { using (var videoDevice = AVCaptureDevice.GetDefaultDevice (AVMediaTypes.Video.GetConstant ())) {
if (videoDevice == null) if (videoDevice == null)
Assert.Inconclusive ("Failed to create a video device for testing"); Assert.Inconclusive ("Failed to create a video device for testing");
foreach (var format in videoDevice.Formats) { foreach (var format in videoDevice.Formats) {