From 7d5b33bd6d146e0504a4398f9b97b44a85718156 Mon Sep 17 00:00:00 2001 From: WonYoung Choi Date: Thu, 30 May 2019 19:59:59 +0900 Subject: [PATCH] [Build] Suppress CS0618 warnings due to internal reference (#869) Suppress CS0618(Type or member is obsolete) warnings due to internal reference --- src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Folder.cs | 5 ++++- .../Tizen.Content.MediaContent/MediaInfo.cs | 2 ++ .../Tizen.Content.MediaContent/QueryArguments.cs | 3 +++ src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs | 4 ---- src/Tizen.Multimedia.Metadata/MetadataExtractor/Metadata.cs | 2 ++ .../MediaController/MediaControlServer.Events.cs | 4 +++- src/Tizen.Multimedia/AudioManager/AudioManager.cs | 4 ++++ src/Tizen.Multimedia/Interop/Interop.Device.cs | 4 ++++ 8 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Folder.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Folder.cs index 841c421..e3af6eb 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Folder.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Folder.cs @@ -28,6 +28,7 @@ namespace Tizen.Content.MediaContent /// 4 public class Folder { +#pragma warning disable CS0618 // Type or member is obsolete internal Folder(IntPtr handle) { Id = InteropHelper.GetString(handle, Interop.Folder.GetFolderId); @@ -37,7 +38,7 @@ namespace Tizen.Content.MediaContent StorageType = InteropHelper.GetValue(handle, Interop.Folder.GetStorageType); StorageId = InteropHelper.GetString(handle, Interop.Folder.GetStorageId); } - +#pragma warning restore CS0618 // Type or member is obsolete internal static Folder FromHandle(IntPtr handle) => new Folder(handle); /// @@ -77,6 +78,7 @@ namespace Tizen.Content.MediaContent [Obsolete("Please do not use! this will be deprecated in level 6")] public string StorageId { get; } +#pragma warning disable CS0618 // Type or member is obsolete /// /// Returns a string representation of the folder. /// @@ -84,5 +86,6 @@ namespace Tizen.Content.MediaContent /// 4 public override string ToString() => $"Id={Id}, Name={Name}, Path={Path}, StorageType={StorageType}, StorageId={StorageType}"; +#pragma warning restore CS0618 // Type or member is obsolete } } diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs index ffcb30f..c8301ad 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs @@ -26,6 +26,7 @@ namespace Tizen.Content.MediaContent /// 4 public class MediaInfo { +#pragma warning disable CS0618 // Type or member is obsolete internal MediaInfo(Interop.MediaInfoHandle handle) { Id = InteropHelper.GetString(handle, Interop.MediaInfo.GetMediaId); @@ -58,6 +59,7 @@ namespace Tizen.Content.MediaContent StorageType = InteropHelper.GetValue(handle, Interop.MediaInfo.GetStorageType); } +#pragma warning restore CS0618 // Type or member is obsolete /// /// Gets the ID of media. diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/QueryArguments.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/QueryArguments.cs index 4f3996f..51c4a1f 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/QueryArguments.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/QueryArguments.cs @@ -144,6 +144,7 @@ namespace Tizen.Content.MediaContent return handle; } +#pragma warning disable CS0618 // Type or member is obsolete internal virtual bool IsEmpty() { return StorageId == null && FilterExpression == null; @@ -163,6 +164,8 @@ namespace Tizen.Content.MediaContent ThrowIfError("Failed to create filter handle(storage id)"); ; } } +#pragma warning restore CS0618 // Type or member is obsolete + } /// diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs index d531d51..1428229 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Storage.cs @@ -43,7 +43,6 @@ namespace Tizen.Content.MediaContent /// /// The unique ID of the storage. /// 3 - [Obsolete("Please do not use! this will be deprecated in level 6")] public string Id { get; } /// @@ -51,7 +50,6 @@ namespace Tizen.Content.MediaContent /// /// The path of the storage. /// 4 - [Obsolete("Please do not use! this will be deprecated in level 6")] public string Path { get; } /// @@ -59,7 +57,6 @@ namespace Tizen.Content.MediaContent /// /// The type of the storage. /// 4 - [Obsolete("Please do not use! this will be deprecated in level 6")] public StorageType Type { get; } /// @@ -67,7 +64,6 @@ namespace Tizen.Content.MediaContent /// /// A string representation of the current storage. /// 4 - [Obsolete("Please do not use! this will be deprecated in level 6")] public override string ToString() => $"Id={Id}, Path={Path}, Type={Type}"; } diff --git a/src/Tizen.Multimedia.Metadata/MetadataExtractor/Metadata.cs b/src/Tizen.Multimedia.Metadata/MetadataExtractor/Metadata.cs index e142b35..a37caf0 100644 --- a/src/Tizen.Multimedia.Metadata/MetadataExtractor/Metadata.cs +++ b/src/Tizen.Multimedia.Metadata/MetadataExtractor/Metadata.cs @@ -196,7 +196,9 @@ namespace Tizen.Multimedia Album = extractor.GetMetadata(MetadataExtractorAttr.Album); AlbumArtist = extractor.GetMetadata(MetadataExtractorAttr.AlbumArtist); Genre = extractor.GetMetadata(MetadataExtractorAttr.Genre); +#pragma warning disable CS0618 // Type or member is obsolete Author = extractor.GetMetadata(MetadataExtractorAttr.Composer); +#pragma warning restore CS0618 // Type or member is obsolete Composer = extractor.GetMetadata(MetadataExtractorAttr.Composer); Copyright = extractor.GetMetadata(MetadataExtractorAttr.Copyright); DateReleased = extractor.GetMetadata(MetadataExtractorAttr.ReleaseDate); diff --git a/src/Tizen.Multimedia.Remoting/MediaController/MediaControlServer.Events.cs b/src/Tizen.Multimedia.Remoting/MediaController/MediaControlServer.Events.cs index 30b158b..3320b7d 100644 --- a/src/Tizen.Multimedia.Remoting/MediaController/MediaControlServer.Events.cs +++ b/src/Tizen.Multimedia.Remoting/MediaController/MediaControlServer.Events.cs @@ -95,7 +95,9 @@ namespace Tizen.Multimedia.Remoting // SendPlaybackCommand doesn't use requestId. It'll be removed in Level 7. if (requestId == null) { +#pragma warning disable CS0618 // Type or member is obsolete PlaybackCommandReceived?.Invoke(null, new PlaybackCommandReceivedEventArgs(clientName, playbackCommand.ToPublic())); +#pragma warning restore CS0618 // Type or member is obsolete } else { @@ -182,7 +184,7 @@ namespace Tizen.Multimedia.Remoting Native.SetCustomCommandReceivedCb(Handle, _customCommandCallback). ThrowIfError("Failed to init CustomCommandReceived event."); } - + private static SearchCommand CreateSearchCommandReceivedEventArgs(IntPtr searchHandle) { var searchConditions = new List(); diff --git a/src/Tizen.Multimedia/AudioManager/AudioManager.cs b/src/Tizen.Multimedia/AudioManager/AudioManager.cs index 7c214a5..890c319 100644 --- a/src/Tizen.Multimedia/AudioManager/AudioManager.cs +++ b/src/Tizen.Multimedia/AudioManager/AudioManager.cs @@ -155,6 +155,8 @@ namespace Tizen.Multimedia #region DeviceStateChanged event private static int _deviceStateChangedCallbackId = -1; +#pragma warning disable CS0618 // Type or member is obsolete + private static Interop.AudioDevice.StateChangedCallback _audioDeviceStateChangedCallback; private static EventHandler _audioDeviceStateChanged; private static readonly object _audioDeviceStateLock = new object(); @@ -213,6 +215,8 @@ namespace Tizen.Multimedia ThrowIfError("Failed to add device state changed event"); } +#pragma warning restore CS0618 // Type or member is obsolete + private static void UnregisterDeviceStateChangedEvent() { Interop.AudioDevice.RemoveDeviceStateChangedCallback(_deviceStateChangedCallbackId). diff --git a/src/Tizen.Multimedia/Interop/Interop.Device.cs b/src/Tizen.Multimedia/Interop/Interop.Device.cs index 0b32939..00e0459 100755 --- a/src/Tizen.Multimedia/Interop/Interop.Device.cs +++ b/src/Tizen.Multimedia/Interop/Interop.Device.cs @@ -26,8 +26,10 @@ namespace Tizen.Multimedia [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate void ConnectionChangedCallback(IntPtr device, bool isConnected, IntPtr userData); +#pragma warning disable CS0618 // Type or member is obsolete [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate void StateChangedCallback(IntPtr device, AudioDeviceState changedState, IntPtr userData); +#pragma warning restore CS0618 // Type or member is obsolete [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate void RunningChangedCallback(IntPtr device, bool isRunning, IntPtr userData); @@ -54,8 +56,10 @@ namespace Tizen.Multimedia [DllImport(Libraries.SoundManager, EntryPoint = "sound_manager_get_device_name")] internal static extern int GetDeviceName(IntPtr device, out IntPtr name); +#pragma warning disable CS0618 // Type or member is obsolete [DllImport(Libraries.SoundManager, EntryPoint = "sound_manager_get_device_state_by_id")] internal static extern AudioManagerError GetDeviceState(int deviceId, out AudioDeviceState state); +#pragma warning restore CS0618 // Type or member is obsolete [DllImport(Libraries.SoundManager, EntryPoint = "sound_manager_is_device_running_by_id")] internal static extern AudioManagerError IsDeviceRunning(int deviceId, out bool isRunning); -- 2.7.4