[Release version 0.2.40] Replace display enum 21/57921/1 accepted/tizen/mobile/20160127.004315 accepted/tizen/tv/20160127.004536 accepted/tizen/wearable/20160127.004732 submit/tizen/20160126.083631
authorJeongmo Yang <jm80.yang@samsung.com>
Tue, 26 Jan 2016 05:24:49 +0000 (14:24 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Tue, 26 Jan 2016 05:25:31 +0000 (14:25 +0900)
Change-Id: I1ff35d70e0306bfb7659a1f068f9b71321c2d56d
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
packaging/capi-media-camera.spec
src/camera.c

index 914e2d7..a780c72 100644 (file)
@@ -3,7 +3,7 @@
 
 Name:       capi-media-camera
 Summary:    A Camera API
-Version:    0.2.39
+Version:    0.2.40
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
index 5b3b38f..b073f9d 100644 (file)
@@ -2375,7 +2375,7 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ
 {
        int ret = CAMERA_ERROR_NONE;
        void *set_display_handle = NULL;
-       int set_surface = MM_DISPLAY_SURFACE_X;
+       int set_surface = MM_DISPLAY_SURFACE_OVERLAY;
        Evas_Object *obj = NULL;
        const char *object_type = NULL;
        char socket_path[MUSE_CAMERA_MSG_MAX_LENGTH] = {0,};
@@ -2426,7 +2426,7 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ
                                /* x window overlay surface */
                                set_display_handle = (void *)elm_win_xwindow_get(obj);
 #endif
-                               set_surface = MM_DISPLAY_SURFACE_X;
+                               set_surface = MM_DISPLAY_SURFACE_OVERLAY;
                                LOGD("display type OVERLAY : handle %p", set_display_handle);
                        } else if (type == CAMERA_DISPLAY_TYPE_EVAS && !strcmp(object_type, "image")) {
                                /* evas object surface */