diff options
Diffstat (limited to 'src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx')
| -rw-r--r-- | src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx | 33 |
1 files changed, 28 insertions, 5 deletions
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..c55fb65 100644 --- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx +++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx @@ -10,6 +10,7 @@ * * \author Martin Schaller <martin.schaller@it-schaller.de> * \author Philippe Colliot <philippe.colliot@mpsa.com> +* \author Tanibata, Nobuhiko (ADITJ/SWG) <ntanibata@jp.adit-jv.com> * * \version 1.0 * @@ -22,7 +23,7 @@ * * List of changes: * -* <date>, <name>, <description of change> +* 13-10-2014, Tanibata, Nobuhiko, adaptation to layer management * * @licence end@ */ @@ -32,6 +33,11 @@ #include <stdlib.h> #if LM #include <ilm/ilm_client.h> +#include <ilm/ilm_client.h> +#include <ilm/ilm_control.h> +#ifndef FSA_LAYER +#define FSA_LAYER 2000 +#endif #endif #include "genivi_mapviewer_mapviewercontrol_adaptor.h" #include "genivi_navigationcore_routing_proxy.h" @@ -1467,15 +1473,30 @@ 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; + t_ilm_surface surfaceId=FSA_LAYER+m_handle; + t_ilm_layer layerId=FSA_LAYER; if (ilm_surfaceCreate(nativehandle, MapViewSize._1, MapViewSize._2, ILM_PIXELFORMAT_RGBA_8888, &surfaceId) != ILM_SUCCESS) { dbg(0,"error on ilm_surfaceCreate\n"); } +#if 0 if (ilm_layerAddSurface(layerId, surfaceId) != ILM_SUCCESS) { dbg(0,"error on ilm_layerAddSurface\n"); } +#else + t_ilm_surface surfaceId_order[2] = { + FSA_LAYER + m_handle, + FSA_LAYER + m_handle + 1 + }; + if (ilm_layerSetRenderOrder(layerId, surfaceId_order, 2) != ILM_SUCCESS) { + dbg(0,"error on ilm_layerSetRenderOrder\n"); + } +#endif if (ilm_commitChanges() != ILM_SUCCESS) { dbg(0,"error on ilm_commitChanges\n"); } @@ -1485,8 +1506,8 @@ MapViewerControlObj::MapViewerControlObj(MapViewerControl *mapviewercontrol, uin MapViewerControlObj::~MapViewerControlObj() { #if LM - t_ilm_surface surfaceId=2000+m_handle; - t_ilm_layer layerId=2000; + t_ilm_surface surfaceId=FSA_LAYER+m_handle; + t_ilm_layer layerId=FSA_LAYER; if (ilm_surfaceRemove(surfaceId) != ILM_SUCCESS) { dbg(0,"error on ilm_surfaceRemove\n"); } @@ -1664,8 +1685,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 } |