diff options
| author | Nobuhiko <NOBUHIKO_TANIBATA@xddp.denso.co.jp> | 2014-09-23 16:15:39 +0900 |
|---|---|---|
| committer | James Thomas <james.thomas@codethink.co.uk> | 2014-10-05 20:24:09 +0000 |
| commit | ec3a0c84f8529945278bd3b0b153975a36dd926b (patch) | |
| tree | 280a57379a6bb7ec5a62fd37ab255da4007a30a7 | |
| parent | 469f4bbb8e811ee024e2f831eceec79bd65578bd (diff) | |
| download | poi-service-baserock/james/genivi-demo-platform.tar.gz | |
navigation-service: Ported to weston-ivi-shell on tizenbaserock/james/genivi-demo-platform
Signed-off-by: Nobuhiko <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
| -rw-r--r-- | src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt index 3efda81..de07a72 100644 --- a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt +++ b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt @@ -44,7 +44,7 @@ include_directories(${DBUS_CPP_INCLUDE_DIRS}) check_include_files (ilm/ilm_client.h LM) if (LM) message("building with layer management") - set(genivi_mapviewer_mapviewercontrol_LIBS ${DBUS_CPP_LDFLAGS} "-lilmClient") + set(genivi_mapviewer_mapviewercontrol_LIBS ${DBUS_CPP_LDFLAGS} "-lilmCommon" "-lilmClient" "-lilmControl") add_definitions(-DLM=1) else() message("building without layer management") diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx index 5bc86b7..52d6d79 100644 --- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx +++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx @@ -31,7 +31,9 @@ #include <unistd.h> #include <stdlib.h> #if LM +#include <ilm/ilm_common.h> #include <ilm/ilm_client.h> +#include <ilm/ilm_control.h> #endif #include "genivi_mapviewer_mapviewercontrol_adaptor.h" #include "genivi_navigationcore_routing_proxy.h" @@ -1467,6 +1469,11 @@ MapViewerControlObj::MapViewerControlObj(MapViewerControl *mapviewercontrol, uin sel.u.p_rect.rl.y=MapViewSize._2; transform_set_screen_selection(trans, &sel); #if LM + t_ilm_nativedisplay display = (t_ilm_nativedisplay)graphics_get_data(m_graphics.u.graphics, "display"); + if (ilm_initWithNativedisplay(display) != ILM_SUCCESS) { + dbg(0, "error on ilm_initWidthNativeDisplay\n"); + } + t_ilm_nativehandle nativehandle=(t_ilm_nativehandle)graphics_get_data(m_graphics.u.graphics,"xwindow_id"); t_ilm_surface surfaceId=2000+m_handle; t_ilm_layer layerId=2000; @@ -1664,8 +1671,10 @@ plugin_init(void) conns[0]->request_name("org.genivi.mapviewer.MapViewerControl"); server=new MapViewerControl(*conns[0]); #if LM +#if 0 if (ilm_init() != ILM_SUCCESS) { dbg(0,"error on ilm_init\n"); } #endif +#endif } |