Merge branch 'tizen' into tizen_line_coverage

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

diff --cc CMakeLists.txt
Simple merge

diff --cc src/recorder.c
index b5c54f0,846cc9d..54ec1a6
--- 1/src/recorder.c
--- 2/src/recorder.c
+++ b/src/recorder.c
@@@ -960,9 -957,8 +959,9 @@@ static void *_recorder_msg_recv_func(gp
        recv_msg = cb_info->recv_msg;
  
        while (g_atomic_int_get(&cb_info->msg_recv_running)) {
-               recv_length = muse_core_ipc_recv_msg(cb_info->fd, recv_msg);
+               recv_length = muse_core_msg_recv(cb_info->fd, recv_msg);
                if (recv_length <= 0) {
 +//LCOV_EXCL_START
                        cb_info->is_server_connected = FALSE;
                        LOGE("receive msg failed - server disconnected");
                        break;
@@@ -1044,9 -1035,8 +1043,9 @@@
        LOGD("client cb exit - server connected %d", cb_info->is_server_connected);
  
        if (!cb_info->is_server_connected) {
 +//LCOV_EXCL_START
                /* send error msg for server disconnection */
-               char *error_msg = muse_core_msg_json_factory_new(MUSE_RECORDER_CB_EVENT,
+               char *error_msg = muse_core_msg_new(MUSE_RECORDER_CB_EVENT,
                        MUSE_TYPE_INT, "error", RECORDER_ERROR_SERVICE_DISCONNECTED,
                        MUSE_TYPE_INT, "current_state", RECORDER_STATE_NONE,
                        NULL);
@@@ -1531,13 -1517,11 +1530,13 @@@ static int _recorder_create_common(reco
                goto _ERR_RECORDER_EXIT;
        }
  
-       sock_fd = muse_core_client_new();
+       sock_fd = muse_client_new();
        if (sock_fd < 0) {
-               LOGE("muse_core_client_new failed - returned fd %d", sock_fd);
 +//LCOV_EXCL_START
+               LOGE("muse_client_new failed - returned fd %d", sock_fd);
                ret = RECORDER_ERROR_INVALID_OPERATION;
                goto _ERR_RECORDER_EXIT;
 +//LCOV_EXCL_STOP
        }
  
        if (type == MUSE_RECORDER_TYPE_AUDIO) {
@@@ -3428,16 -3397,14 +3427,16 @@@ int recorder_get_device_state(recorder_
  
        LOGD("Enter - type %d", type);
  
-       sock_fd = muse_core_client_new();
+       sock_fd = muse_client_new();
        if (sock_fd < 0) {
-               LOGE("muse_core_client_new failed - returned fd %d", sock_fd);
 +//LCOV_EXCL_START
+               LOGE("muse_client_new failed - returned fd %d", sock_fd);
                ret = RECORDER_ERROR_INVALID_OPERATION;
                goto _GET_DEVICE_STATE_EXIT;
 +//LCOV_EXCL_STOP
        }
  
-       send_msg = muse_core_msg_json_factory_new(MUSE_RECORDER_API_GET_DEVICE_STATE,
+       send_msg = muse_core_msg_new(MUSE_RECORDER_API_GET_DEVICE_STATE,
                MUSE_TYPE_INT, "module", MUSE_RECORDER,
                MUSE_TYPE_INT, PARAM_RECORDER_TYPE, type,
                NULL);
@@@ -3461,12 -3425,10 +3460,12 @@@
                LOGE("send msg failed %d", errno);
                ret = RECORDER_ERROR_INVALID_OPERATION;
                goto _GET_DEVICE_STATE_EXIT;
 +//LCOV_EXCL_STOP
        }
  
-       ret = muse_core_ipc_recv_msg(sock_fd, recv_msg);
+       ret = muse_core_msg_recv(sock_fd, recv_msg);
        if (ret <= 0) {
 +//LCOV_EXCL_START
                LOGE("recv msg failed %d", errno);
                ret = RECORDER_ERROR_INVALID_OPERATION;
                goto _GET_DEVICE_STATE_EXIT;