X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=42d91d630a0776f63b8605d61e6e5f1c429578a0;hb=79a866f5b4d51efc15286059ac7e4322b6008eb3;hp=fc458d04d4292df0a36bf99428c84b66c169aad2;hpb=515a9171523f7d8aa85f2caab262ba7d6320c33c;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index fc458d0..42d91d6 100644
--- a/dive.h
+++ b/dive.h
@@ -134,6 +134,11 @@ static inline int to_PSI(pressure_t pressure)
 	return pressure.mbar * 0.0145037738 + 0.5;
 }
 
+static inline double to_ATM(pressure_t pressure)
+{
+	return pressure.mbar / 1013.25;
+}
+
 struct sample {
 	duration_t time;
 	depth_t depth;
@@ -142,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 {
@@ -156,6 +176,8 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
+	int otu;
+	struct event *events;
 	int samples, alloc_samples;
 	struct sample sample[];
 };
@@ -197,6 +219,7 @@ static inline struct dive *get_dive(unsigned int nr)
 
 extern void parse_xml_init(void);
 extern void parse_xml_file(const char *filename, GError **error);
+extern void set_filename(const char *filename);
 
 extern void show_dive_info(struct dive *);
 extern void flush_dive_info_changes(struct dive *);
@@ -226,6 +249,8 @@ 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);