Fix: Don't abort program when attempting webtool center with different x & y factors.

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

diff --git a/src/file.h b/src/file.h
index bbaf230e618a8a6c9002b91ed7a02d4a2398f18a..57c5005756e7b15aa880e5182faa0693e7ce1f19 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -28,17 +28,33 @@
 #include "viktrwlayer.h"
 #include "vikviewport.h"
 
-#define FILE_TYPE_GPSPOINT 1
-#define FILE_TYPE_GPSMAPPER 2
-#define FILE_TYPE_GPX 3
+typedef enum {
+FILE_TYPE_GPSPOINT=1,
+FILE_TYPE_GPSMAPPER=2,
+FILE_TYPE_GPX=3,
+FILE_TYPE_KML=4,
+} VikFileType_t;
 
 const gchar *a_file_basename ( const gchar *filename );
 gboolean check_file_ext ( const gchar *filename, const gchar *fileext );
 
-/* 0 on failure, 1 on success (vik file) 2 on success (other file) */
-gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename );
+/*
+ * Function to determine if a filename is a 'viking' type file
+ */
+gboolean check_file_magic_vik ( const gchar *filename );
+
+typedef enum {
+  LOAD_TYPE_READ_FAILURE,
+  LOAD_TYPE_GPSBABEL_FAILURE,
+  LOAD_TYPE_UNSUPPORTED_FAILURE,
+  LOAD_TYPE_VIK_SUCCESS,
+  LOAD_TYPE_OTHER_SUCCESS,
+} VikLoadType_t;
+
+VikLoadType_t a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename );
 gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename );
-gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type );
+/* Only need to define VikTrack and trackname if the file type is FILE_TYPE_GPX_TRACK */
+gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, VikFileType_t file_type, const gchar *trackname );
 const gchar *a_get_viking_dir();
 
 void file_write_layer_param ( FILE *f, const gchar *name, guint8 type, VikLayerParamData data );