X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=15a357f8998ec32bc29ff02351d65c7712507403;hb=adc92d6de2ee1c71e88b66fb9c41e52de8cf4ea1;hp=9fc3908678464fd147c6e0ecc25c9db1e1045a97;hpb=f3a338a9af53f31f9a72de021950cbe725a6782f;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 9fc3908..15a357f 100644
--- a/dive.h
+++ b/dive.h
@@ -66,8 +66,7 @@ typedef struct {
 
 typedef struct {
 	fraction_t o2;
-	fraction_t n2;
-	fraction_t he2;
+	fraction_t he;
 } gasmix_t;
 
 typedef struct {
@@ -100,15 +99,40 @@ struct sample {
 	int tankindex;
 };
 
+#define MAX_MIXES (4)
+
 struct dive {
+	const char *name;
 	time_t when;
 	depth_t maxdepth, meandepth;
 	duration_t duration, surfacetime;
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	pressure_t beginning_pressure, end_pressure;
+	gasmix_t gasmix[MAX_MIXES];
 	int samples;
 	struct sample sample[];
 };
 
+extern int verbose;
+
+struct dive_table {
+	int nr, allocated;
+	struct dive **dives;
+};
+
+extern struct dive_table dive_table;
+
+static inline struct dive *get_dive(unsigned int nr)
+{
+	if (nr >= dive_table.nr)
+		return NULL;
+	return dive_table.dives[nr];
+}
+
+extern void parse_xml_init(void);
+extern void parse_xml_file(const char *filename);
+
+void save_dives(const char *filename);
+
 #endif /* DIVE_H */