From 01da01e08ea6f50066903dc70210f9f28caba1e1 Mon Sep 17 00:00:00 2001 From: Haesu Gwon Date: Mon, 2 Jan 2017 17:37:02 +0900 Subject: [PATCH] [Camera] Fix callback variable bug Change-Id: Iaa7ac1816a79d298f076e41f7aacfcf863d9c2e3 Signed-off-by: Haesu Gwon --- packaging/csapi-multimedia.spec | 2 +- src/Tizen.Multimedia/Camera/Camera.cs | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packaging/csapi-multimedia.spec b/packaging/csapi-multimedia.spec index d99b45e..4a03c0b 100644 --- a/packaging/csapi-multimedia.spec +++ b/packaging/csapi-multimedia.spec @@ -1,6 +1,6 @@ Name: csapi-multimedia Summary: Tizen Multimedia API for C# -Version: 1.0.26 +Version: 1.0.27 Release: 0 Group: Development/Libraries License: Apache-2.0 diff --git a/src/Tizen.Multimedia/Camera/Camera.cs b/src/Tizen.Multimedia/Camera/Camera.cs index 78c03e2..2b67e75 100755 --- a/src/Tizen.Multimedia/Camera/Camera.cs +++ b/src/Tizen.Multimedia/Camera/Camera.cs @@ -57,6 +57,11 @@ namespace Tizen.Multimedia private readonly List _faces = new List(); private Interop.Camera.PreviewCallback _previewCallback; Interop.Camera.MediaPacketPreviewCallback _mediaPacketCallback; + private Interop.Camera.FocusChangedCallback _focusCallback; + private Interop.Camera.HdrCaptureProgressCallback _hdrProgressCallback; + private Interop.Camera.StateChangedCallback _stateChangedCallback; + private Interop.Camera.InterruptedCallback _interruptedCallback; + private Interop.Camera.ErrorCallback _errorCallback; /// /// Initializes a new instance of the Class. @@ -98,7 +103,7 @@ namespace Tizen.Multimedia { if (_hdrProgress == null) { - Interop.Camera.HdrCaptureProgressCallback _hdrProgressCallback = (int percent, IntPtr userData) => + _hdrProgressCallback = (int percent, IntPtr userData) => { HdrCaptureProgressEventArgs eventArgs = new HdrCaptureProgressEventArgs(percent); _hdrProgress?.Invoke(this, eventArgs); @@ -146,7 +151,7 @@ namespace Tizen.Multimedia { if (_cameraStateChanged == null) { - Interop.Camera.StateChangedCallback _stateChangedCallback = (CameraState previous, CameraState current, bool byPolicy, IntPtr userData) => + _stateChangedCallback = (CameraState previous, CameraState current, bool byPolicy, IntPtr userData) => { CameraStateChangedEventArgs eventArgs = new CameraStateChangedEventArgs(previous, current, byPolicy); _cameraStateChanged?.Invoke(this, eventArgs); @@ -184,7 +189,7 @@ namespace Tizen.Multimedia { if (_cameraFocusChanged == null) { - Interop.Camera.FocusChangedCallback _focusCallback = (CameraFocusState state, IntPtr userData) => + _focusCallback = (CameraFocusState state, IntPtr userData) => { CameraFocusChangedEventArgs eventArgs = new CameraFocusChangedEventArgs(state); _cameraFocusChanged?.Invoke(this, eventArgs); @@ -222,7 +227,7 @@ namespace Tizen.Multimedia { if (_cameraInterrupted == null) { - Interop.Camera.InterruptedCallback _interruptedCallback = (CameraPolicy policy, CameraState previous, CameraState current, IntPtr userData) => + _interruptedCallback = (CameraPolicy policy, CameraState previous, CameraState current, IntPtr userData) => { CameraInterruptedEventArgs eventArgs = new CameraInterruptedEventArgs(policy, previous, current); _cameraInterrupted?.Invoke(this, eventArgs); @@ -260,7 +265,7 @@ namespace Tizen.Multimedia { if (_cameraErrorOccurred == null) { - Interop.Camera.ErrorCallback _errorCallback = (CameraErrorCode error, CameraState current, IntPtr userData) => + _errorCallback = (CameraErrorCode error, CameraState current, IntPtr userData) => { CameraErrorOccurredEventArgs eventArgs = new CameraErrorOccurredEventArgs(error, current); _cameraErrorOccurred?.Invoke(this, eventArgs); -- 2.7.4