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

diff --git a/dive.h b/dive.h
index 53ecdfe..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,13 +99,17 @@ 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[];
 };
@@ -120,7 +123,16 @@ struct dive_table {
 
 extern struct dive_table dive_table;
 
-void parse_xml_init(void);
-void parse_xml_file(const char *filename);
+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 */