Remove dependencies to gob2

[andy/viking.git] / src / babel.h

diff --git a/src/babel.h b/src/babel.h
index 46b81da2a2276ec83a0bd09f1d00e647b1c537ed..30c80d01a6547913ba78bb0341f8b18edc2037a8 100644 (file)
--- a/src/babel.h
+++ b/src/babel.h
@@ -23,12 +23,16 @@
 #ifndef _VIKING_BABEL_H
 #define _VIKING_BABEL_H
 
+#include <glib.h>
+
+#include "viktrwlayer.h"
+
 typedef enum {
   BABEL_DIAG_OUTPUT,
   BABEL_DONE,
 } BabelProgressCode;
 
-typedef void (*BabelStatusFunc)(BabelProgressCode, gpointer);
+typedef void (*BabelStatusFunc)(BabelProgressCode, gpointer, gpointer);
 
 /*
  * a_babel_convert modifies data in a trw layer using gpsbabel filters.  This routine is synchronous;
@@ -46,7 +50,7 @@ typedef void (*BabelStatusFunc)(BabelProgressCode, gpointer);
  *                   BABEL_DIAG_DONE: gpsbabel finished,
  *                 or NULL if no callback is needed.
  */
-int a_babel_convert( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb );
+int a_babel_convert( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb, gpointer user_data );
 
 /*
  * a_babel_convert_from loads data into a trw layer from a file, using gpsbabel.  This routine is synchronous;
@@ -60,8 +64,10 @@ int a_babel_convert( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb
  * 
  * cb             Optional callback function. Same usage as in a_babel_convert.
  */
-int a_babel_convert_from( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb, const char *file );
-gboolean a_babel_convert_from_shellcommand ( VikTrwLayer *vt, const char *input_cmd, const char *input_type, BabelStatusFunc cb );
+int a_babel_convert_from( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb, const char *file, gpointer user_data );
+gboolean a_babel_convert_from_shellcommand ( VikTrwLayer *vt, const char *input_cmd, const char *input_file_type, BabelStatusFunc cb, gpointer user_data );
+gboolean a_babel_convert_from_url ( VikTrwLayer *vt, const char *url, const char *input_type, BabelStatusFunc cb, gpointer user_data );
+int a_babel_convert_to( VikTrwLayer *vt, const char *babelargs, BabelStatusFunc cb, const char *file, gpointer user_data );
 
 
 #endif