system-controller: adapt to new protocol API of ivi-shell and genivi-shell

Change-Id: I97e0756c223c6efe9eae08647dc5b990068f4674

diff --git a/lib/system-controller/CicoSCWlWinMgrIF.cpp b/lib/system-controller/CicoSCWlWinMgrIF.cpp
index 88771f2..5554dfe 100644 (file)
--- a/lib/system-controller/CicoSCWlWinMgrIF.cpp
+++ b/lib/system-controller/CicoSCWlWinMgrIF.cpp
@@ -887,7 +887,8 @@ CicoSCWlWinMgrIF::wlOutputModeCB(void             *data,
 void
 CicoSCWlWinMgrIF::wlIviAppNativeShellInfoCB(void *data,
                                             struct ivi_application *ivi_application,
-                                            int32_t pid, const char *title)
+                                            int32_t pid, const char *title,
+                                            uint32_t id_surface)
 {
     struct creation_surface_wait    *tp;
     struct creation_surface_wait    *tp2;
@@ -1006,7 +1007,9 @@ CicoSCWlWinMgrIF::wlIviCtrlLayerCB(void *data,
 void
 CicoSCWlWinMgrIF::wlIviCtrlSurfaceCB(void *data,
                                      struct ivi_controller *ivi_controller,
-                                     uint32_t id_surface)
+                                     uint32_t id_surface,
+                                     int32_t pid,
+                                     const char *title)
 {
     ICO_TRA("CicoSCWlWinMgrIF::wlIviCtrlSurfaceCB: Enter(%x)", id_surface);
 

diff --git a/lib/system-controller/CicoSCWlWinMgrIF.h b/lib/system-controller/CicoSCWlWinMgrIF.h
index e464192..2aa2a96 100644 (file)
--- a/lib/system-controller/CicoSCWlWinMgrIF.h
+++ b/lib/system-controller/CicoSCWlWinMgrIF.h
@@ -208,7 +208,8 @@ private:
     static void wlIviAppNativeShellInfoCB(void          *data,
                                           struct ivi_application *ivi_application,
                                           int32_t       pid,
-                                          const char    *title);
+                                          const char    *title,
+                                          uint32_t      id_surface);
     static void wlIviCtrlScreenCB(void                  *data,
                                   struct ivi_controller *ivi_controller,
                                   uint32_t              id_screen,
@@ -220,7 +221,9 @@ private:
 
     static void wlIviCtrlSurfaceCB(void                 *data,
                                    struct ivi_controller *ivi_controller,
-                                   uint32_t             id_surface);
+                                   uint32_t             id_surface,
+                                   int32_t              pid,
+                                   const char          *title);
 
     static void wlIviCtrlErrorCB(void                   *data,
                                  struct ivi_controller  *ivi_controller,