gerrit.automotivelinux Code Review - AGL/meta-agl.git/blob

   1 From 8e586a78c7e74f0faaddd02abbdfcf6879d0f096 Mon Sep 17 00:00:00 2001
   2 From: Wataru Mizuno <wmizuno@jp.adit-jv.com>
   3 Date: Wed, 27 Sep 2017 09:09:17 +0900
   4 Subject: [PATCH 2/3] ivi-layout :Register ivi-layout-interface It enables to
   5  use ivi-layout-interface without load module
   6
   7 Signed-off-by: Wataru Mizuno <wmizuno@jp.adit-jv.com>
   8 ---
   9  ivi-shell/ivi-layout-export.h | 2 ++
  10  ivi-shell/ivi-layout.c        | 4 ++++
  11  2 files changed, 6 insertions(+)
  12
  13 diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
  14 index 2317d6e..11ea874 100644
  15 --- a/ivi-shell/ivi-layout-export.h
  16 +++ b/ivi-shell/ivi-layout-export.h
  17 @@ -63,6 +63,8 @@ extern "C" {
  18  #define IVI_SUCCEEDED (0)
  19  #define IVI_FAILED (-1)
  20
  21 +#define IVI_LAYOUT_API_NAME "ivi_layout_api_v1"
  22 +
  23  struct ivi_layout_layer;
  24  struct ivi_layout_screen;
  25  struct ivi_layout_surface;
  26 diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
  27 index 64e4ead..602a42f 100644
  28 --- a/ivi-shell/ivi-layout.c
  29 +++ b/ivi-shell/ivi-layout.c
  30 @@ -67,6 +67,7 @@
  31  #include "ivi-layout-export.h"
  32  #include "ivi-layout-private.h"
  33  #include "ivi-layout-shell.h"
  34 +#include "plugin-registry.h"
  35
  36  #include "shared/helpers.h"
  37  #include "shared/os-compatibility.h"
  38 @@ -2139,5 +2140,8 @@ load_controller_modules(struct weston_compositor *compositor, const char *module
  39                         p++;
  40         }
  41
  42 +       weston_plugin_api_register(compositor, IVI_LAYOUT_API_NAME,
  43 +                                  &ivi_layout_interface,  sizeof(struct ivi_layout_interface));
  44 +
  45         return 0;
  46  }
  47 --
  48 2.7.4
  49