From 09a99d1a05a72e6d1e5c15f488ff9a9ff1e0f2c5 Mon Sep 17 00:00:00 2001 From: martin-s Date: Mon, 7 Sep 2009 12:13:01 +0000 Subject: [PATCH] Fix:Core:Made vehicle callback more specific git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@2561 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/navit.c | 2 +- navit/navit/vehicle.c | 6 +++--- navit/navit/vehicle/android/vehicle_android.c | 2 +- navit/navit/vehicle/demo/vehicle_demo.c | 4 ++-- navit/navit/vehicle/file/vehicle_file.c | 4 ++-- navit/navit/vehicle/gpsd/vehicle_gpsd.c | 2 +- navit/navit/vehicle/gypsy/vehicle_gypsy.c | 8 ++++---- navit/navit/vehicle/iphone/vehicle_iphone.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/navit/navit/navit.c b/navit/navit/navit.c index 927fab3..f314841 100644 --- a/navit/navit/navit.c +++ b/navit/navit/navit.c @@ -2185,7 +2185,7 @@ navit_add_vehicle(struct navit *this_, struct vehicle *v) if ((vehicle_get_attr(v, attr_animate, &animate, NULL))) nv->animate_cursor=animate.u.num; nv->callback.type=attr_callback; - nv->callback.u.callback=callback_new_2(callback_cast(navit_vehicle_update), this_, nv); + nv->callback.u.callback=callback_new_attr_2(callback_cast(navit_vehicle_update), attr_position_coord_geo, this_, nv); vehicle_add_attr(nv->vehicle, &nv->callback); vehicle_set_attr(nv->vehicle, &this_->self, NULL); return 1; diff --git a/navit/navit/vehicle.c b/navit/navit/vehicle.c index 45282f1..a57c924 100644 --- a/navit/navit/vehicle.c +++ b/navit/navit/vehicle.c @@ -120,7 +120,7 @@ vehicle_add_log(struct vehicle *this_, struct log *log) return 1; if (!strcmp(type_attr.u.str, "nmea")) { - cb=callback_new_2(callback_cast(vehicle_log_nmea), this_, log); + cb=callback_new_attr_2(callback_cast(vehicle_log_nmea), attr_position_coord_geo, this_, log); } else if (!strcmp(type_attr.u.str, "gpx")) { char *header = "\n" "cbl, cb); diff --git a/navit/navit/vehicle/android/vehicle_android.c b/navit/navit/vehicle/android/vehicle_android.c index 291d9a0..228e1ee 100644 --- a/navit/navit/vehicle/android/vehicle_android.c +++ b/navit/navit/vehicle/android/vehicle_android.c @@ -143,7 +143,7 @@ vehicle_android_callback(struct vehicle_priv *v, jobject location) strftime(v->fixiso8601, sizeof(v->fixiso8601), "%Y-%m-%dT%TZ", tm); dbg(1,"lat %f lon %f time %s\n",v->geo.lat,v->geo.lng,v->fixiso8601); v->have_coords=1; - callback_list_call_0(v->cbl); + callback_list_call_attr_0(v->cbl, attr_position_coord_geo); } static int diff --git a/navit/navit/vehicle/demo/vehicle_demo.c b/navit/navit/vehicle/demo/vehicle_demo.c index ebc72d6..d58de97 100644 --- a/navit/navit/vehicle/demo/vehicle_demo.c +++ b/navit/navit/vehicle/demo/vehicle_demo.c @@ -155,13 +155,13 @@ vehicle_demo_timer(struct vehicle_priv *priv) dbg(1, "ci=0x%x,0x%x\n", ci.x, ci.y); transform_to_geo(projection_mg, &ci, &priv->geo); - callback_list_call_0(priv->cbl); + callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); break; } } } else { if (priv->position_set) - callback_list_call_0(priv->cbl); + callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); } if (mr) map_rect_destroy(mr); diff --git a/navit/navit/vehicle/file/vehicle_file.c b/navit/navit/vehicle/file/vehicle_file.c index 88c5af2..2e42111 100644 --- a/navit/navit/vehicle/file/vehicle_file.c +++ b/navit/navit/vehicle/file/vehicle_file.c @@ -152,7 +152,7 @@ static int vehicle_win32_serial_track(struct vehicle_priv *priv) memmove( buffer, &buffer[ bytes_to_copy ] , sizeof( buffer ) - bytes_to_copy ); } if (rc) { - callback_list_call_0(priv->cbl); + callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); if (rc > 1) dbg(0, "Can not keep with gps data delay is %d seconds\n", rc - 1); @@ -518,7 +518,7 @@ vehicle_file_io(struct vehicle_priv *priv) priv->buffer_pos = 0; } if (rc) - callback_list_call_0(priv->cbl); + callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); } #endif diff --git a/navit/navit/vehicle/gpsd/vehicle_gpsd.c b/navit/navit/vehicle/gpsd/vehicle_gpsd.c index 88a50a4..ca6e8c3 100644 --- a/navit/navit/vehicle/gpsd/vehicle_gpsd.c +++ b/navit/navit/vehicle/gpsd/vehicle_gpsd.c @@ -151,7 +151,7 @@ vehicle_gpsd_callback(struct gps_data_t *data, char *buf, size_t len, } // If data->fix.speed is NAN, then the drawing gets jumpy. if (! isnan(data->fix.speed) && priv->fix_type > 0) { - callback_list_call_0(priv->cbl); + callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); } dbg(2,"speed ok\n"); } diff --git a/navit/navit/vehicle/gypsy/vehicle_gypsy.c b/navit/navit/vehicle/gypsy/vehicle_gypsy.c index a1967c6..ae4a150 100644 --- a/navit/navit/vehicle/gypsy/vehicle_gypsy.c +++ b/navit/navit/vehicle/gypsy/vehicle_gypsy.c @@ -96,7 +96,7 @@ vehicle_gypsy_fixstatus_changed(GypsyDevice *device, else priv->fix_type = 0; - callback_list_call_0(priv->cbl); + callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); } /** @@ -151,7 +151,7 @@ vehicle_gypsy_position_changed(GypsyPosition *position, if (cb) { priv->have_cords = 1; - callback_list_call_0(priv->cbl); + callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); } } @@ -187,7 +187,7 @@ vehicle_gypsy_satellite_changed(GypsySatellite *satellite, priv->sats_used = used; priv->sats = sats; - callback_list_call_0(priv->cbl); + callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); } /** @@ -231,7 +231,7 @@ vehicle_gypsy_course_changed (GypsyCourse *course, } if (cb) - callback_list_call_0(priv->cbl); + callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); } /** diff --git a/navit/navit/vehicle/iphone/vehicle_iphone.c b/navit/navit/vehicle/iphone/vehicle_iphone.c index 2f32bb9..1b27a24 100644 --- a/navit/navit/vehicle/iphone/vehicle_iphone.c +++ b/navit/navit/vehicle/iphone/vehicle_iphone.c @@ -121,7 +121,7 @@ vehicle_iphone_update(void *arg, priv->radius = radius; dbg(0,"position_get lat:%f lng:%f (spd:%f dir:%f time:%s)\n", priv->geo.lat, priv->geo.lng, priv->speed, priv->direction, priv->str_time); - callback_list_call_0(priv->cbl); + callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); } -- 2.7.4