Replace wl_info by parent_id

[Version] 0.3.8
[Profile] Common
[Issue Type] Update
[Dependency module] capi-media-camera, libmm-camcorder
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-unified_20171122.1]

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

diff --git a/muse/include/muse_camera_internal.h b/muse/include/muse_camera_internal.h
index 7733b23..a6c6dad 100644 (file)
--- a/muse/include/muse_camera_internal.h
+++ b/muse/include/muse_camera_internal.h
@@ -53,7 +53,7 @@ typedef struct {
        GMutex preview_cb_lock;
        GCond preview_cb_cond;
        guint preview_cb_flag;
-       MMCamWaylandInfo wl_info;
+       gint parent_id;
        GThread *task_thread;
        GMutex task_lock;
        GCond task_cond;

diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c
index 3e12485..9c507e0 100644 (file)
--- a/muse/src/muse_camera_dispatcher.c
+++ b/muse/src/muse_camera_dispatcher.c
@@ -1988,10 +1988,10 @@ int camera_dispatcher_stop_focusing(muse_module_h module)
 int camera_dispatcher_set_display(muse_module_h module)
 {
        int ret = CAMERA_ERROR_NONE;
+       int parent_id = 0;
        muse_camera_handle_s *muse_camera = NULL;
        muse_camera_api_e api = MUSE_CAMERA_API_SET_DISPLAY;
        muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE;
-       MMCamWaylandInfo *wl_info = NULL;
        camera_display_type_e type = CAMERA_DISPLAY_TYPE_NONE;
        camera_h camera = NULL;;
 
@@ -2006,14 +2006,13 @@ int camera_dispatcher_set_display(muse_module_h 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_server_module_get_msg(module));
+               muse_camera_msg_get(parent_id, 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,
-                       wl_info->window_width, wl_info->window_height);
+               LOGD("wayland global surface id : %d", parent_id);
 
-               ret = legacy_camera_set_display(muse_camera->camera_handle, type, (void *)wl_info);
+               muse_camera->parent_id = parent_id;
+
+               ret = legacy_camera_set_display(muse_camera->camera_handle, type, (void *)&muse_camera->parent_id);
 
                muse_camera_msg_return(api, class, ret, module);
        } else {

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index cdb3070..ffe8bda 100644 (file)
--- 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.7
+Version:    0.3.8
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0