From e2e4b5844508386a07eee7f443a98d5984e19cfc Mon Sep 17 00:00:00 2001 From: Haesu Gwon Date: Thu, 24 Jun 2021 14:21:06 +0900 Subject: [PATCH] [Camera] Remove DeviceListChanged event (#3228) --- .../Camera/CameraDeviceListChangedEventArgs.cs | 44 ---------------------- .../Camera/CameraDeviceManager.cs | 38 +------------------ .../Interop/Interop.Camera.cs | 9 ----- 3 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 src/Tizen.Multimedia.Camera/Camera/CameraDeviceListChangedEventArgs.cs diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraDeviceListChangedEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/CameraDeviceListChangedEventArgs.cs deleted file mode 100644 index 3ee41df..0000000 --- a/src/Tizen.Multimedia.Camera/Camera/CameraDeviceListChangedEventArgs.cs +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2021 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using System; -using System.ComponentModel; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using static Interop.CameraDeviceManager; - -namespace Tizen.Multimedia -{ - /// - /// Provides data for the event. - /// - /// 9 - [EditorBrowsable(EditorBrowsableState.Never)] - public class CameraDeviceListChangedEventArgs : EventArgs - { - internal CameraDeviceListChangedEventArgs(ref CameraDeviceListStruct deviceList) - { - CameraDeviceInfo = CameraDeviceManager.GetDeviceInformation(deviceList); - } - - /// - /// Gets the camera device info. - /// - /// 9 - [EditorBrowsable(EditorBrowsableState.Never)] - public ReadOnlyCollection CameraDeviceInfo { get; } - } -} diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraDeviceManager.cs b/src/Tizen.Multimedia.Camera/Camera/CameraDeviceManager.cs index 9d6441a..1bc5ef7 100644 --- a/src/Tizen.Multimedia.Camera/Camera/CameraDeviceManager.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraDeviceManager.cs @@ -48,7 +48,7 @@ namespace Tizen.Multimedia { Native.Initialize(out _handle).ThrowIfFailed("Failed to initialize CameraDeviceManager"); - RegisterCallbacks(); + RegisterDeviceConnectionChangedCallback(); } /// @@ -116,13 +116,6 @@ namespace Tizen.Multimedia } /// - /// An event that occurs when there is a change in the available camera device. - /// - /// 9 - [EditorBrowsable(EditorBrowsableState.Never)] - public event EventHandler DeviceListChanged; - - /// /// An event that occurs when camera device is connected or disconnected. /// /// 9 @@ -138,34 +131,6 @@ namespace Tizen.Multimedia } } - private void RegisterCallbacks() - { - RegisterDeviceListChangedCallback(); - RegisterDeviceConnectionChangedCallback(); - } - - private int listCallbackId = 0; - private void RegisterDeviceListChangedCallback() - { - Native.DeviceListChangedCallback callback = (ref Native.CameraDeviceListStruct deviceList, IntPtr userData) => - { - DeviceListChanged?.Invoke(this, new CameraDeviceListChangedEventArgs(ref deviceList)); - }; - - Native.SetDeviceListChangedCallback(Handle, callback, IntPtr.Zero, out listCallbackId). - ThrowIfFailed("Failed to set device list changed callback"); - - Log.Info(CameraLog.Tag, $"callback Id : {listCallbackId}"); - } - - private void UnregisterDeviceListChangedCallback() - { - Log.Info(CameraLog.Tag, $"callback Id : {listCallbackId}"); - - Native.UnsetDeviceListChangedCallback(Handle, listCallbackId). - ThrowIfFailed("Failed to unset device list changed callback"); - } - private int connectionCallbackId = 0; private void RegisterDeviceConnectionChangedCallback() { @@ -202,7 +167,6 @@ namespace Tizen.Multimedia if (_handle != IntPtr.Zero) { - UnregisterDeviceListChangedCallback(); UnregisterDeviceConnectionChangedCallback(); Native.Deinitialize(_handle); diff --git a/src/Tizen.Multimedia.Camera/Interop/Interop.Camera.cs b/src/Tizen.Multimedia.Camera/Interop/Interop.Camera.cs index e8a9afa..ba79a8e 100644 --- a/src/Tizen.Multimedia.Camera/Interop/Interop.Camera.cs +++ b/src/Tizen.Multimedia.Camera/Interop/Interop.Camera.cs @@ -320,9 +320,6 @@ internal static partial class Interop [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate void DeviceConnectionChangedCallback(ref CameraDeviceStruct device, bool status, IntPtr userData); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - internal delegate void DeviceListChangedCallback(ref CameraDeviceListStruct deviceList, IntPtr userData); - [DllImport(Libraries.Camera, EntryPoint = "camera_device_manager_initialize")] internal static extern CameraError Initialize(out IntPtr handle); @@ -333,12 +330,6 @@ internal static partial class Interop [DllImport(Libraries.Camera, EntryPoint = "camera_device_manager_get_device_list")] internal static extern CameraError GetDeviceList(IntPtr handle, ref CameraDeviceListStruct deviceList); - [DllImport(Libraries.Camera, EntryPoint = "camera_device_manager_add_device_list_changed_cb")] - internal static extern CameraError SetDeviceListChangedCallback(IntPtr handle, DeviceListChangedCallback callback, IntPtr userData, out int id); - - [DllImport(Libraries.Camera, EntryPoint = "camera_device_manager_remove_device_list_changed_cb")] - internal static extern CameraError UnsetDeviceListChangedCallback(IntPtr handle, int id); - [DllImport(Libraries.Camera, EntryPoint = "camera_device_manager_add_device_connection_changed_cb")] internal static extern CameraError SetDeviceConnectionChangedCallback(IntPtr handle, DeviceConnectionChangedCallback callback, IntPtr userData, out int id); -- 2.7.4