From 0da05d3e174b4c6115ce704b74a81b66cf3a0d24 Mon Sep 17 00:00:00 2001 From: YoungHun Kim Date: Mon, 7 Aug 2017 17:31:13 +0900 Subject: [PATCH] Update muse-camera by the splited muse library Change-Id: Ic84f5055a7284a1d3f11b47192986a6711cf7245 --- CMakeLists.txt | 2 +- muse/CMakeLists.txt | 2 +- muse/include/muse_camera_internal.h | 2 +- muse/include/muse_camera_msg.h | 10 +- muse/src/muse_camera_dispatcher.c | 487 ++++++++++++++++++------------------ packaging/mmsvc-camera.spec | 4 +- 6 files changed, 254 insertions(+), 253 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b255ade..7441a9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ SET(fw_name "${service}-${submodule}") PROJECT(${fw_name}) -SET(pc_dependents "dlog mm-common mused libtbm") +SET(pc_dependents "dlog mm-common libtbm") SET(PC_NAME ${fw_name}) SET(PACKAGE_DESCRIPTION "muse camera module") diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt index 6f02853..0cfb59c 100644 --- a/muse/CMakeLists.txt +++ b/muse/CMakeLists.txt @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(service "muse") SET(submodule "camera") -SET(dependents "dlog glib-2.0 mused mm-common libtbm gstreamer-1.0") +SET(dependents "dlog glib-2.0 muse-server mm-common libtbm gstreamer-1.0") SET(fw_name "${service}-${submodule}") PROJECT(${fw_name}) diff --git a/muse/include/muse_camera_internal.h b/muse/include/muse_camera_internal.h index fed14a1..7733b23 100644 --- a/muse/include/muse_camera_internal.h +++ b/muse/include/muse_camera_internal.h @@ -26,7 +26,7 @@ extern "C" { * @brief This file contains the muse camera internal API for framework, related structures and enumerations. */ -#include +#include #include #include diff --git a/muse/include/muse_camera_msg.h b/muse/include/muse_camera_msg.h index c356bb0..d0ceccf 100644 --- a/muse/include/muse_camera_msg.h +++ b/muse/include/muse_camera_msg.h @@ -22,7 +22,7 @@ extern "C" { #endif #include -#include "muse_core_msg_json.h" +#include /** * @file muse_camera_msg.h @@ -116,7 +116,7 @@ typedef const char* STRING; * @param[out] buf The string of message buffer. */ #define muse_camera_msg_get(param, buf) \ - muse_core_msg_json_deserialize(#param, buf, NULL, ¶m, NULL, MUSE_TYPE_ANY) + muse_core_msg_deserialize(#param, buf, NULL, NULL, MUSE_TYPE_ANY, ¶m) /** * @brief Query the specific string type value from the input message via ipc. @@ -124,7 +124,7 @@ typedef const char* STRING; * @param[out] buf The string of message buffer. */ #define muse_camera_msg_get_string(param, buf) \ - muse_core_msg_json_deserialize(#param, buf, NULL, param, NULL, MUSE_TYPE_STRING) + muse_core_msg_deserialize(#param, buf, NULL, NULL, MUSE_TYPE_STRING, param) /** * @brief Query the specific array type value from the input message via ipc. @@ -132,7 +132,7 @@ typedef const char* STRING; * @param[out] buf The string of message buffer. */ #define muse_camera_msg_get_array(param, buf) \ - muse_core_msg_json_deserialize(#param, buf, NULL, param, NULL, MUSE_TYPE_ARRAY) + muse_core_msg_deserialize(#param, buf, NULL, NULL, MUSE_TYPE_ARRAY, param) /** * @brief Query the specific pointer type value from the input message via ipc. @@ -140,7 +140,7 @@ typedef const char* STRING; * @param[out] buf The string of message buffer. */ #define muse_camera_msg_get_pointer(param, buf) \ - muse_core_msg_json_deserialize(#param, buf, NULL, ¶m, NULL, MUSE_TYPE_POINTER) + muse_core_msg_deserialize(#param, buf, NULL, NULL, MUSE_TYPE_POINTER, ¶m) #ifdef __cplusplus } diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c index b2e116a..1fc8ffe 100644 --- a/muse/src/muse_camera_dispatcher.c +++ b/muse/src/muse_camera_dispatcher.c @@ -25,7 +25,8 @@ #include "muse_camera_msg.h" #include "muse_camera_internal.h" #include -#include +#include +#include #include #ifdef LOG_TAG @@ -60,19 +61,19 @@ static void __camera_dispatcher_send_msg(muse_module_h module, char *msg) /*LOGD("msg [%s]", msg);*/ - len = muse_core_ipc_send_msg(muse_core_client_get_msg_fd(module), msg); + len = muse_core_msg_send(muse_server_module_get_msg_fd(module), msg); if (len <= 0) LOGE("sending message[%s] failed. errno %d", msg, errno); _DONE: - muse_core_msg_json_factory_free(msg); + muse_core_msg_free(msg); return; } static void muse_camera_msg_return(int api, int class, int ret, muse_module_h module) { - char *send_msg = muse_core_msg_json_factory_new(api, + char *send_msg = muse_core_msg_new(api, MUSE_TYPE_INT, PARAM_API_CLASS, class, MUSE_TYPE_INT, PARAM_RET, ret, MUSE_TYPE_INT, PARAM_GET_TYPE, MUSE_CAMERA_GET_TYPE_NONE, @@ -89,7 +90,7 @@ static void muse_camera_msg_return1(int api, int class, int ret, muse_module_h m char *send_msg = NULL; if (get_type == MUSE_CAMERA_GET_TYPE_INT) { - send_msg = muse_core_msg_json_factory_new(api, + send_msg = muse_core_msg_new(api, MUSE_TYPE_INT, PARAM_API_CLASS, class, MUSE_TYPE_INT, PARAM_RET, ret, MUSE_TYPE_INT, PARAM_GET_TYPE, get_type, @@ -97,7 +98,7 @@ static void muse_camera_msg_return1(int api, int class, int ret, muse_module_h m MUSE_TYPE_INT, name, value_int, 0); } else if (get_type == MUSE_CAMERA_GET_TYPE_STRING) { - send_msg = muse_core_msg_json_factory_new(api, + send_msg = muse_core_msg_new(api, MUSE_TYPE_INT, PARAM_API_CLASS, class, MUSE_TYPE_INT, PARAM_RET, ret, MUSE_TYPE_INT, PARAM_GET_TYPE, get_type, @@ -105,7 +106,7 @@ static void muse_camera_msg_return1(int api, int class, int ret, muse_module_h m MUSE_TYPE_STRING, name, value_pointer, 0); } else if (get_type == MUSE_CAMERA_GET_TYPE_POINTER) { - send_msg = muse_core_msg_json_factory_new(api, + send_msg = muse_core_msg_new(api, MUSE_TYPE_INT, PARAM_API_CLASS, class, MUSE_TYPE_INT, PARAM_RET, ret, MUSE_TYPE_INT, PARAM_GET_TYPE, get_type, @@ -125,7 +126,7 @@ static void muse_camera_msg_return1(int api, int class, int ret, muse_module_h m static void muse_camera_msg_return2(int api, int class, int ret, muse_module_h module, int get_type, int index, int value0, int value1) { - char *send_msg = muse_core_msg_json_factory_new(api, + char *send_msg = muse_core_msg_new(api, MUSE_TYPE_INT, PARAM_API_CLASS, class, MUSE_TYPE_INT, PARAM_RET, ret, MUSE_TYPE_INT, PARAM_GET_TYPE, get_type, @@ -142,7 +143,7 @@ static void muse_camera_msg_return2(int api, int class, int ret, muse_module_h m static void muse_camera_msg_event1(int api, int event, int class, muse_module_h module, const char *name, int value) { - char *send_msg = muse_core_msg_json_factory_new(api, + char *send_msg = muse_core_msg_new(api, MUSE_TYPE_INT, PARAM_EVENT, event, MUSE_TYPE_INT, PARAM_EVENT_CLASS, class, MUSE_TYPE_INT, name, value, @@ -157,7 +158,7 @@ static void muse_camera_msg_event1(int api, int event, int class, muse_module_h static void muse_camera_msg_event2(int api, int event, int class, muse_module_h module, const char *name0, int value0, const char *name1, int value1) { - char *send_msg = muse_core_msg_json_factory_new(api, + char *send_msg = muse_core_msg_new(api, MUSE_TYPE_INT, PARAM_EVENT, event, MUSE_TYPE_INT, PARAM_EVENT_CLASS, class, MUSE_TYPE_INT, name0, value0, @@ -173,7 +174,7 @@ static void muse_camera_msg_event2(int api, int event, int class, muse_module_h static void muse_camera_msg_event3(int api, int event, int class, muse_module_h module, const char *name0, int value0, const char *name1, int value1, const char *name2, int value2) { - char *send_msg = muse_core_msg_json_factory_new(api, + char *send_msg = muse_core_msg_new(api, MUSE_TYPE_INT, PARAM_EVENT, event, MUSE_TYPE_INT, PARAM_EVENT_CLASS, class, MUSE_TYPE_INT, name0, value0, @@ -492,7 +493,7 @@ static int _camera_remove_export_data(muse_module_h module, int key, int remove_ return FALSE; } - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); if (muse_camera == NULL) { LOGE("NULL handle"); return FALSE; @@ -592,7 +593,7 @@ void _camera_dispatcher_capturing_cb(camera_image_data_s* image, camera_image_da LOGD("Enter!!"); - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); if (!muse_camera || !image) { LOGE("invalid ptr %p %p", muse_camera, image); return; @@ -809,7 +810,7 @@ void _camera_dispatcher_state_changed_cb(camera_state_e previous, camera_state_e MUSE_CAMERA_EVENT_CLASS_THREAD_MAIN, module, "previous", previous, "current", current, "by_policy", by_policy); - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); if (!muse_camera) { LOGW("NULL muse camera handle"); return; @@ -829,7 +830,7 @@ void _camera_dispatcher_state_changed_cb(camera_state_e previous, camera_state_e if (set_value != -1) { LOGD("device[%s] state set : %d", value_key, set_value); - muse_core_client_set_value(module, value_key, set_value); + muse_server_module_set_value(module, value_key, set_value); } return; @@ -890,7 +891,7 @@ void _camera_dispatcher_preview_cb(MMCamcorderVideoStreamDataType *stream, void return; } - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); if (muse_camera == NULL) { LOGE("NULL handle"); return; @@ -1057,7 +1058,7 @@ void _camera_dispatcher_preview_cb(MMCamcorderVideoStreamDataType *stream, void g_mutex_lock(&muse_camera->preview_cb_lock); /* send message */ - send_message = muse_core_msg_json_factory_new(MUSE_CAMERA_CB_EVENT, + send_message = muse_core_msg_new(MUSE_CAMERA_CB_EVENT, MUSE_TYPE_INT, PARAM_EVENT, MUSE_CAMERA_EVENT_TYPE_PREVIEW, MUSE_TYPE_INT, PARAM_EVENT_CLASS, MUSE_CAMERA_EVENT_CLASS_THREAD_SUB, MUSE_TYPE_INT, "tbm_key", tbm_key, @@ -1066,9 +1067,9 @@ void _camera_dispatcher_preview_cb(MMCamcorderVideoStreamDataType *stream, void MUSE_TYPE_ARRAY, "buffer_key", BUFFER_MAX_PLANE_NUM, buffer_key, 0); - send_ret = muse_core_ipc_send_msg(muse_core_client_get_msg_fd(module), send_message); + send_ret = muse_core_msg_send(muse_server_module_get_msg_fd(module), send_message); - muse_core_msg_json_factory_free(send_message); + muse_core_msg_free(send_message); /*LOGD("wait preview callback return message");*/ @@ -1134,7 +1135,7 @@ void _camera_dispatcher_face_detected_cb(camera_detected_face_s *faces, int coun } if (bo_size > 0) { - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); if (muse_camera == NULL) { LOGE("NULL handle"); return; @@ -1420,7 +1421,7 @@ static void _camera_dispatcher_release_resource(muse_module_h module) LOGW("enter"); - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); _camera_remove_export_data(module, 0, TRUE); @@ -1471,8 +1472,8 @@ int camera_dispatcher_create(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_CREATE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera_msg_get(device_type, muse_core_client_get_msg(module)); - muse_camera_msg_get(pid, muse_core_client_get_msg(module)); + muse_camera_msg_get(device_type, muse_server_module_get_msg(module)); + muse_camera_msg_get(pid, muse_server_module_get_msg(module)); LOGD("device type : %d, client pid : %d", device_type, pid); @@ -1487,8 +1488,8 @@ int camera_dispatcher_create(muse_module_h module) memset(muse_camera, 0x0, sizeof(muse_camera_handle_s)); - if (muse_core_ipc_get_bufmgr(&muse_camera->bufmgr) != MM_ERROR_NONE || - muse_core_ipc_get_gdbus_connection((GDBusConnection **)&gdbus_connection) != MM_ERROR_NONE) { + if (muse_server_ipc_get_bufmgr(&muse_camera->bufmgr) != MM_ERROR_NONE || + muse_server_ipc_get_gdbus_connection((GDBusConnection **)&gdbus_connection) != MM_ERROR_NONE) { LOGE("tbm bufmgr or gdbus conntection failed %p %p", muse_camera->bufmgr, gdbus_connection); free(muse_camera); @@ -1514,7 +1515,7 @@ int camera_dispatcher_create(muse_module_h module) g_queue_init(&muse_camera->task_queue); /* camera feature support check */ - if (muse_core_get_platform_info(CAMERA_FEATURE_NAME, &camera_feature_supported) != MM_ERROR_NONE) + if (muse_server_get_platform_info(CAMERA_FEATURE_NAME, &camera_feature_supported) != MM_ERROR_NONE) LOGE("failed to get platform info for camera support"); if (!camera_feature_supported) { @@ -1560,7 +1561,7 @@ int camera_dispatcher_create(muse_module_h module) LOGD("handle : 0x%x", muse_camera); - muse_core_ipc_set_handle(module, (intptr_t)muse_camera); + muse_server_ipc_set_handle(module, (intptr_t)muse_camera); muse_camera_msg_return1(api, class, ret, module, MUSE_CAMERA_GET_TYPE_POINTER, -1, "handle", 0, muse_camera); return MUSE_CAMERA_ERROR_NONE; @@ -1601,9 +1602,9 @@ int camera_dispatcher_change_device(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_CHANGE_DEVICE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(device, muse_core_client_get_msg(module)); + muse_camera_msg_get(device, muse_server_module_get_msg(module)); LOGD("change device to %d", device); @@ -1623,7 +1624,7 @@ int camera_dispatcher_destroy(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_DESTROY; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("Enter, handle : %p", muse_camera); @@ -1647,13 +1648,13 @@ int camera_dispatcher_start_preview(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_START_PREVIEW; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); /* privilege check */ - client_fd = muse_core_client_get_msg_fd(module); - if (!muse_core_security_check_cynara(client_fd, CAMERA_PRIVILEGE_NAME)) { + client_fd = muse_server_module_get_msg_fd(module); + if (!muse_server_security_check_cynara(client_fd, CAMERA_PRIVILEGE_NAME)) { ret = CAMERA_ERROR_PERMISSION_DENIED; LOGE("security check failed 0x%x", ret); muse_camera_msg_return(api, class, ret, module); @@ -1671,7 +1672,7 @@ int camera_dispatcher_stop_preview(muse_module_h module) { muse_camera_handle_s *muse_camera = NULL; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1685,7 +1686,7 @@ int camera_dispatcher_start_capture(muse_module_h module) { muse_camera_handle_s *muse_camera = NULL; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1702,7 +1703,7 @@ int camera_dispatcher_is_supported_continuous_capture(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SUPPORT_CONTINUOUS_CAPTURE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1725,9 +1726,9 @@ int camera_dispatcher_start_continuous_capture(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_START_CONTINUOUS_CAPTURE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(value, muse_core_client_get_msg(module)); + muse_camera_msg_get(value, muse_server_module_get_msg(module)); count = value >> 16; interval = 0x0000ffff & value; @@ -1753,7 +1754,7 @@ int camera_dispatcher_stop_continuous_capture(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_STOP_CONTINUOUS_CAPTURE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1771,7 +1772,7 @@ int camera_dispatcher_is_supported_face_detection(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SUPPORT_FACE_DETECTION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1791,7 +1792,7 @@ int camera_dispatcher_is_supported_zero_shutter_lag(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SUPPORT_ZERO_SHUTTER_LAG; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1811,7 +1812,7 @@ int camera_dispatcher_is_supported_media_packet_preview_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SUPPORT_MEDIA_PACKET_PREVIEW_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1832,7 +1833,7 @@ int camera_dispatcher_get_device_count(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_DEVICE_COUNT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1854,7 +1855,7 @@ int camera_dispatcher_start_face_detection(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_START_FACE_DETECTION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("Enter, handle : 0x%x, module : %d", muse_camera, module); @@ -1874,7 +1875,7 @@ int camera_dispatcher_stop_face_detection(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_STOP_FACE_DETECTION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1893,7 +1894,7 @@ int camera_dispatcher_get_state(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_STATE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1916,9 +1917,9 @@ int camera_dispatcher_start_focusing(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_START_FOCUSING; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(is_continuous, muse_core_client_get_msg(module)); + muse_camera_msg_get(is_continuous, muse_server_module_get_msg(module)); LOGD("Enter, handle : 0x%x, module : %d", muse_camera, module); @@ -1936,7 +1937,7 @@ int camera_dispatcher_stop_focusing(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_CANCEL_FOCUSING; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -1957,19 +1958,19 @@ int camera_dispatcher_set_display(muse_module_h module) camera_display_type_e type = CAMERA_DISPLAY_TYPE_NONE; camera_h camera = NULL;; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : 0x%x", muse_camera); camera = muse_camera->camera_handle; - muse_camera_msg_get(type, muse_core_client_get_msg(module)); + muse_camera_msg_get(type, muse_server_module_get_msg(module)); LOGD("type %d", type); if (type == CAMERA_DISPLAY_TYPE_OVERLAY) { wl_info = &muse_camera->wl_info; - muse_camera_msg_get_array(wl_info, muse_core_client_get_msg(module)); + muse_camera_msg_get_array(wl_info, muse_server_module_get_msg(module)); LOGD("wayland global surface id : %d, window : %d,%d,%dx%d", wl_info->global_surface_id, wl_info->window_x, wl_info->window_y, @@ -2003,9 +2004,9 @@ int camera_dispatcher_set_preview_resolution(muse_module_h module) int value = 0; muse_camera_handle_s *muse_camera = NULL; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(value, muse_core_client_get_msg(module)); + muse_camera_msg_get(value, muse_server_module_get_msg(module)); _camera_task_add_job(muse_camera, MUSE_CAMERA_API_SET_PREVIEW_RESOLUTION, MUSE_CAMERA_API_CLASS_IMMEDIATE, value); @@ -2018,9 +2019,9 @@ int camera_dispatcher_set_capture_resolution(muse_module_h module) int value = 0; muse_camera_handle_s *muse_camera = NULL; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(value, muse_core_client_get_msg(module)); + muse_camera_msg_get(value, muse_server_module_get_msg(module)); _camera_task_add_job(muse_camera, MUSE_CAMERA_API_SET_CAPTURE_RESOLUTION, MUSE_CAMERA_API_CLASS_IMMEDIATE, value); @@ -2036,9 +2037,9 @@ int camera_dispatcher_set_capture_format(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_CAPTURE_FORMAT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_format, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_format, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_format : %d", muse_camera, set_format); @@ -2057,9 +2058,9 @@ int camera_dispatcher_set_preview_format(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_PREVIEW_FORMAT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_format, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_format, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_format : %d", muse_camera, set_format); @@ -2080,7 +2081,7 @@ int camera_dispatcher_get_preview_resolution(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_PREVIEW_RESOLUTION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2104,9 +2105,9 @@ int camera_dispatcher_set_display_rotation(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_DISPLAY_ROTATION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_rotation, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_rotation, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_rotation : %d", muse_camera, set_rotation); @@ -2125,7 +2126,7 @@ int camera_dispatcher_get_display_rotation(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_DISPLAY_ROTATION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2148,9 +2149,9 @@ int camera_dispatcher_set_display_flip(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_DISPLAY_FLIP; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_flip, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_flip, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_flip : %d", muse_camera, set_flip); @@ -2169,7 +2170,7 @@ int camera_dispatcher_get_display_flip(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_DISPLAY_FLIP; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2192,9 +2193,9 @@ int camera_dispatcher_set_display_visible(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_DISPLAY_VISIBLE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_visible, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_visible, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_visible : %d", muse_camera, set_visible); @@ -2213,7 +2214,7 @@ int camera_dispatcher_is_display_visible(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_IS_DISPLAY_VISIBLE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2236,9 +2237,9 @@ int camera_dispatcher_set_display_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_DISPLAY_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_mode, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_mode, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, display_mode : %d", muse_camera, set_mode); @@ -2259,7 +2260,7 @@ int camera_dispatcher_get_display_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_DISPLAY_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2284,7 +2285,7 @@ int camera_dispatcher_get_capture_resolution(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_CAPTURE_RESOLUTION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2308,7 +2309,7 @@ int camera_dispatcher_get_capture_format(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_CAPTURE_FORMAT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2331,7 +2332,7 @@ int camera_dispatcher_get_preview_format(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_PREVIEW_FORMAT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2354,7 +2355,7 @@ int camera_dispatcher_get_facing_direction(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_FACING_DIRECTION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2381,7 +2382,7 @@ int camera_dispatcher_get_flash_state(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_FLASH_STATE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera_msg_get(device_type, muse_core_client_get_msg(module)); + muse_camera_msg_get(device_type, muse_server_module_get_msg(module)); if (device_type > CAMERA_DEVICE_CAMERA1) { LOGE("invalid device %d", device_type); @@ -2392,7 +2393,7 @@ int camera_dispatcher_get_flash_state(muse_module_h module) return MUSE_CAMERA_ERROR_NONE; } - muse_core_client_get_value(module, MUSED_KEY_FLASH_STATE_CHECK, &is_called); + muse_server_module_get_value(module, MUSED_KEY_FLASH_STATE_CHECK, &is_called); if (!is_called) { ret = legacy_camera_create(device_type, &camera); @@ -2405,12 +2406,12 @@ int camera_dispatcher_get_flash_state(muse_module_h module) camera = NULL; } - muse_core_client_set_value(module, MUSED_KEY_FLASH_STATE_RETURN, ret); - muse_core_client_set_value(module, MUSED_KEY_FLASH_STATE_COUNT, count); - muse_core_client_set_value(module, MUSED_KEY_FLASH_STATE_CHECK, (int)true); + muse_server_module_set_value(module, MUSED_KEY_FLASH_STATE_RETURN, ret); + muse_server_module_set_value(module, MUSED_KEY_FLASH_STATE_COUNT, count); + muse_server_module_set_value(module, MUSED_KEY_FLASH_STATE_CHECK, (int)true); } else { - muse_core_client_get_value(module, MUSED_KEY_FLASH_STATE_RETURN, &ret); - muse_core_client_get_value(module, MUSED_KEY_FLASH_STATE_COUNT, &count); + muse_server_module_get_value(module, MUSED_KEY_FLASH_STATE_RETURN, &ret); + muse_server_module_get_value(module, MUSED_KEY_FLASH_STATE_COUNT, &count); } LOGD("is_called %d, ret 0x%x, count %d", is_called, ret, count); @@ -2433,7 +2434,7 @@ int camera_dispatcher_get_flash_state(muse_module_h module) } snprintf(value_key, KEY_LENGTH, "flash_state_camera%d", device_type); - muse_core_client_get_value(module, value_key, (int *)&get_flash_state); + muse_server_module_get_value(module, value_key, (int *)&get_flash_state); LOGD("[%d] flash state : %d", device_type, get_flash_state); @@ -2450,7 +2451,7 @@ int camera_dispatcher_set_preview_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_PREVIEW_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2475,7 +2476,7 @@ int camera_dispatcher_unset_preview_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_UNSET_PREVIEW_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2499,7 +2500,7 @@ int camera_dispatcher_set_media_packet_preview_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_MEDIA_PACKET_PREVIEW_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2521,7 +2522,7 @@ int camera_dispatcher_unset_media_packet_preview_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_UNSET_MEDIA_PACKET_PREVIEW_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2567,7 +2568,7 @@ int camera_dispatcher_set_interrupted_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_INTERRUPTED_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2590,7 +2591,7 @@ int camera_dispatcher_unset_interrupted_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_UNSET_INTERRUPTED_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2611,7 +2612,7 @@ int camera_dispatcher_set_interrupt_started_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_INTERRUPT_STARTED_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2634,7 +2635,7 @@ int camera_dispatcher_unset_interrupt_started_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_UNSET_INTERRUPT_STARTED_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2654,7 +2655,7 @@ int camera_dispatcher_set_focus_changed_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_FOCUS_CHANGED_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2676,7 +2677,7 @@ int camera_dispatcher_unset_focus_changed_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_UNSET_FOCUS_CHANGED_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2696,7 +2697,7 @@ int camera_dispatcher_set_error_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_ERROR_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2718,7 +2719,7 @@ int camera_dispatcher_unset_error_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_UNSET_ERROR_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2738,7 +2739,7 @@ int camera_dispatcher_foreach_supported_preview_resolution(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_FOREACH_SUPPORTED_PREVIEW_RESOLUTION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2760,7 +2761,7 @@ int camera_dispatcher_foreach_supported_capture_resolution(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_FOREACH_SUPPORTED_CAPTURE_RESOLUTION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2782,7 +2783,7 @@ int camera_dispatcher_foreach_supported_capture_format(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_FOREACH_SUPPORTED_CAPTURE_FORMAT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2804,7 +2805,7 @@ int camera_dispatcher_foreach_supported_preview_format(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_FOREACH_SUPPORTED_PREVIEW_FORMAT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2829,7 +2830,7 @@ int camera_dispatcher_get_recommended_preview_resolution(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_RECOMMENDED_PREVIEW_RESOLUTION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2853,7 +2854,7 @@ int camera_dispatcher_attr_get_lens_orientation(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_LENS_ORIENTATION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2876,9 +2877,9 @@ int camera_dispatcher_attr_set_theater_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_THEATER_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_mode, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_mode, muse_server_module_get_msg(module)); LOGD("handle : %p", muse_camera); @@ -2897,7 +2898,7 @@ int camera_dispatcher_attr_get_theater_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_THEATER_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -2919,7 +2920,7 @@ int camera_dispatcher_attr_foreach_supported_theater_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_THEATER_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); ret = legacy_camera_attr_foreach_supported_theater_mode(muse_camera->camera_handle, @@ -2939,9 +2940,9 @@ int camera_dispatcher_attr_set_preview_fps(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_PREVIEW_FPS; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_fps, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_fps, muse_server_module_get_msg(module)); LOGD("handle : %p", muse_camera); @@ -2960,9 +2961,9 @@ int camera_dispatcher_attr_set_image_quality(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_IMAGE_QUALITY; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(quality, muse_core_client_get_msg(module)); + muse_camera_msg_get(quality, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, image_quality : %d", muse_camera, quality); @@ -2983,7 +2984,7 @@ int camera_dispatcher_attr_get_preview_fps(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_PREVIEW_FPS; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3006,7 +3007,7 @@ int camera_dispatcher_attr_get_image_quality(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_IMAGE_QUALITY; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3029,9 +3030,9 @@ int camera_dispatcher_attr_set_zoom(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_ZOOM; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(zoom, muse_core_client_get_msg(module)); + muse_camera_msg_get(zoom, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, zoom : %d", muse_camera, zoom); @@ -3052,9 +3053,9 @@ int camera_dispatcher_attr_set_af_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_AF_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_mode, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_mode, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_mode : %d", muse_camera, set_mode); @@ -3077,9 +3078,9 @@ int camera_dispatcher_attr_set_af_area(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_AF_AREA; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(value, muse_core_client_get_msg(module)); + muse_camera_msg_get(value, muse_server_module_get_msg(module)); x = value >> 16; y = 0x0000ffff & value; @@ -3102,7 +3103,7 @@ int camera_dispatcher_attr_clear_af_area(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_CLEAR_AF_AREA; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3123,9 +3124,9 @@ int camera_dispatcher_attr_set_exposure_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_EXPOSURE_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_mode, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_mode, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_mode : %d", muse_camera, set_mode); @@ -3146,9 +3147,9 @@ int camera_dispatcher_attr_set_exposure(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_EXPOSURE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(value, muse_core_client_get_msg(module)); + muse_camera_msg_get(value, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, value : %d", muse_camera, value); @@ -3169,9 +3170,9 @@ int camera_dispatcher_attr_set_iso(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_ISO; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_iso, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_iso, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_iso : %d", muse_camera, set_iso); @@ -3192,9 +3193,9 @@ int camera_dispatcher_attr_set_brightness(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_BRIGHTNESS; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(level, muse_core_client_get_msg(module)); + muse_camera_msg_get(level, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, level : %d", muse_camera, level); @@ -3215,9 +3216,9 @@ int camera_dispatcher_attr_set_contrast(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_CONTRAST; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(level, muse_core_client_get_msg(module)); + muse_camera_msg_get(level, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, level : %d", muse_camera, level); @@ -3238,9 +3239,9 @@ int camera_dispatcher_attr_set_whitebalance(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_WHITEBALANCE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_whitebalance, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_whitebalance, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_whitebalance : %d", muse_camera, set_whitebalance); @@ -3261,9 +3262,9 @@ int camera_dispatcher_attr_set_effect(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_EFFECT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_effect, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_effect, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_effect : %d", muse_camera, set_effect); @@ -3284,9 +3285,9 @@ int camera_dispatcher_attr_set_scene_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_SCENE_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_mode, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_mode, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_mode : %d", muse_camera, set_mode); @@ -3307,9 +3308,9 @@ int camera_dispatcher_attr_enable_tag(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_ENABLE_TAG; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_enable, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_enable, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_enable : %d", muse_camera, set_enable); @@ -3330,9 +3331,9 @@ int camera_dispatcher_attr_set_tag_image_description(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; char description[MUSE_CAMERA_MSG_MAX_LENGTH] = {0,}; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get_string(description, muse_core_client_get_msg(module)); + muse_camera_msg_get_string(description, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, description : %s", muse_camera, description); @@ -3353,9 +3354,9 @@ int camera_dispatcher_attr_set_tag_orientation(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_TAG_ORIENTATION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_orientation, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_orientation, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_orientation : %d", muse_camera, set_orientation); @@ -3376,9 +3377,9 @@ int camera_dispatcher_attr_set_tag_software(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; char software[MUSE_CAMERA_MSG_MAX_LENGTH] = {0,}; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get_string(software, muse_core_client_get_msg(module)); + muse_camera_msg_get_string(software, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, software : %s", muse_camera, software); @@ -3399,9 +3400,9 @@ int camera_dispatcher_attr_set_geotag(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; double set_geotag[3] = {0,}; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get_array(set_geotag, muse_core_client_get_msg(module)); + muse_camera_msg_get_array(set_geotag, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_geotag1 : %d, set_geotag2 : %d, set_geotag3 : %d", muse_camera, set_geotag[0], set_geotag[1], set_geotag[2]); @@ -3422,7 +3423,7 @@ int camera_dispatcher_attr_remove_geotag(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_REMOVE_GEOTAG; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3445,9 +3446,9 @@ int camera_dispatcher_attr_set_flash_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_FLASH_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_mode, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_mode, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_mode : %d", muse_camera, set_mode); @@ -3456,7 +3457,7 @@ int camera_dispatcher_attr_set_flash_mode(muse_module_h module) ret = legacy_camera_get_device_type(muse_camera->camera_handle, &device_type); if (ret == CAMERA_ERROR_NONE) { snprintf(value_key, KEY_LENGTH, "flash_state_camera%d", device_type); - muse_core_client_set_value(module, value_key, set_mode > 0 ? 1 : 0); + muse_server_module_set_value(module, value_key, set_mode > 0 ? 1 : 0); } } @@ -3475,7 +3476,7 @@ int camera_dispatcher_attr_get_zoom(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_ZOOM; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3501,7 +3502,7 @@ int camera_dispatcher_attr_get_zoom_range(muse_module_h module) muse_camera_get_type_e get_type = MUSE_CAMERA_GET_TYPE_INT_PAIR; muse_camera_get_int_pair_e index = MUSE_CAMERA_GET_INT_PAIR_ZOOM_RANGE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3522,7 +3523,7 @@ int camera_dispatcher_attr_get_af_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_AF_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3545,7 +3546,7 @@ int camera_dispatcher_attr_get_exposure_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_EXPOSURE_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3568,7 +3569,7 @@ int camera_dispatcher_attr_get_exposure(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_EXPOSURE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3594,7 +3595,7 @@ int camera_dispatcher_attr_get_exposure_range(muse_module_h module) muse_camera_get_type_e get_type = MUSE_CAMERA_GET_TYPE_INT_PAIR; muse_camera_get_int_pair_e index = MUSE_CAMERA_GET_INT_PAIR_EXPOSURE_RANGE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3615,7 +3616,7 @@ int camera_dispatcher_attr_get_iso(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_ISO; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3638,7 +3639,7 @@ int camera_dispatcher_attr_get_brightness(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_BRIGHTNESS; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3664,7 +3665,7 @@ int camera_dispatcher_attr_get_brightness_range(muse_module_h module) muse_camera_get_type_e get_type = MUSE_CAMERA_GET_TYPE_INT_PAIR; muse_camera_get_int_pair_e index = MUSE_CAMERA_GET_INT_PAIR_BRIGHTNESS_RANGE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3685,7 +3686,7 @@ int camera_dispatcher_attr_get_contrast(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_CONTRAST; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3711,7 +3712,7 @@ int camera_dispatcher_attr_get_contrast_range(muse_module_h module) muse_camera_get_type_e get_type = MUSE_CAMERA_GET_TYPE_INT_PAIR; muse_camera_get_int_pair_e index = MUSE_CAMERA_GET_INT_PAIR_CONTRAST_RANGE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3732,7 +3733,7 @@ int camera_dispatcher_attr_get_whitebalance(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_WHITEBALANCE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3755,7 +3756,7 @@ int camera_dispatcher_attr_get_effect(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_EFFECT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3778,7 +3779,7 @@ int camera_dispatcher_attr_get_scene_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_SCENE_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3801,7 +3802,7 @@ int camera_dispatcher_attr_is_enabled_tag(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_ENABLED_TAG; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3824,7 +3825,7 @@ int camera_dispatcher_attr_get_tag_image_description(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; char *get_value = NULL; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); ret = legacy_camera_attr_get_tag_image_description(muse_camera->camera_handle, &get_value); if (ret == CAMERA_ERROR_NONE) { @@ -3851,7 +3852,7 @@ int camera_dispatcher_attr_get_tag_orientation(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_TAG_ORIENTATION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3874,7 +3875,7 @@ int camera_dispatcher_attr_get_tag_software(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; char *get_value = NULL; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); ret = legacy_camera_attr_get_tag_software(muse_camera->camera_handle, &get_value); if (ret == CAMERA_ERROR_NONE) { @@ -3903,7 +3904,7 @@ int camera_dispatcher_attr_get_geotag(muse_module_h module) char *send_msg = NULL; int msg_array_size = 0; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3911,7 +3912,7 @@ int camera_dispatcher_attr_get_geotag(muse_module_h module) if (ret == CAMERA_ERROR_NONE) { msg_array_size = sizeof(get_value) / sizeof(int) + (sizeof(get_value) % sizeof(int) ? 1 : 0); - send_msg = muse_core_msg_json_factory_new(api, + send_msg = muse_core_msg_new(api, MUSE_TYPE_INT, PARAM_API_CLASS, class, MUSE_TYPE_INT, PARAM_RET, ret, MUSE_TYPE_INT, PARAM_GET_TYPE, MUSE_CAMERA_GET_TYPE_ARRAY, @@ -3934,7 +3935,7 @@ int camera_dispatcher_attr_get_flash_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_FLASH_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3956,7 +3957,7 @@ int camera_dispatcher_attr_foreach_supported_af_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_AF_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -3978,7 +3979,7 @@ int camera_dispatcher_attr_foreach_supported_exposure_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_EXPOSURE_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : 0x%x, api : %d", muse_camera, api); @@ -4000,7 +4001,7 @@ int camera_dispatcher_attr_foreach_supported_iso(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_ISO; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4022,7 +4023,7 @@ int camera_dispatcher_attr_foreach_supported_whitebalance(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_WHITEBALANCE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4044,7 +4045,7 @@ int camera_dispatcher_attr_foreach_supported_effect(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_EFFECT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4066,7 +4067,7 @@ int camera_dispatcher_attr_foreach_supported_scene_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_SCENE_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4088,7 +4089,7 @@ int camera_dispatcher_attr_foreach_supported_flash_mode(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_FLASH_MODE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4110,7 +4111,7 @@ int camera_dispatcher_attr_foreach_supported_fps(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_FPS; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4135,9 +4136,9 @@ int camera_dispatcher_attr_foreach_supported_fps_by_resolution(muse_module_h mod int width = 0; int height = 0; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(value, muse_core_client_get_msg(module)); + muse_camera_msg_get(value, muse_server_module_get_msg(module)); width = value >> 16; height = 0x0000ffff & value; @@ -4163,7 +4164,7 @@ int camera_dispatcher_attr_foreach_supported_stream_flip(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_STREAM_FLIP; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4185,7 +4186,7 @@ int camera_dispatcher_attr_foreach_supported_stream_rotation(muse_module_h modul muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_STREAM_ROTATION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4208,9 +4209,9 @@ int camera_dispatcher_attr_set_stream_rotation(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; int set_rotation; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_rotation, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_rotation, muse_server_module_get_msg(module)); LOGD("handle : %p", muse_camera); @@ -4231,7 +4232,7 @@ int camera_dispatcher_attr_get_stream_rotation(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; camera_rotation_e get_value = CAMERA_ROTATION_NONE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4254,9 +4255,9 @@ int camera_dispatcher_attr_set_stream_flip(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; int set_flip; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_flip, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_flip, muse_server_module_get_msg(module)); LOGD("handle : %p", muse_camera); @@ -4277,7 +4278,7 @@ int camera_dispatcher_attr_get_stream_flip(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; camera_flip_e get_value = CAMERA_FLIP_NONE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4297,11 +4298,11 @@ int camera_dispatcher_attr_set_hdr_mode(muse_module_h module) int set_mode = 0; muse_camera_handle_s *muse_camera = NULL; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); - muse_camera_msg_get(set_mode, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_mode, muse_server_module_get_msg(module)); _camera_task_add_job(muse_camera, MUSE_CAMERA_API_ATTR_SET_HDR_MODE, MUSE_CAMERA_API_CLASS_IMMEDIATE, set_mode); @@ -4317,7 +4318,7 @@ int camera_dispatcher_attr_get_hdr_mode(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; camera_attr_hdr_mode_e get_value = CAMERA_ATTR_HDR_MODE_DISABLE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4339,7 +4340,7 @@ int camera_dispatcher_attr_is_supported_hdr_capture(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_SUPPORTED_HDR_CAPTURE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4359,7 +4360,7 @@ int camera_dispatcher_attr_set_hdr_capture_progress_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_HDR_CAPTURE_PROGRESS_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4381,7 +4382,7 @@ int camera_dispatcher_attr_unset_hdr_capture_progress_cb(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_UNSET_HDR_CAPTURE_PROGRESS_CB; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4402,9 +4403,9 @@ int camera_dispatcher_attr_enable_anti_shake(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; int set_enable; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_enable, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_enable, muse_server_module_get_msg(module)); LOGD("handle : %p", muse_camera); @@ -4425,7 +4426,7 @@ int camera_dispatcher_attr_is_enabled_anti_shake(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; bool get_value = false; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4447,7 +4448,7 @@ int camera_dispatcher_attr_is_supported_anti_shake(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_SUPPORTED_ANTI_SHAKE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4468,9 +4469,9 @@ int camera_dispatcher_attr_enable_video_stabilization(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; int set_enable; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_enable, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_enable, muse_server_module_get_msg(module)); LOGD("handle : %p", muse_camera); @@ -4491,7 +4492,7 @@ int camera_dispatcher_attr_is_enabled_video_stabilization(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; bool get_value = false; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4513,7 +4514,7 @@ int camera_dispatcher_attr_is_supported_video_stabilization(muse_module_h module muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_SUPPORTED_VIDEO_STABILIZATION; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4534,9 +4535,9 @@ int camera_dispatcher_attr_enable_auto_contrast(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; int set_enable; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_enable, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_enable, muse_server_module_get_msg(module)); LOGD("handle : %p", muse_camera); @@ -4557,7 +4558,7 @@ int camera_dispatcher_attr_is_enabled_auto_contrast(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; bool get_value = false; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4579,7 +4580,7 @@ int camera_dispatcher_attr_is_supported_auto_contrast(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_SUPPORTED_AUTO_CONTRAST; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4600,9 +4601,9 @@ int camera_dispatcher_attr_disable_shutter_sound(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; int set_disable; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_disable, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_disable, muse_server_module_get_msg(module)); LOGD("handle : %p", muse_camera); @@ -4623,7 +4624,7 @@ int camera_dispatcher_attr_get_encoded_preview_bitrate(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_ENCODED_PREVIEW_BITRATE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4646,9 +4647,9 @@ int camera_dispatcher_attr_set_encoded_preview_bitrate(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_ENCODED_PREVIEW_BITRATE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_bitrate, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_bitrate, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_encoded_preview_bitrate : %d", muse_camera, set_bitrate); @@ -4669,7 +4670,7 @@ int camera_dispatcher_attr_get_encoded_preview_gop_interval(muse_module_h module muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_ENCODED_PREVIEW_GOP_INTERVAL; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4692,9 +4693,9 @@ int camera_dispatcher_attr_set_encoded_preview_gop_interval(muse_module_h module muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_ENCODED_PREVIEW_GOP_INTERVAL; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_gop_interval, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_gop_interval, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, set_encoded_preview_gop_interval : %d", muse_camera, set_gop_interval); @@ -4717,9 +4718,9 @@ int camera_dispatcher_attr_set_pan(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_PAN; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(value, muse_core_client_get_msg(module)); + muse_camera_msg_get(value, muse_server_module_get_msg(module)); type = value >> 16; step = 0x0000ffff & value; @@ -4743,7 +4744,7 @@ int camera_dispatcher_attr_get_pan(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_PAN; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4769,7 +4770,7 @@ int camera_dispatcher_attr_get_pan_range(muse_module_h module) muse_camera_get_type_e get_type = MUSE_CAMERA_GET_TYPE_INT_PAIR; muse_camera_get_int_pair_e index = MUSE_CAMERA_GET_INT_PAIR_PAN_RANGE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4792,9 +4793,9 @@ int camera_dispatcher_attr_set_tilt(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_TILT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(value, muse_core_client_get_msg(module)); + muse_camera_msg_get(value, muse_server_module_get_msg(module)); type = value >> 16; step = 0x0000ffff & value; @@ -4818,7 +4819,7 @@ int camera_dispatcher_attr_get_tilt(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_TILT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4844,7 +4845,7 @@ int camera_dispatcher_attr_get_tilt_range(muse_module_h module) muse_camera_get_type_e get_type = MUSE_CAMERA_GET_TYPE_INT_PAIR; muse_camera_get_int_pair_e index = MUSE_CAMERA_GET_INT_PAIR_TILT_RANGE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4865,9 +4866,9 @@ int camera_dispatcher_attr_set_ptz_type(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_PTZ_TYPE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_ptz_type, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_ptz_type, muse_server_module_get_msg(module)); LOGD("handle : 0x%x", muse_camera); @@ -4887,7 +4888,7 @@ int camera_dispatcher_attr_foreach_supported_ptz_type(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_PTZ_TYPE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_THREAD_SUB; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); @@ -4910,9 +4911,9 @@ int camera_dispatcher_attr_set_display_roi_area(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_DISPLAY_ROI_AREA; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get_array(set_display_roi_area, muse_core_client_get_msg(module)); + muse_camera_msg_get_array(set_display_roi_area, muse_server_module_get_msg(module)); LOGD("handle : 0x%x, x : %d, y : %d, width : %d, height : %d", muse_camera, set_display_roi_area[0], set_display_roi_area[1], set_display_roi_area[2], set_display_roi_area[3]); @@ -4935,13 +4936,13 @@ int camera_dispatcher_attr_get_display_roi_area(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; char *send_msg = NULL; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); LOGD("handle : %p", muse_camera); ret = legacy_camera_attr_get_display_roi_area(muse_camera->camera_handle, get_value); if (ret == CAMERA_ERROR_NONE) { - send_msg = muse_core_msg_json_factory_new(api, + send_msg = muse_core_msg_new(api, MUSE_TYPE_INT, PARAM_API_CLASS, class, MUSE_TYPE_INT, PARAM_RET, ret, MUSE_TYPE_INT, PARAM_GET_TYPE, MUSE_CAMERA_GET_TYPE_ARRAY, @@ -4962,9 +4963,9 @@ int camera_dispatcher_return_buffer(muse_module_h module) int tbm_key = 0; muse_camera_handle_s *muse_camera = NULL; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(tbm_key, muse_core_client_get_msg(module)); + muse_camera_msg_get(tbm_key, muse_server_module_get_msg(module)); /*LOGD("handle : %p, key : %d", muse_camera, tbm_key);*/ @@ -4978,7 +4979,7 @@ int camera_dispatcher_preview_cb_return(muse_module_h module) { muse_camera_handle_s *muse_camera = NULL; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); if (muse_camera == NULL) { LOGE("NULL handle"); @@ -5005,9 +5006,9 @@ int camera_dispatcher_set_display_reuse_hint(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_SET_DISPLAY_REUSE_HINT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); - muse_camera_msg_get(set_hint, muse_core_client_get_msg(module)); + muse_camera_msg_get(set_hint, muse_server_module_get_msg(module)); LOGD("set hint : %d", set_hint); @@ -5026,7 +5027,7 @@ int camera_dispatcher_get_display_reuse_hint(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_DISPLAY_REUSE_HINT; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); ret = legacy_camera_get_display_reuse_hint(muse_camera->camera_handle, &get_value); if (ret == CAMERA_ERROR_NONE) { @@ -5051,7 +5052,7 @@ int camera_dispatcher_get_device_state(muse_module_h module) muse_camera_api_e api = MUSE_CAMERA_API_GET_DEVICE_STATE; muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; - muse_camera_msg_get(device_type, muse_core_client_get_msg(module)); + muse_camera_msg_get(device_type, muse_server_module_get_msg(module)); if (device_type > CAMERA_DEVICE_CAMERA1) { LOGE("invalid device %d", device_type); @@ -5062,7 +5063,7 @@ int camera_dispatcher_get_device_state(muse_module_h module) return MUSE_CAMERA_ERROR_NONE; } - muse_core_client_get_value(module, MUSED_KEY_DEVICE_STATE_CHECK, &is_called); + muse_server_module_get_value(module, MUSED_KEY_DEVICE_STATE_CHECK, &is_called); if (!is_called) { ret = legacy_camera_create(device_type, &camera); @@ -5071,10 +5072,10 @@ int camera_dispatcher_get_device_state(muse_module_h module) camera = NULL; } - muse_core_client_set_value(module, MUSED_KEY_DEVICE_STATE_RETURN, ret); - muse_core_client_set_value(module, MUSED_KEY_DEVICE_STATE_CHECK, (int)true); + muse_server_module_set_value(module, MUSED_KEY_DEVICE_STATE_RETURN, ret); + muse_server_module_set_value(module, MUSED_KEY_DEVICE_STATE_CHECK, (int)true); } else { - muse_core_client_get_value(module, MUSED_KEY_DEVICE_STATE_RETURN, &ret); + muse_server_module_get_value(module, MUSED_KEY_DEVICE_STATE_RETURN, &ret); } LOGD("is_called %d, ret 0x%x", is_called, ret); @@ -5088,7 +5089,7 @@ int camera_dispatcher_get_device_state(muse_module_h module) } snprintf(value_key, KEY_LENGTH, "device_state_camera%d", device_type); - muse_core_client_get_value(module, value_key, (int *)&get_device_state); + muse_server_module_get_value(module, value_key, (int *)&get_device_state); LOGD("device[%d] state : %d", device_type, get_device_state); @@ -5297,7 +5298,7 @@ static int camera_cmd_dispatcher_shutdown(muse_module_h module) int capture_try_count = 0; int ret = 0; - muse_camera = (muse_camera_handle_s *)muse_core_ipc_get_handle(module); + muse_camera = (muse_camera_handle_s *)muse_server_ipc_get_handle(module); if (muse_camera == NULL) { LOGE("NULL handle"); return MUSE_CAMERA_ERROR_INVALID; diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec index 8d73dab..6e255f7 100644 --- a/packaging/mmsvc-camera.spec +++ b/packaging/mmsvc-camera.spec @@ -1,6 +1,6 @@ Name: mmsvc-camera Summary: A Camera module for muse server -Version: 0.3.3 +Version: 0.3.4 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 @@ -8,7 +8,7 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(dlog) -BuildRequires: pkgconfig(mused) +BuildRequires: pkgconfig(muse-server) BuildRequires: pkgconfig(mm-camcorder) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(ecore-wayland) -- 2.7.4