[DOC] Mention XML configuration can override internal defaults.

[andy/viking.git] / src / datasource_file.c

diff --git a/src/datasource_file.c b/src/datasource_file.c
index 8feb0c913fdc19e73feaaff653c5a7c2906da338..5061fa34f2027e01bc79f01195cf895f3c4d1682 100644 (file)
--- a/src/datasource_file.c
+++ b/src/datasource_file.c
@@ -2,6 +2,7 @@
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2011, Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
+ * Copyright (C) 2015, Rob Norris <rw_norris@hotmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,13 +54,13 @@ static int last_type = 0;
 
 static gpointer datasource_file_init ( acq_vik_t *avt );
 static void datasource_file_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data );
-static void datasource_file_get_cmd_string ( datasource_file_widgets_t *widgets, gchar **cmd, gchar **input_file_type, gpointer not_used );
+static void datasource_file_get_process_options ( datasource_file_widgets_t *widgets, ProcessOptions *po, gpointer not_used, const gchar *not_used2, const gchar *not_used3 );
 static void datasource_file_cleanup ( gpointer data );
 
 VikDataSourceInterface vik_datasource_file_interface = {
   N_("Import file with GPSBabel"),
   N_("Imported file"),
-  VIK_DATASOURCE_ADDTOLAYER,
+  VIK_DATASOURCE_AUTO_LAYER_MANAGEMENT,
   VIK_DATASOURCE_INPUTTYPE_NONE,
   TRUE,
   TRUE,
@@ -67,8 +68,8 @@ VikDataSourceInterface vik_datasource_file_interface = {
   (VikDataSourceInitFunc)              datasource_file_init,
   (VikDataSourceCheckExistenceFunc)    NULL,
   (VikDataSourceAddSetupWidgetsFunc)   datasource_file_add_setup_widgets,
-  (VikDataSourceGetCmdStringFunc)      datasource_file_get_cmd_string,
-  (VikDataSourceProcessFunc)        a_babel_convert_from,
+  (VikDataSourceGetProcessOptionsFunc)  datasource_file_get_process_options,
+  (VikDataSourceProcessFunc)            a_babel_convert_from,
   (VikDataSourceProgressFunc)          NULL,
   (VikDataSourceAddProgressWidgetsFunc)        NULL,
   (VikDataSourceCleanupFunc)           datasource_file_cleanup,
@@ -141,7 +142,7 @@ static void datasource_file_add_setup_widgets ( GtkWidget *dialog, VikViewport *
 
   /* The file format selector */
   type_label = gtk_label_new (_("File type:"));
-  /* Propose all readable file */
+  /* Propose any readable file */
   BabelMode mode = { 1, 0, 1, 0, 1, 0 };
   widgets->type = a_babel_ui_file_type_selector_new ( mode );
   g_signal_connect ( G_OBJECT(widgets->type), "changed",
@@ -160,7 +161,7 @@ static void datasource_file_add_setup_widgets ( GtkWidget *dialog, VikViewport *
 }
 
 /* See VikDataSourceInterface */
-static void datasource_file_get_cmd_string ( datasource_file_widgets_t *widgets, gchar **cmd, gchar **input_file, gpointer not_used )
+static void datasource_file_get_process_options ( datasource_file_widgets_t *widgets, ProcessOptions *po, gpointer not_used, const gchar *not_used2, const gchar *not_used3 )
 {
   /* Retrieve the file selected */
   gchar *filename = gtk_file_chooser_get_filename ( GTK_FILE_CHOOSER(widgets->file) );
@@ -168,7 +169,6 @@ static void datasource_file_get_cmd_string ( datasource_file_widgets_t *widgets,
   /* Memorize the directory for later use */
   g_free (last_folder_uri);
   last_folder_uri = gtk_file_chooser_get_current_folder_uri ( GTK_FILE_CHOOSER(widgets->file) );
-  last_folder_uri = g_strdup (last_folder_uri);
 
   /* Memorize the file filter for later use */
   GtkFileFilter *filter = gtk_file_chooser_get_filter ( GTK_FILE_CHOOSER(widgets->file) );
@@ -179,14 +179,14 @@ static void datasource_file_get_cmd_string ( datasource_file_widgets_t *widgets,
   last_type = gtk_combo_box_get_active ( GTK_COMBO_BOX (widgets->type) );
   type = (a_babel_ui_file_type_selector_get ( widgets->type ))->name;
 
-  /* Build the string */
-  *cmd = g_strdup_printf( "-i %s", type);
-  *input_file = g_strdup(filename);
+  /* Generate the process options */
+  po->babelargs = g_strdup_printf( "-i %s", type);
+  po->filename = g_strdup(filename);
 
   /* Free memory */
   g_free (filename);
 
-  g_debug(_("using babel args '%s' and file '%s'"), *cmd, *input_file);
+  g_debug(_("using babel args '%s' and file '%s'"), po->babelargs, po->filename);
 }
 
 /* See VikDataSourceInterface */