X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=dive.h;h=15a357f8998ec32bc29ff02351d65c7712507403;hb=adc92d6de2ee1c71e88b66fb9c41e52de8cf4ea1;hp=ba9f66882baefa1d5a18a46de0ceff2bd7472d19;hpb=3aa02ccba93648f2decab899a5b9c42b6bcea9bf;p=ext%2Fsubsurface.git diff --git a/dive.h b/dive.h index ba9f668..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,6 +99,8 @@ struct sample { int tankindex; }; +#define MAX_MIXES (4) + struct dive { const char *name; time_t when; @@ -108,6 +109,7 @@ struct dive { depth_t visibility; temperature_t airtemp, watertemp; pressure_t beginning_pressure, end_pressure; + gasmix_t gasmix[MAX_MIXES]; int samples; struct sample sample[]; }; @@ -121,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 */