X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=4d60a77a2c173e64f22f10374cb6f48d2121ab17;hb=9c7aaed02aef077bda9b376e981fb705b8021750;hp=f0808efb47d3bbe19c4efcb004a957fcc9ad9e9c;hpb=af290d5eb281662d336b8186a9df1a489d78ec9d;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index f0808ef..4d60a77 100644
--- a/dive.h
+++ b/dive.h
@@ -87,11 +87,29 @@ typedef struct {
 	pressure_t start, end, sample_start, sample_end;
 } cylinder_t;
 
+typedef struct {
+	weight_t weight;
+	const char *description;	/* "integrated", "belt", "ankle" */
+} weightsystem_t;
+
+extern int cylinder_none(void *_data);
+extern int weightsystem_none(void *_data);
+
 extern int get_pressure_units(unsigned int mb, const char **units);
 extern double get_depth_units(unsigned int mm, int *frac, const char **units);
 extern double get_volume_units(unsigned int mm, int *frac, const char **units);
 extern double get_temp_units(unsigned int mm, const char **units);
 
+static inline double grams_to_lbs(int grams)
+{
+	return grams / 453.6;
+}
+
+static inline int lbs_to_grams(double lbs)
+{
+	return lbs * 453.6 + 0.5;
+}
+
 static inline double ml_to_cuft(int ml)
 {
 	return ml / 28316.8466;
@@ -192,6 +210,7 @@ struct event {
 };
 
 #define MAX_CYLINDERS (8)
+#define MAX_WEIGHTSYSTEMS (4)
 
 struct dive {
 	int number;
@@ -206,6 +225,7 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
+	weightsystem_t weightsystem[MAX_WEIGHTSYSTEMS];
 	int sac, otu;
 	struct event *events;
 	int samples, alloc_samples;
@@ -252,9 +272,11 @@ 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 parse_xml_buffer(const char *url, const char *buf, int size, GError **error);
 extern void set_filename(const char *filename);
 
+extern void parse_file(const char *filename, GError **error);
+
 #ifdef XSLT
 extern xmlDoc *test_xslt_transforms(xmlDoc *doc);
 #endif
@@ -277,9 +299,10 @@ extern time_t utc_mktime(struct tm *tm);
 
 extern struct dive *alloc_dive(void);
 extern void record_dive(struct dive *dive);
+extern void delete_dive(struct dive *dive);
 
 extern struct sample *prepare_sample(struct dive **divep);
-extern void finish_sample(struct dive *dive, struct sample *sample);
+extern void finish_sample(struct dive *dive);
 
 extern void report_dives(gboolean imported);
 extern struct dive *fixup_dive(struct dive *dive);
@@ -294,6 +317,7 @@ extern void add_event(struct dive *dive, int time, int type, int flags, int valu
 extern void init_ui(int *argcp, char ***argvp);
 
 extern void run_ui(void);
+extern void exit_ui(void);
 
 extern void report_error(GError* error);
 
@@ -324,4 +348,6 @@ const char *monthname(int mon);
 #define FIVE_STARS	UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR
 extern const char *star_strings[];
 
+#define AIR_PERMILLE 209
+
 #endif /* DIVE_H */