X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=f29712e2c382e437e66db5a7cc2e460e992bc482;hb=86fdd83e7b9cc661940470c7b7d83316b223f572;hp=5cb32412308ee2219efa8f1c2e5faabeadfc5ab1;hpb=d5c86ebe3dd67397f0f61d57ae9c07d995c38728;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 5cb3241..f29712e 100644
--- a/dive.h
+++ b/dive.h
@@ -147,6 +147,21 @@ struct sample {
 	int cylinderindex;
 };
 
+/*
+ * Events are currently pretty meaningless. This is
+ * just based on the random data that libdivecomputer
+ * gives us. I'm not sure what a real "architected"
+ * event model would actually look like, but right
+ * now you can associate a list of events with a dive,
+ * and we'll do something about it.
+ */
+struct event {
+	struct event *next;
+	duration_t time;
+	int type, flags, value;
+	char name[];
+};
+
 #define MAX_CYLINDERS (8)
 
 struct dive {
@@ -162,6 +177,7 @@ struct dive {
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
 	int otu;
+	struct event *events;
 	int samples, alloc_samples;
 	struct sample sample[];
 };
@@ -185,7 +201,7 @@ extern struct units input_units, output_units;
 extern int verbose;
 
 struct dive_table {
-	int nr, allocated;
+	int nr, allocated, preexisting;
 	struct dive **dives;
 };
 
@@ -227,12 +243,14 @@ extern void record_dive(struct dive *dive);
 extern struct sample *prepare_sample(struct dive **divep);
 extern void finish_sample(struct dive *dive, struct sample *sample);
 
-extern void report_dives(void);
+extern void report_dives(gboolean imported);
 extern struct dive *fixup_dive(struct dive *dive);
 extern struct dive *try_to_merge(struct dive *a, struct dive *b);
 
 extern void renumber_dives(int nr);
 
+extern void add_event(struct dive *dive, int time, int type, int flags, int value, const char *name);
+
 /* UI related protopypes */
 
 extern void init_ui(int argc, char **argv);
@@ -244,8 +262,6 @@ extern void report_error(GError* error);
 extern void dive_list_update_dives(void);
 extern void flush_divelist(struct dive *dive);
 
-extern int open_import_file_dialog(char *filterpattern, char *filtertext, 
-				void(* parse_function)(char *));
 #define DIVE_ERROR_PARSE 1
 
 const char *weekday(int wday);