diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2016-08-22 13:49:49 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2016-08-22 13:50:32 +0900 |
| commit | 4d155cc13b225cd8d02eeef2d1282c79c55f3286 (patch) | |
| tree | 57675b488b7e6a9abc1f010807f6a97ad5a94965 | |
| parent | 0a4d9b4db33bf74df13223e6f78925ab5d38556e (diff) | |
| download | recorder-4d155cc13b225cd8d02eeef2d1282c79c55f3286.tar.gz recorder-4d155cc13b225cd8d02eeef2d1282c79c55f3286.tar.bz2 recorder-4d155cc13b225cd8d02eeef2d1282c79c55f3286.zip | |
[Release version 0.2.32] 1. Add warning message for deprecated API, 2. Update code for msg send error handlingsubmit/tizen/20160824.052737accepted/tizen/wearable/20160825.050349accepted/tizen/tv/20160825.050326accepted/tizen/mobile/20160825.050234accepted/tizen/ivi/20160825.050417accepted/tizen/common/20160824.154750
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
Change-Id: Ibf3e16a94db7b599909fe269121535ab56a18c4b
| -rw-r--r-- | packaging/capi-media-recorder.spec | 2 | ||||
| -rw-r--r-- | src/recorder.c | 26 |
2 files changed, 25 insertions, 3 deletions
diff --git a/packaging/capi-media-recorder.spec b/packaging/capi-media-recorder.spec index d0fafaa..50f130e 100644 --- a/packaging/capi-media-recorder.spec +++ b/packaging/capi-media-recorder.spec @@ -1,6 +1,6 @@ Name: capi-media-recorder Summary: A Recorder API -Version: 0.2.31 +Version: 0.2.32 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/recorder.c b/src/recorder.c index a31fa22..14746cc 100644 --- a/src/recorder.c +++ b/src/recorder.c @@ -146,6 +146,13 @@ 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."); + ((recorder_interrupted_cb)cb_info->user_cb[event])((recorder_policy_e)policy, (recorder_state_e)previous, (recorder_state_e)current, @@ -207,6 +214,13 @@ 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]); @@ -957,9 +971,17 @@ 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; @@ -1030,7 +1052,7 @@ static int _recorder_msg_send_param1(int api, recorder_cb_info_s *cb_info, int * /*LOGD("send msg %s", msg);*/ - if (muse_core_ipc_send_msg(cb_info->fd, msg) <= 0) { + if (muse_core_ipc_send_msg(cb_info->fd, msg) < 0) { LOGE("message send failed"); *ret = RECORDER_ERROR_INVALID_OPERATION; } else { |