1. Deprecate sound policy related API

2. Add resource conflict related API

Change-Id: Ib63833127bdb4912f47e8b98a5d68e3d01aa787c
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9106d8e..04c4a7c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ FOREACH(flag ${${fw_name}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wcast-align -Wcast-qual -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 
 IF("${ARCH}" STREQUAL "arm")

diff --git a/include/camera.h b/include/camera.h
index e37f818..557d29d 100644 (file)
--- a/include/camera.h
+++ b/include/camera.h
@@ -49,15 +49,16 @@ typedef enum
     CAMERA_ERROR_OUT_OF_MEMORY          = TIZEN_ERROR_OUT_OF_MEMORY,            /**< Out of memory */
     CAMERA_ERROR_DEVICE                 = CAMERA_ERROR_CLASS | 0x04,            /**< Device error */
     CAMERA_ERROR_INVALID_OPERATION      = TIZEN_ERROR_INVALID_OPERATION,        /**< Internal error */
-    CAMERA_ERROR_SOUND_POLICY           = CAMERA_ERROR_CLASS | 0x06,            /**< Blocked by Audio Session Manager */
+    CAMERA_ERROR_SOUND_POLICY           = CAMERA_ERROR_CLASS | 0x06,            /**< Blocked by Audio Session Manager (Deprecated since 3.0) */
     CAMERA_ERROR_SECURITY_RESTRICTED    = CAMERA_ERROR_CLASS | 0x07,            /**< Restricted by security system policy */
     CAMERA_ERROR_DEVICE_BUSY            = CAMERA_ERROR_CLASS | 0x08,            /**< The device is using another application or working on some operation */
     CAMERA_ERROR_DEVICE_NOT_FOUND       = CAMERA_ERROR_CLASS | 0x09,            /**< No camera device */
-    CAMERA_ERROR_SOUND_POLICY_BY_CALL   = CAMERA_ERROR_CLASS | 0x0a,            /**< Blocked by Audio Session Manager - CALL */
-    CAMERA_ERROR_SOUND_POLICY_BY_ALARM  = CAMERA_ERROR_CLASS | 0x0b,            /**< Blocked by Audio Session Manager - ALARM */
+    CAMERA_ERROR_SOUND_POLICY_BY_CALL   = CAMERA_ERROR_CLASS | 0x0a,            /**< Blocked by Audio Session Manager - CALL (Deprecated since 3.0) */
+    CAMERA_ERROR_SOUND_POLICY_BY_ALARM  = CAMERA_ERROR_CLASS | 0x0b,            /**< Blocked by Audio Session Manager - ALARM (Deprecated since 3.0) */
     CAMERA_ERROR_ESD                    = CAMERA_ERROR_CLASS | 0x0c,            /**< ESD situation */
     CAMERA_ERROR_PERMISSION_DENIED      = TIZEN_ERROR_PERMISSION_DENIED,        /**< The access to the resources can not be granted*/
     CAMERA_ERROR_NOT_SUPPORTED          = TIZEN_ERROR_NOT_SUPPORTED,            /**< The feature is not supported */
+    CAMERA_ERROR_RESOURCE_CONFLICT      = CAMERA_ERROR_CLASS | 0x0d,            /**< Blocked by resource conflict (Since 3.0) */
 } camera_error_e;
 
 /**
@@ -124,10 +125,11 @@ typedef enum
 typedef enum
 {
        CAMERA_POLICY_NONE = 0,         /**< None */
-       CAMERA_POLICY_SOUND,            /**< Sound policy */
-       CAMERA_POLICY_SOUND_BY_CALL,    /**< Sound policy by CALL */
-       CAMERA_POLICY_SOUND_BY_ALARM,   /**< Sound policy by ALARM */
-       CAMERA_POLICY_SECURITY          /**< Security policy */
+       CAMERA_POLICY_SOUND,            /**< Sound policy (Deprecated since 3.0) */
+       CAMERA_POLICY_SOUND_BY_CALL,    /**< Sound policy by CALL (Deprecated since 3.0) */
+       CAMERA_POLICY_SOUND_BY_ALARM,   /**< Sound policy by ALARM (Deprecated since 3.0) */
+       CAMERA_POLICY_SECURITY,         /**< Security policy */
+       CAMERA_POLICY_RESOURCE_CONFLICT /**< Resource conflict (Since 3.0) */
 } camera_policy_e;
 
 /**
@@ -754,6 +756,7 @@ int camera_destroy(camera_h camera);
  * @retval #CAMERA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #CAMERA_ERROR_INVALID_STATE Invalid state
  * @retval #CAMERA_ERROR_SOUND_POLICY Sound policy error
+ * @retval #CAMERA_ERROR_RESOURCE_CONFLICT Resource conflict error
  * @retval #CAMERA_ERROR_INVALID_OPERATION Invalid operation
  * @retval #CAMERA_ERROR_DEVICE_BUSY The device is being used in another application or is performing other operations
  * @retval #CAMERA_ERROR_DEVICE_NOT_FOUND No camera device

diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index bb36929..745a052 100755 (executable)
--- a/packaging/capi-media-camera.spec
+++ b/packaging/capi-media-camera.spec
@@ -3,7 +3,7 @@
 
 Name:       capi-media-camera
 Summary:    A Camera library in Tizen C API
-Version:    0.2.3
+Version:    0.2.4
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/camera.c b/src/camera.c
index 9de2452..76d3422 100644 (file)
--- a/src/camera.c
+++ b/src/camera.c
@@ -32,6 +32,7 @@
 #include <tbm_surface_internal.h>
 #include <Evas.h>
 #include <Ecore.h>
+#include <Ecore_Wayland.h>
 #include <Elementary.h>
 
 #ifdef LOG_TAG