Diff of /trunk/src/osm-gps-map-osd-classic.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 227 by harbaum, Wed Dec 2 20:05:52 2009 UTC revision 228 by harbaum, Thu Dec 3 20:07:13 2009 UTC
# Line 1775  osd_render_controls(osm_gps_map_osd_t *o Line 1775  osd_render_controls(osm_gps_map_osd_t *o
1775      if(!priv->controls.surface)      if(!priv->controls.surface)
1776          return;          return;
1777    
1778        printf("XXX rendering OSD with %p\n", osd->cb);
1779    
1780      if(priv->controls.rendered      if(priv->controls.rendered
1781  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
1782         && (priv->controls.gps_enabled == (osd->cb != NULL))         && (priv->controls.gps_enabled == (osd->cb != NULL))
# Line 2135  void Line 2137  void
2137  osm_gps_map_osd_classic_init(OsmGpsMap *map)  osm_gps_map_osd_classic_init(OsmGpsMap *map)
2138  {  {
2139      FIN;      FIN;
2140      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);  
2141        osd_priv_t *priv = g_new0(osd_priv_t, 1);
2142      printf("alloc new osd priv\n");      printf("alloc new osd priv\n");
2143    
2144        /* reset entries to default value */
2145        osd_classic.widget = NULL;
2146        osd_classic.cb     = NULL;
2147        osd_classic.data   = NULL;
2148        osd_classic.priv   = priv;
2149    
2150  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
2151      priv->balloon.lat = OSM_GPS_MAP_INVALID;      priv->balloon.lat = OSM_GPS_MAP_INVALID;
2152      priv->balloon.lon = OSM_GPS_MAP_INVALID;      priv->balloon.lon = OSM_GPS_MAP_INVALID;
2153  #endif  #endif
2154    
     osd_classic.priv = priv;  
   
2155      osm_gps_map_register_osd(map, &osd_classic);      osm_gps_map_register_osd(map, &osd_classic);
2156      FOUT;      FOUT;
2157  }  }
Legend:
Removed from v.227  
changed lines
  Added in v.228