[Release version 0.2.26] Replace display enum 23/57923/1 accepted/tizen/mobile/20160127.004313 accepted/tizen/tv/20160127.004535 accepted/tizen/wearable/20160127.004731 submit/tizen/20160126.083631
authorJeongmo Yang <jm80.yang@samsung.com>
Tue, 26 Jan 2016 05:25:56 +0000 (14:25 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Tue, 26 Jan 2016 05:25:56 +0000 (14:25 +0900)
Change-Id: I646ac90771b0789dac344ddc4f00928cbe970c20
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
legacy/src/legacy_camera.c
packaging/mmsvc-camera.spec

index 51b5750..00b0baf 100755 (executable)
@@ -1254,7 +1254,7 @@ int legacy_camera_cancel_focusing(camera_h camera)
 int legacy_camera_set_display(camera_h camera, camera_display_type_e type, camera_display_h display)
 {
        int ret = MM_ERROR_NONE;
-       int set_surface = MM_DISPLAY_SURFACE_X;
+       int set_surface = MM_DISPLAY_SURFACE_OVERLAY;
        void *set_handle = NULL;
        camera_s *handle = NULL;
 
@@ -1315,7 +1315,7 @@ int legacy_camera_set_display(camera_h camera, camera_display_type_e type, camer
 
                                /* set wayland info */
                                handle->wl_info = (void *)wl_info;
-                               set_surface = MM_DISPLAY_SURFACE_X;
+                               set_surface = MM_DISPLAY_SURFACE_OVERLAY;
                                set_handle = (void *)wl_info;
 
                                LOGD("wayland obj %p, window %p, surface %p, display %p, size %d,%d,%dx%d",
@@ -1324,7 +1324,7 @@ int legacy_camera_set_display(camera_h camera, camera_display_type_e type, camer
 #else /* HAVE_WAYLAND */
                                /* x window overlay surface */
                                handle->display_handle = (void *)elm_win_xwindow_get(obj);
-                               set_surface = MM_DISPLAY_SURFACE_X;
+                               set_surface = MM_DISPLAY_SURFACE_OVERLAY;
                                set_handle = &(handle->display_handle);
 
                                LOGD("display type OVERLAY : handle %p, %d", set_handle, (int)handle->display_handle);
index ed2e070..69c0802 100755 (executable)
@@ -3,7 +3,7 @@
 
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.2.25
+Version:    0.2.26
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0