From: Jeongmo Yang Date: Mon, 20 Nov 2017 06:57:05 +0000 (+0900) Subject: Change parameter of set_display from structure to int pointer X-Git-Tag: submit/tizen/20171121.061224^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ff5612daf3b33e3806ec3538ec855f53bc925d3;p=platform%2Fcore%2Fmultimedia%2Flibmm-display.git Change parameter of set_display from structure to int pointer [Version] 0.0.2 [Profile] Common [Issue Type] Update [Dependency module] N/A Change-Id: I4657e8bf5e9079a8376d782113fde1c69aec0e0e Signed-off-by: Jeongmo Yang --- diff --git a/LICENSE.APLv2 b/LICENSE.APLv2 index bbe9d02..f94008a 100644 --- a/LICENSE.APLv2 +++ b/LICENSE.APLv2 @@ -1,206 +1,206 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + diff --git a/packaging/libmm-display.spec b/packaging/libmm-display.spec index 9310856..824216c 100644 --- a/packaging/libmm-display.spec +++ b/packaging/libmm-display.spec @@ -1,6 +1,6 @@ Name: libmm-display Summary: Multimedia framework display library -Version: 0.0.1 +Version: 0.0.2 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_display.h b/src/include/mm_display.h index f783cbd..9c6bbb7 100644 --- a/src/include/mm_display.h +++ b/src/include/mm_display.h @@ -27,7 +27,7 @@ typedef struct mm_display { mm_display_type_e type; /* wayland */ - mm_display_wayland_info_s wl_info; /* wayland related information */ + int parent_id; /* parent id of window for wayland display */ #ifdef TIZEN_FEATURE_EVAS_RENDERER /* evas renderer */ @@ -39,7 +39,7 @@ typedef void *mm_display_h; int mm_display_init(mm_display_h *handle); int mm_display_deinit(mm_display_h handle); -int mm_display_set_display(mm_display_h handle, mm_display_type_e type, void *display, mm_display_wayland_info_s *wl_info); +int mm_display_set_display(mm_display_h handle, mm_display_type_e type, void *display, int *parent_id); #ifdef TIZEN_FEATURE_EVAS_RENDERER int mm_display_evas_set_rotation(mm_display_h handle, int rotation); int mm_display_evas_get_rotation(mm_display_h handle, int *rotation); diff --git a/src/include/mm_display_interface.h b/src/include/mm_display_interface.h index 867401a..71bc62c 100644 --- a/src/include/mm_display_interface.h +++ b/src/include/mm_display_interface.h @@ -32,16 +32,11 @@ typedef enum { MM_DISPLAY_TYPE_EVAS } mm_display_type_e; -typedef struct { - int parent_id; - MMRectType window; -} mm_display_wayland_info_s; - typedef void (*mm_display_evas_rendered_cb)(media_packet_h packet, void *user_data); int mm_display_interface_init(mm_display_interface_h *handle); int mm_display_interface_deinit(mm_display_interface_h handle); -int mm_display_interface_set_display(mm_display_interface_h handle, mm_display_type_e type, void *display, mm_display_wayland_info_s *wl_info); +int mm_display_interface_set_display(mm_display_interface_h handle, mm_display_type_e type, void *display, int *parent_id); int mm_display_interface_evas_set_rotation(mm_display_interface_h handle, int rotation); int mm_display_interface_evas_get_rotation(mm_display_interface_h handle, int *rotation); int mm_display_interface_evas_set_visible(mm_display_interface_h handle, bool visible); diff --git a/src/include/mm_display_interface_private.h b/src/include/mm_display_interface_private.h index d32c633..7320780 100644 --- a/src/include/mm_display_interface_private.h +++ b/src/include/mm_display_interface_private.h @@ -33,7 +33,7 @@ typedef struct mm_display_interface { int (*init)(void **); int (*deinit)(void *); - int (*set_display)(void *, int, void *, mm_display_wayland_info_s *); + int (*set_display)(void *, int, void *, int *); int (*evas_set_rotation)(void *, int); int (*evas_get_rotation)(void *, int *); int (*evas_set_visible)(void *, bool); diff --git a/src/mm_display.c b/src/mm_display.c index 06046af..698de48 100644 --- a/src/mm_display.c +++ b/src/mm_display.c @@ -110,11 +110,9 @@ static const struct tizen_resource_listener _mm_display_tz_resource_listener = { }; -int _mm_display_get_wl_info(Evas_Object *obj, mm_display_wayland_info_s *wl_info) +int _mm_display_get_parent_id(Evas_Object *obj, int *parent_id) { int ret = MM_ERROR_NONE; - int rotation = 0; - int tmp = 0; Ecore_Wl_Window *window = NULL; struct wl_display *display = NULL; struct wl_display *display_wrapper = NULL; @@ -124,8 +122,8 @@ int _mm_display_get_wl_info(Evas_Object *obj, mm_display_wayland_info_s *wl_info struct tizen_surface *tz_surface = NULL; struct tizen_resource *tz_resource = NULL; - if (!obj || !wl_info) { - LOGE("NULL parameter %p %p", obj, wl_info); + if (!obj || !parent_id) { + LOGE("NULL parameter %p %p", obj, parent_id); return MM_ERROR_INVALID_ARGUMENT; } @@ -194,37 +192,15 @@ int _mm_display_get_wl_info(Evas_Object *obj, mm_display_wayland_info_s *wl_info goto _DONE; } - wl_info->parent_id = 0; + *parent_id = 0; - tizen_resource_add_listener(tz_resource, &_mm_display_tz_resource_listener, &wl_info->parent_id); + tizen_resource_add_listener(tz_resource, &_mm_display_tz_resource_listener, parent_id); wl_display_roundtrip_queue(display, queue); - if (wl_info->parent_id > 0) { - Ecore_Evas *ecore_evas = NULL; + if (*parent_id > 0) { ret = MM_ERROR_NONE; - - evas_object_geometry_get(obj, &wl_info->window.x, &wl_info->window.y, - &wl_info->window.width, &wl_info->window.height); - - ecore_evas = ecore_evas_ecore_evas_get(evas_object_evas_get(obj)); - if (ecore_evas) { - rotation = ecore_evas_rotation_get(ecore_evas); - if (rotation == 90 || rotation == 270) { - LOGD("swap width and height %d, %d", wl_info->window.width, wl_info->window.height); - - tmp = wl_info->window.width; - wl_info->window.width = wl_info->window.height; - wl_info->window.height = tmp; - } - } else { - LOGW("failed to get ecore_evas.. skip rotation check"); - } - - LOGD("eo: %p, rot: %d, id : %u, window: %d,%d,%dx%d", - obj, rotation, wl_info->parent_id, - wl_info->window.x, wl_info->window.y, - wl_info->window.width, wl_info->window.height); + LOGD("parent id : %d", *parent_id); } else { ret = MM_ERROR_UNKNOWN; LOGE("failed to get parent id"); @@ -311,7 +287,7 @@ int mm_display_deinit(mm_display_h handle) } -int mm_display_set_display(mm_display_h handle, mm_display_type_e type, void *display, mm_display_wayland_info_s *wl_info) +int mm_display_set_display(mm_display_h handle, mm_display_type_e type, void *display, int *parent_id) { int ret = MM_ERROR_NONE; const char *object_type = NULL; @@ -340,11 +316,16 @@ int mm_display_set_display(mm_display_h handle, mm_display_type_e type, void *di if (type == MM_DISPLAY_TYPE_OVERLAY && !strcmp(object_type, "elm_win")) { /* get wayland parent id */ - ret = _mm_display_get_wl_info(obj, &dp_handle->wl_info); - if (ret == MM_ERROR_NONE && wl_info) - memcpy(wl_info, &dp_handle->wl_info, sizeof(mm_display_wayland_info_s)); + if (!parent_id) { + LOGE("NULL parant_id"); + return MM_ERROR_INVALID_ARGUMENT; + } + + ret = _mm_display_get_parent_id(obj, &dp_handle->parent_id); + if (ret == MM_ERROR_NONE) + *parent_id = dp_handle->parent_id; else - LOGE("failed to get wayland info. ret 0x%x, %p", ret, wl_info); + LOGE("failed to get wayland info. ret 0x%x", ret); } else if (type == MM_DISPLAY_TYPE_EVAS && !strcmp(object_type, "image")) { /* evas object surface */ #ifdef TIZEN_FEATURE_EVAS_RENDERER diff --git a/src/mm_display_interface.c b/src/mm_display_interface.c index 818fa0a..5f69fdc 100644 --- a/src/mm_display_interface.c +++ b/src/mm_display_interface.c @@ -161,7 +161,7 @@ int mm_display_interface_deinit(mm_display_interface_h handle) } -int mm_display_interface_set_display(mm_display_interface_h handle, mm_display_type_e type, void *display, mm_display_wayland_info_s *wl_info) +int mm_display_interface_set_display(mm_display_interface_h handle, mm_display_type_e type, void *display, int *parent_id) { DECLARE_CHECK_INTERFACE_HANDLE(handle); @@ -170,7 +170,7 @@ int mm_display_interface_set_display(mm_display_interface_h handle, mm_display_t return MM_ERROR_UNKNOWN; } - return interface->set_display(interface->dp_handle, type, display, wl_info); + return interface->set_display(interface->dp_handle, type, display, parent_id); return MM_ERROR_NONE; }