diff options
author | Jeongmo Yang <jm80.yang@samsung.com> | 2018-06-01 18:39:00 +0900 |
---|---|---|
committer | Jeongmo Yang <jm80.yang@samsung.com> | 2018-06-04 17:40:40 +0900 |
commit | f254a2c8345b6e1e1794e2911059d5db1660bf5f (patch) | |
tree | bbac807b8bdd67d717da226379a8566dce193682 | |
parent | 0a24fe951462c81b7ffca80235179dcb89be9a42 (diff) | |
download | recorder-f254a2c8345b6e1e1794e2911059d5db1660bf5f.tar.gz recorder-f254a2c8345b6e1e1794e2911059d5db1660bf5f.tar.bz2 recorder-f254a2c8345b6e1e1794e2911059d5db1660bf5f.zip |
[ACR-1233] Remove deprecated enums related with sound policysubmit/tizen/20180611.064333accepted/tizen/unified/20180615.071829
[Version] 0.3.10
[Profile] Common
[Issue Type] ACR
[Dependency module] N/A
Change-Id: I245a7bd988223565e0543814386be6e16b4b859c
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r-- | include/recorder.h | 11 | ||||
-rw-r--r-- | packaging/capi-media-recorder.spec | 4 | ||||
-rw-r--r-- | src/recorder.c | 31 |
3 files changed, 5 insertions, 41 deletions
diff --git a/include/recorder.h b/include/recorder.h index 1cda6ad..f1fbb64 100644 --- a/include/recorder.h +++ b/include/recorder.h @@ -55,10 +55,7 @@ typedef enum { RECORDER_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY , /**< Out of memory */ RECORDER_ERROR_DEVICE = RECORDER_ERROR_CLASS | 0x04, /**< Device error */ RECORDER_ERROR_INVALID_OPERATION = TIZEN_ERROR_INVALID_OPERATION, /**< Internal error */ - RECORDER_ERROR_SOUND_POLICY = RECORDER_ERROR_CLASS | 0x06, /**< Blocked by Audio Session Manager (Deprecated since 3.0) */ RECORDER_ERROR_SECURITY_RESTRICTED = RECORDER_ERROR_CLASS | 0x07, /**< Restricted by security system policy */ - RECORDER_ERROR_SOUND_POLICY_BY_CALL = RECORDER_ERROR_CLASS | 0x08, /**< Blocked by Audio Session Manager - CALL (Deprecated since 3.0) */ - RECORDER_ERROR_SOUND_POLICY_BY_ALARM = RECORDER_ERROR_CLASS | 0x09, /**< Blocked by Audio Session Manager - ALARM (Deprecated since 3.0) */ RECORDER_ERROR_ESD = RECORDER_ERROR_CLASS | 0x0a, /**< ESD situation */ RECORDER_ERROR_OUT_OF_STORAGE = RECORDER_ERROR_CLASS | 0x0b, /**< Out of storage */ RECORDER_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED, /**< The access to the resources can not be granted */ @@ -153,10 +150,7 @@ typedef enum { */ typedef enum { RECORDER_POLICY_NONE = 0, /**< None */ - RECORDER_POLICY_SOUND, /**< Sound policy (Deprecated since 3.0) */ - RECORDER_POLICY_SOUND_BY_CALL, /**< Sound policy by CALL (Deprecated since 3.0) */ - RECORDER_POLICY_SOUND_BY_ALARM, /**< Sound policy by ALARM (Deprecated since 3.0) */ - RECORDER_POLICY_SECURITY, /**< Security policy */ + RECORDER_POLICY_SECURITY = 4, /**< Security policy */ RECORDER_POLICY_RESOURCE_CONFLICT /**< Resource conflict (Since 3.0) */ } recorder_policy_e; @@ -398,7 +392,6 @@ typedef bool (*recorder_supported_video_encoder_cb)(recorder_video_codec_e codec * @retval #RECORDER_ERROR_NONE Successful * @retval #RECORDER_ERROR_INVALID_PARAMETER Invalid parameter * @retval #RECORDER_ERROR_OUT_OF_MEMORY Out of memory - * @retval #RECORDER_ERROR_SOUND_POLICY Sound policy error * @retval #RECORDER_ERROR_INVALID_OPERATION Invalid operation * @retval #RECORDER_ERROR_PERMISSION_DENIED The access to the resources can not be granted * @retval #RECORDER_ERROR_NOT_SUPPORTED The feature is not supported @@ -421,7 +414,6 @@ int recorder_create_videorecorder(camera_h camera, recorder_h *recorder); * @retval #RECORDER_ERROR_NONE Successful * @retval #RECORDER_ERROR_INVALID_PARAMETER Invalid parameter * @retval #RECORDER_ERROR_OUT_OF_MEMORY Out of memory - * @retval #RECORDER_ERROR_SOUND_POLICY Sound policy error * @retval #RECORDER_ERROR_INVALID_OPERATION Invalid operation * @retval #RECORDER_ERROR_PERMISSION_DENIED The access to the resources can not be granted * @retval #RECORDER_ERROR_NOT_SUPPORTED The feature is not supported @@ -460,7 +452,6 @@ int recorder_destroy(recorder_h recorder); * @return @c 0 on success, otherwise a negative error value * @retval #RECORDER_ERROR_NONE Successful * @retval #RECORDER_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #RECORDER_ERROR_SOUND_POLICY Sound policy error * @retval #RECORDER_ERROR_RESOURCE_CONFLICT Resource conflict error * @retval #RECORDER_ERROR_INVALID_OPERATION Invalid operation * @retval #RECORDER_ERROR_INVALID_STATE Invalid state diff --git a/packaging/capi-media-recorder.spec b/packaging/capi-media-recorder.spec index 109cb9d..18fe72e 100644 --- a/packaging/capi-media-recorder.spec +++ b/packaging/capi-media-recorder.spec @@ -1,7 +1,7 @@ Name: capi-media-recorder Summary: A Recorder API -Version: 0.3.9 -Release: 2 +Version: 0.3.10 +Release: 0 Group: Multimedia/API License: Apache-2.0 Source0: %{name}-%{version}.tar.gz diff --git a/src/recorder.c b/src/recorder.c index 908ddc7..55504b6 100644 --- a/src/recorder.c +++ b/src/recorder.c @@ -233,12 +233,7 @@ static void _recorder_client_user_callback(recorder_cb_info_s *cb_info, char *re muse_recorder_msg_get(previous, recv_msg); muse_recorder_msg_get(current, recv_msg); - if (policy == RECORDER_POLICY_SOUND) - LOGW("DEPRECATION WARNING: RECORDER_POLICY_SOUND is deprecated and will be removed from next release."); - else if (policy == RECORDER_POLICY_SOUND_BY_CALL) - LOGW("DEPRECATION WARNING: RECORDER_POLICY_SOUND_BY_CALL is deprecated and will be removed from next release."); - else if (policy == RECORDER_POLICY_SOUND_BY_ALARM) - LOGW("DEPRECATION WARNING: RECORDER_POLICY_SOUND_BY_ALARM is deprecated and will be removed from next release."); + LOGW("INTERRUPTED - policy %d, state %d -> %d", policy, previous, current); ((recorder_interrupted_cb)cb_info->user_cb[event])((recorder_policy_e)policy, (recorder_state_e)previous, @@ -256,13 +251,6 @@ static void _recorder_client_user_callback(recorder_cb_info_s *cb_info, char *re LOGW("INTERRUPT_STARTED - policy %d, state %d", policy, state); - if (policy == RECORDER_POLICY_SOUND) - LOGW("DEPRECATION WARNING: RECORDER_POLICY_SOUND is deprecated and will be removed from next release."); - else if (policy == RECORDER_POLICY_SOUND_BY_CALL) - LOGW("DEPRECATION WARNING: RECORDER_POLICY_SOUND_BY_CALL is deprecated and will be removed from next release."); - else if (policy == RECORDER_POLICY_SOUND_BY_ALARM) - LOGW("DEPRECATION WARNING: RECORDER_POLICY_SOUND_BY_ALARM is deprecated and will be removed from next release."); - ((recorder_interrupt_started_cb)cb_info->user_cb[event])((recorder_policy_e)policy, (recorder_state_e)state, cb_info->user_data[event]); } @@ -365,13 +353,6 @@ static void _recorder_client_user_callback(recorder_cb_info_s *cb_info, char *re muse_recorder_msg_get(error, recv_msg); muse_recorder_msg_get(current_state, recv_msg); - if (error == RECORDER_ERROR_SOUND_POLICY) - LOGW("DEPRECATION WARNING: RECORDER_ERROR_SOUND_POLICY is deprecated and will be removed from next release."); - else if (error == RECORDER_ERROR_SOUND_POLICY_BY_CALL) - LOGW("DEPRECATION WARNING: RECORDER_ERROR_SOUND_POLICY_BY_CALL is deprecated and will be removed from next release."); - else if (error == RECORDER_ERROR_SOUND_POLICY_BY_ALARM) - LOGW("DEPRECATION WARNING: RECORDER_ERROR_SOUND_POLICY_BY_ALARM is deprecated and will be removed from next release."); - ((recorder_error_cb)cb_info->user_cb[event])((recorder_error_e)error, (recorder_state_e)current_state, cb_info->user_data[event]); @@ -1308,17 +1289,9 @@ static int _recorder_client_wait_for_cb_return(muse_recorder_api_e api, recorder /*LOGD("condition is already checked for the api[%d], return[0x%x]", api, ret);*/ } - if (ret != RECORDER_ERROR_NONE) { + if (ret != RECORDER_ERROR_NONE) LOGE("ERROR : api %d - ret 0x%x", api, ret); - if (ret == RECORDER_ERROR_SOUND_POLICY) - LOGW("DEPRECATION WARNING: RECORDER_ERROR_SOUND_POLICY is deprecated and will be removed from next release."); - else if (ret == RECORDER_ERROR_SOUND_POLICY_BY_CALL) - LOGW("DEPRECATION WARNING: RECORDER_ERROR_SOUND_POLICY_BY_CALL is deprecated and will be removed from next release."); - else if (ret == RECORDER_ERROR_SOUND_POLICY_BY_ALARM) - LOGW("DEPRECATION WARNING: RECORDER_ERROR_SOUND_POLICY_BY_ALARM is deprecated and will be removed from next release."); - } - g_mutex_unlock(&(cb_info->api_mutex[api])); return ret; |