#include "vikutils.h"
#endif
-#define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val)
static VikGpsLayer *vik_gps_layer_create (VikViewport *vp);
static void vik_gps_layer_realize ( VikGpsLayer *val, VikTreeview *vt, GtkTreeIter *layer_iter );
static void vik_gps_layer_free ( VikGpsLayer *val );
static void gps_layer_change_coord_mode ( VikGpsLayer *val, VikCoordMode mode );
static void gps_layer_add_menu_items( VikGpsLayer *vtl, GtkMenu *menu, gpointer vlp );
-static void gps_layer_drag_drop_request ( VikGpsLayer *val_src, VikGpsLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path );
static void gps_upload_cb( gpointer layer_and_vlp[2] );
static void gps_download_cb( gpointer layer_and_vlp[2] );
gint count;
VikTrwLayer *vtl;
VikTrack *track;
- gchar *cmd_args;
+ gchar *babelargs;
gchar *window_title;
GtkWidget *dialog;
GtkWidget *status_label;
(VikLayerFuncDraw) vik_gps_layer_draw,
(VikLayerFuncChangeCoordMode) gps_layer_change_coord_mode,
+ (VikLayerFuncGetTimestamp) NULL,
+
(VikLayerFuncSetMenuItemsSelection) NULL,
(VikLayerFuncGetMenuItemsSelection) NULL,
(VikLayerFuncSetParam) gps_layer_set_param,
(VikLayerFuncGetParam) gps_layer_get_param,
+ (VikLayerFuncChangeParam) NULL,
(VikLayerFuncReadFileData) NULL,
(VikLayerFuncWriteFileData) NULL,
(VikLayerFuncCopyItem) NULL,
(VikLayerFuncPasteItem) NULL,
(VikLayerFuncFreeCopiedItem) NULL,
- (VikLayerFuncDragDropRequest) gps_layer_drag_drop_request,
+ (VikLayerFuncDragDropRequest) NULL,
(VikLayerFuncSelectClick) NULL,
(VikLayerFuncSelectMove) NULL,
{
gint new_proto = 0;
// +1 for luck (i.e the NULL terminator)
- gchar **new_protocols = g_malloc(1 + g_list_length(a_babel_device_list)*sizeof(gpointer));
+ gchar **new_protocols = g_malloc_n(1 + g_list_length(a_babel_device_list), sizeof(gpointer));
GList *gl = g_list_first ( a_babel_device_list );
while ( gl ) {
vik_layer_rename ( VIK_LAYER(rv), vik_gps_layer_interface.name );
for (i = 0; i < NUM_TRW; i++) {
- rv->trw_children[i] = VIK_TRW_LAYER(vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE ));
+ rv->trw_children[i] = VIK_TRW_LAYER(vik_layer_create ( VIK_LAYER_TRW, vp, FALSE ));
vik_layer_set_menu_items_selection(VIK_LAYER(rv->trw_children[i]), VIK_MENU_ITEM_ALL & ~(VIK_MENU_ITEM_CUT|VIK_MENU_ITEM_DELETE));
}
return rv;
child_layer = vik_layer_unmarshall ( data + sizeof(gint), alm_size, vvp );
if (child_layer) {
rv->trw_children[i++] = (VikTrwLayer *)child_layer;
- g_signal_connect_swapped ( G_OBJECT(child_layer), "update", G_CALLBACK(vik_layer_emit_update_secondary), rv );
+ // NB no need to attach signal update handler here
+ // as this will always be performed later on in vik_gps_layer_realize()
}
alm_next;
}
static void disconnect_layer_signal ( VikLayer *vl, VikGpsLayer *vgl )
{
- guint number_handlers = DISCONNECT_UPDATE_SIGNAL(vl,vgl);
+ guint number_handlers = g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, vgl);
if ( number_handlers != 1 ) {
- /*
- NB It's not fatal if this gives 2 for example! Hence removal of the g_assert
- This happens when copied GPS layer is deleted (not sure why the number_handlers would be 2)
- I don't think there's any side effects and certainly better than the program just aborting
- */
- g_warning(_("Unexpected number of disconnected handlers: %d"), number_handlers);
+ g_critical(_("Unexpected number of disconnected handlers: %d"), number_handlers);
}
}
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
}
-gboolean vik_gps_layer_delete ( VikGpsLayer *vgl, GtkTreeIter *iter )
-{
- gint i;
- VikLayer *l = VIK_LAYER( vik_treeview_item_get_pointer ( VIK_LAYER(vgl)->vt, iter ) );
- gboolean was_visible = l->visible;
-
- vik_treeview_item_delete ( VIK_LAYER(vgl)->vt, iter );
- for (i = 0; i < NUM_TRW; i++) {
- if (VIK_LAYER(vgl->trw_children[i]) == l)
- vgl->trw_children[i] = NULL;
- }
- g_assert(DISCONNECT_UPDATE_SIGNAL(l,vgl)==1);
- g_object_unref ( l );
-
- return was_visible;
-}
-
static void vik_gps_layer_realize ( VikGpsLayer *vgl, VikTreeview *vt, GtkTreeIter *layer_iter )
{
GtkTreeIter iter;
VikLayer * trw = VIK_LAYER(vgl->trw_children[ix]);
vik_treeview_add_layer ( VIK_LAYER(vgl)->vt, layer_iter, &iter,
_(trw_names[ix]), vgl, TRUE,
- trw, trw->type, trw->type );
+ trw, trw->type, trw->type, vik_layer_get_timestamp(trw) );
if ( ! trw->visible )
vik_treeview_item_set_visible ( VIK_LAYER(vgl)->vt, &iter, FALSE );
vik_layer_realize ( trw, VIK_LAYER(vgl)->vt, &iter );
return TRUE;
}
-static void gps_layer_drag_drop_request ( VikGpsLayer *val_src, VikGpsLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path )
-{
- VikTreeview *vt = VIK_LAYER(val_src)->vt;
- VikLayer *vl = vik_treeview_item_get_pointer(vt, src_item_iter);
- gchar *dp;
-
- dp = gtk_tree_path_to_string(dest_path);
-
- /* vik_gps_layer_delete unrefs, but we don't want that here.
- * we're still using the layer. */
- g_object_ref ( vl );
- vik_gps_layer_delete(val_src, src_item_iter);
-
- g_free(dp);
-}
-
static void gps_session_delete(GpsSession *sess)
{
- /* TODO */
- g_mutex_free(sess->mutex);
- g_free(sess->cmd_args);
-
+ vik_mutex_free(sess->mutex);
+ g_free(sess->babelargs);
g_free(sess);
-
}
static void set_total_count(gint cnt, GpsSession *sess)
{
// Maybe a gpsbabel bug/feature (upto at least v1.4.3 or maybe my Garmin device) but the count always seems x2 too many for routepoints
gint mycnt = (cnt / 2) + 1;
- tmp_str = ngettext("Downloading %d routepoint...", "Downloading %d routepoints...", mycnt); break;
+ tmp_str = ngettext("Downloading %d routepoint...", "Downloading %d routepoints...", mycnt);
sess->total_count = mycnt;
+ break;
}
}
}
{
gboolean result;
- if (sess->direction == GPS_DOWN)
- result = a_babel_convert_from (sess->vtl, sess->cmd_args, sess->port,
- (BabelStatusFunc) gps_download_progress_func, sess, NULL);
+ if (sess->direction == GPS_DOWN) {
+ ProcessOptions po = { sess->babelargs, sess->port, NULL, NULL, NULL, NULL };
+ result = a_babel_convert_from (sess->vtl, &po, (BabelStatusFunc) gps_download_progress_func, sess, NULL);
+ }
else {
- result = a_babel_convert_to (sess->vtl, sess->track, sess->cmd_args, sess->port,
+ result = a_babel_convert_to (sess->vtl, sess->track, sess->babelargs, sess->port,
(BabelStatusFunc) gps_upload_progress_func, sess);
}
if (!sess->realtime_tracking)
#endif
{
- if ( sess->vvp && sess->direction == GPS_DOWN ) {
- /* View the data available */
- vik_trw_layer_auto_set_view ( sess->vtl, sess->vvp) ;
- vik_layer_emit_update ( VIK_LAYER(sess->vtl) ); // NB update from background thread
- }
+ if ( sess->vvp && sess->direction == GPS_DOWN ) {
+ vik_layer_post_read ( VIK_LAYER(sess->vtl), sess->vvp, TRUE );
+ /* View the data available */
+ vik_trw_layer_auto_set_view ( sess->vtl, sess->vvp ) ;
+ vik_layer_emit_update ( VIK_LAYER(sess->vtl) ); // NB update from background thread
+ }
}
} else {
/* canceled */
char *routes = NULL;
char *waypoints = NULL;
- sess->mutex = g_mutex_new();
+ sess->mutex = vik_mutex_new();
sess->direction = dir;
sess->vtl = vtl;
sess->track = track;
else
waypoints = "";
- sess->cmd_args = g_strdup_printf("-D 9 %s %s %s -%c %s",
+ sess->babelargs = g_strdup_printf("-D 9 %s %s %s -%c %s",
tracks, routes, waypoints, (dir == GPS_DOWN) ? 'i' : 'o', protocol);
tracks = NULL;
waypoints = NULL;
if ( turn_off ) {
// No need for thread for powering off device (should be quick operation...) - so use babel command directly:
gchar *device_off = g_strdup_printf("-i %s,%s", protocol, "power_off");
- gboolean result = a_babel_convert_from (NULL, (const char*)device_off, (const char*)port, NULL, NULL, NULL);
+ ProcessOptions po = { device_off, port, NULL, NULL, NULL, NULL };
+ gboolean result = a_babel_convert_from (NULL, &po, NULL, NULL, NULL);
if ( !result )
a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_LAYER(vtl), _("Could not turn off device.") );
g_free ( device_off );
need2free = TRUE;
}
- gchar *msg = vu_trackpoint_formatted_message ( statusbar_format_code, vgl->trkpt, vgl->trkpt_prev, vgl->realtime_track );
+ gchar *msg = vu_trackpoint_formatted_message ( statusbar_format_code, vgl->trkpt, vgl->trkpt_prev, vgl->realtime_track, vgl->last_fix.fix.climb );
vik_statusbar_set_message ( vik_window_get_statusbar (vw), VIK_STATUSBAR_INFO, msg );
g_free ( msg );
if ((vgl->vehicle_position == VEHICLE_POSITION_CENTERED) ||
(vgl->realtime_jump_to_start && vgl->first_realtime_trackpoint)) {
- vik_viewport_set_center_coord(vvp, &vehicle_coord);
+ vik_viewport_set_center_coord(vvp, &vehicle_coord, FALSE);
update_all = TRUE;
}
else if (vgl->vehicle_position == VEHICLE_POSITION_ON_SCREEN) {
if (condition == G_IO_IN) {
#if GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4
if (!gps_poll(&vgl->vgpsd->gpsd)) {
-#elif GPSD_API_MAJOR_VERSION == 5
+#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
if (gps_read(&vgl->vgpsd->gpsd) > -1) {
// Reuse old function to perform operations on the new GPS data
gpsd_raw_hook(vgl->vgpsd, NULL);
else {
g_warning("Disconnected from gpsd. Trying to reconnect");
rt_gpsd_disconnect(vgl);
- rt_gpsd_connect(vgl, FALSE);
+ (void)rt_gpsd_connect(vgl, FALSE);
}
}
return FALSE; /* no further calling */
vgl->vgpsd = g_malloc(sizeof(VglGpsd));
if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) {
-#elif GPSD_API_MAJOR_VERSION == 5
+#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
vgl->vgpsd = g_malloc(sizeof(VglGpsd));
if (gps_open(vgl->gpsd_host, vgl->gpsd_port, &vgl->vgpsd->gpsd) != 0) {
#else
#if GPSD_API_MAJOR_VERSION == 3
gps_query(&vgl->vgpsd->gpsd, "w+x");
#endif
-#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5
- gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL);
+#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+ if ( gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL) == -1 )
+ g_critical ( "gps_stream error" );
#endif
return FALSE; /* no longer called by timeout */
vgl->realtime_io_channel = NULL;
}
if (vgl->vgpsd) {
-#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5
+#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
gps_stream(&vgl->vgpsd->gpsd, WATCH_DISABLE, NULL);
#endif
gps_close(&vgl->vgpsd->gpsd);
#if GPSD_API_MAJOR_VERSION == 3
free(vgl->vgpsd);
-#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5
+#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
g_free(vgl->vgpsd);
#endif
vgl->vgpsd = NULL;
projects / andy / viking.git / blobdiff