Add new display type for Ecore_Wl2_Window

[Version] 0.3.32
[Profile] Common
[Issue Type] New feature

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

diff --git a/legacy/include/legacy_camera.h b/legacy/include/legacy_camera.h
index 7dba78a..0beeec5 100644 (file)
--- a/legacy/include/legacy_camera.h
+++ b/legacy/include/legacy_camera.h
@@ -128,7 +128,8 @@ typedef enum {
 typedef enum {
        CAMERA_DISPLAY_TYPE_OVERLAY = 0,    /**< Overlay surface display */
        CAMERA_DISPLAY_TYPE_EVAS,           /**< Evas object surface display */
-       CAMERA_DISPLAY_TYPE_NONE            /**< This disposes off buffers */
+       CAMERA_DISPLAY_TYPE_NONE,           /**< This disposes off buffers */
+       CAMERA_DISPLAY_TYPE_OVERLAY_EXT     /**< Overlay surface display extra */
 } camera_display_type_e;
 
 /**

diff --git a/legacy/src/legacy_camera.c b/legacy/src/legacy_camera.c
index 8058228..0e17054 100644 (file)
--- a/legacy/src/legacy_camera.c
+++ b/legacy/src/legacy_camera.c
@@ -1322,6 +1322,7 @@ int legacy_camera_set_display(camera_h camera, camera_display_type_e type, camer
 
        switch (type) {
        case CAMERA_DISPLAY_TYPE_OVERLAY:
+       case CAMERA_DISPLAY_TYPE_OVERLAY_EXT:
                handle->display_handle = display;
                set_surface = MM_DISPLAY_SURFACE_OVERLAY;
                set_handle = display;

diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c
index 203bc23..8725d81 100644 (file)
--- a/muse/src/muse_camera_dispatcher.c
+++ b/muse/src/muse_camera_dispatcher.c
@@ -2114,6 +2114,7 @@ int camera_dispatcher_set_display(muse_module_h module)
 
        switch (dp_info.type) {
        case CAMERA_DISPLAY_TYPE_OVERLAY:
+       case CAMERA_DISPLAY_TYPE_OVERLAY_EXT:
                LOGD("wayland global surface id : %d", muse_camera->window_info.surface_id);
                ret = legacy_camera_set_display(muse_camera->camera_handle,
                        CAMERA_DISPLAY_TYPE_OVERLAY, (void *)&muse_camera->window_info);

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index 0bb888b..16ac325 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.31
+Version:    0.3.32
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0