[ACR-1242] Remove deprecated enums related with sound policy

[Version] 0.4.9
[Profile] Common
[Issue Type] ACR
[Dependency module] N/A

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

diff --git a/include/camera.h b/include/camera.h
index da87370..21e6610 100644 (file)
--- a/include/camera.h
+++ b/include/camera.h
@@ -48,12 +48,9 @@ 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 (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 (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 */
@@ -139,10 +136,7 @@ typedef enum {
  */
 typedef enum {
        CAMERA_POLICY_NONE = 0,         /**< None */
-       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_SECURITY = 4,     /**< Security policy */
        CAMERA_POLICY_RESOURCE_CONFLICT /**< Resource conflict (Since 3.0) */
 } camera_policy_e;
 
@@ -771,7 +765,6 @@ typedef bool (*camera_supported_preview_format_cb)(camera_pixel_format_e format,
  * @retval #CAMERA_ERROR_NONE Successful
  * @retval #CAMERA_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #CAMERA_ERROR_OUT_OF_MEMORY Out of memory
- * @retval #CAMERA_ERROR_SOUND_POLICY Sound policy error
  * @retval #CAMERA_ERROR_INVALID_OPERATION Invalid operation
  * @retval #CAMERA_ERROR_PERMISSION_DENIED The access to the resources can not be granted
  * @retval #CAMERA_ERROR_NOT_SUPPORTED The feature is not supported
@@ -833,7 +826,6 @@ int camera_destroy(camera_h camera);
  * @retval #CAMERA_ERROR_NONE Successful
  * @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

diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 030fe49..69ec2c5 100644 (file)
--- a/packaging/capi-media-camera.spec
+++ b/packaging/capi-media-camera.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-camera
 Summary:    A Camera API
-Version:    0.4.8
+Version:    0.4.9
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/camera.c b/src/camera.c
index 488f841..d2881e7 100644 (file)
--- a/src/camera.c
+++ b/src/camera.c
@@ -537,17 +537,9 @@ static int _camera_client_wait_for_cb_return(muse_camera_api_e api, camera_cb_in
 
        g_mutex_unlock(&(cb_info->api_mutex[api]));
 
-       if (ret != CAMERA_ERROR_NONE) {
+       if (ret != CAMERA_ERROR_NONE)
                LOGE("api %d : error 0x%x", api, ret);
 
-               if (ret == CAMERA_ERROR_SOUND_POLICY)
-                       LOGW("DEPRECATION WARNING: CAMERA_ERROR_SOUND_POLICY is deprecated and will be removed from next release.");
-               else if (ret == CAMERA_ERROR_SOUND_POLICY_BY_CALL)
-                       LOGW("DEPRECATION WARNING: CAMERA_ERROR_SOUND_POLICY_BY_CALL is deprecated and will be removed from next release.");
-               else if (ret == CAMERA_ERROR_SOUND_POLICY_BY_ALARM)
-                       LOGW("DEPRECATION WARNING: CAMERA_ERROR_SOUND_POLICY_BY_ALARM is deprecated and will be removed from next release.");
-       }
-
        return ret;
 }
 
@@ -1284,15 +1276,7 @@ static void _camera_client_user_callback(camera_cb_info_s *cb_info, char *recv_m
                        muse_camera_msg_get(previous, recv_msg);
                        muse_camera_msg_get(current, recv_msg);
 
-                       LOGW("INTERRUPTED - policy %d, state previous %d, current %d",
-                            policy, previous, current);
-
-                       if (policy == CAMERA_POLICY_SOUND)
-                               LOGW("DEPRECATION WARNING: CAMERA_POLICY_SOUND is deprecated and will be removed from next release.");
-                       else if (policy == CAMERA_POLICY_SOUND_BY_CALL)
-                               LOGW("DEPRECATION WARNING: CAMERA_POLICY_SOUND_BY_CALL is deprecated and will be removed from next release.");
-                       else if (policy == CAMERA_POLICY_SOUND_BY_ALARM)
-                               LOGW("DEPRECATION WARNING: CAMERA_POLICY_SOUND_BY_ALARM is deprecated and will be removed from next release.");
+                       LOGW("INTERRUPTED - policy %d, state %d -> %d", policy, previous, current);
 
                        ((camera_interrupted_cb)cb_info->user_cb[event])((camera_policy_e)policy,
                                (camera_state_e)previous, (camera_state_e)current, cb_info->user_data[event]);
@@ -1308,13 +1292,6 @@ static void _camera_client_user_callback(camera_cb_info_s *cb_info, char *recv_m
 
                        LOGW("INTERRUPT_STARTED - policy %d, state %d", policy, state);
 
-                       if (policy == CAMERA_POLICY_SOUND)
-                               LOGW("DEPRECATION WARNING: CAMERA_POLICY_SOUND is deprecated and will be removed from next release.");
-                       else if (policy == CAMERA_POLICY_SOUND_BY_CALL)
-                               LOGW("DEPRECATION WARNING: CAMERA_POLICY_SOUND_BY_CALL is deprecated and will be removed from next release.");
-                       else if (policy == CAMERA_POLICY_SOUND_BY_ALARM)
-                               LOGW("DEPRECATION WARNING: CAMERA_POLICY_SOUND_BY_ALARM is deprecated and will be removed from next release.");
-
                        ((camera_interrupt_started_cb)cb_info->user_cb[event])((camera_policy_e)policy,
                                (camera_state_e)state, cb_info->user_data[event]);
                }
@@ -1332,13 +1309,6 @@ static void _camera_client_user_callback(camera_cb_info_s *cb_info, char *recv_m
 
                        LOGE("ERROR - error 0x%x, current_state %d", error, current_state);
 
-                       if (error == CAMERA_ERROR_SOUND_POLICY)
-                               LOGW("DEPRECATION WARNING: CAMERA_ERROR_SOUND_POLICY is deprecated and will be removed from next release.");
-                       else if (error == CAMERA_ERROR_SOUND_POLICY_BY_CALL)
-                               LOGW("DEPRECATION WARNING: CAMERA_ERROR_SOUND_POLICY_BY_CALL is deprecated and will be removed from next release.");
-                       else if (error == CAMERA_ERROR_SOUND_POLICY_BY_ALARM)
-                               LOGW("DEPRECATION WARNING: CAMERA_ERROR_SOUND_POLICY_BY_ALARM is deprecated and will be removed from next release.");
-
                        ((camera_error_cb)cb_info->user_cb[event])((camera_error_e)error,
                                (camera_state_e)current_state, cb_info->user_data[event]);
                }