ivi-shell: make ivi-layout.c as a part of ivi-shell.so
ivi-layout.so is separately built and loaded by using dlopen with
RTLD_GLOBAL. This was because these apis defined in ivi-layout.so shall
be used by ivi-modules; e.g. hmi-controller. This shall be improved that
a struct ivi_layout_api contains the whole exported API as function
pointers to be exposed as module_init.
This patch alone builds, but loading controller modules at runtime
failes. This failure will be fixed by following patches.
Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 67ccf6e..1772845 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -2659,8 +2659,10 @@
return 0;
}
-/***called from ivi-shell**/
-static struct weston_view *
+/**
+ * methods of interaction between ivi-shell with ivi-layout
+ */
+struct weston_view *
ivi_layout_get_weston_view(struct ivi_layout_surface *surface)
{
struct weston_view *tmpview = NULL;
@@ -2677,7 +2679,7 @@
return tmpview;
}
-static void
+void
ivi_layout_surface_configure(struct ivi_layout_surface *ivisurf,
int32_t width, int32_t height)
{
@@ -2707,7 +2709,7 @@
}
}
-WL_EXPORT int32_t
+int32_t
ivi_layout_surface_set_content_observer(struct ivi_layout_surface *ivisurf,
ivi_controller_surface_content_callback callback,
void* userdata)
@@ -2722,7 +2724,7 @@
return ret;
}
-static struct ivi_layout_surface*
+struct ivi_layout_surface*
ivi_layout_surface_create(struct weston_surface *wl_surface,
uint32_t id_surface)
{
@@ -2798,7 +2800,7 @@
return ivisurf;
}
-static void
+void
ivi_layout_init_with_compositor(struct weston_compositor *ec)
{
struct ivi_layout *layout = get_instance();
@@ -2826,18 +2828,10 @@
}
-static void
+void
ivi_layout_surface_add_configured_listener(struct ivi_layout_surface* ivisurf,
struct wl_listener* listener)
{
wl_signal_add(&ivisurf->configured, listener);
}
-WL_EXPORT struct ivi_layout_interface ivi_layout_interface = {
- .get_weston_view = ivi_layout_get_weston_view,
- .surface_configure = ivi_layout_surface_configure,
- .surface_create = ivi_layout_surface_create,
- .init_with_compositor = ivi_layout_init_with_compositor,
- .get_surface_dimension = ivi_layout_surface_get_dimension,
- .add_surface_configured_listener = ivi_layout_surface_add_configured_listener
-};