Remove unused variable 29/159329/2
authorJeongmo Yang <jm80.yang@samsung.com>
Wed, 8 Nov 2017 07:28:19 +0000 (16:28 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Wed, 8 Nov 2017 07:33:14 +0000 (16:33 +0900)
[Version] 0.3.10
[Profile] Common
[Issue Type] Update
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-unified_20171107.4]

Change-Id: I3e36ab748cee70482b12aee3563b77bfa38f8aa9
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
include/camera_private.h
packaging/capi-media-camera.spec
src/camera.c

index 3215f82..9204df5 100644 (file)
@@ -184,7 +184,6 @@ typedef struct _camera_wl_info_s {
        int window_y;
        int window_width;
        int window_height;
-       void *evas_obj;
 } camera_wl_info_s;
 
 typedef struct _camera_cli_s {
index 6ec1a7f..b2b5775 100644 (file)
@@ -1,6 +1,6 @@
 Name:       capi-media-camera
 Summary:    A Camera API
-Version:    0.3.9
+Version:    0.3.10
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
index f452db8..e5c2403 100644 (file)
@@ -219,8 +219,6 @@ int _camera_get_wl_info(Evas_Object *obj, camera_wl_info_s *wl_info)
                Ecore_Evas *ecore_evas = NULL;
                ret = CAMERA_ERROR_NONE;
 
-               wl_info->evas_obj = obj;
-
                evas_object_geometry_get(obj, &wl_info->window_x, &wl_info->window_y,
                        &wl_info->window_width, &wl_info->window_height);
 
@@ -240,7 +238,7 @@ int _camera_get_wl_info(Evas_Object *obj, camera_wl_info_s *wl_info)
                }
 
                LOGD("evas object : %p, rotation : %d, parent id : %u, window : %d,%d,%dx%d",
-                       wl_info->evas_obj, rotation, wl_info->parent_id,
+                       obj, rotation, wl_info->parent_id,
                        wl_info->window_x, wl_info->window_y,
                        wl_info->window_width, wl_info->window_height);
        } else {
@@ -1447,10 +1445,14 @@ static void _camera_client_user_callback(camera_cb_info_s *cb_info, char *recv_m
                        g_mutex_unlock(&cb_info->user_cb_mutex[event]);
                        LOGW("NULL callback for event %d, return here", event);
                        return;
-               } else {
-                       /* do not return in this case, because return buffer message should be sent. */
-                       LOGW("NULL callback for event %d, NOT return here", event);
                }
+
+               /* return buffer message should be sent for some events.
+                - MUSE_CAMERA_EVENT_TYPE_PREVIEW
+                - MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW
+                - MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION
+                - MUSE_CAMERA_EVENT_TYPE_CAPTURE
+               */
        }
 
        switch (event) {