X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=cc6e85da2c50b627f0ae1d68b6f41eb5a5e14382;hb=42f627b8b1cf7e929a30c0a07a5fb44a4cec9e1f;hp=3b5e5abd75a0e9b757aaa2f0582be802a3ebbe40;hpb=6538e5bba00b51a7253b6cff927c8774f1b39e2b;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 3b5e5ab..cc6e85d 100644
--- a/dive.h
+++ b/dive.h
@@ -69,10 +69,10 @@ typedef struct {
 	int grams;
 } weight_t;
 
-typedef struct {
+struct gasmix {
 	fraction_t o2;
 	fraction_t he;
-} gasmix_t;
+};
 
 typedef struct {
 	volume_t size;
@@ -82,7 +82,7 @@ typedef struct {
 
 typedef struct {
 	cylinder_type_t type;
-	gasmix_t gasmix;
+	struct gasmix gasmix;
 	pressure_t start, end;
 } cylinder_t;
 
@@ -128,7 +128,7 @@ struct sample {
 #define MAX_CYLINDERS (8)
 
 struct dive {
-	int nr;
+	int number;
 	time_t when;
 	char *location;
 	char *notes;
@@ -137,7 +137,7 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
-	int samples;
+	int samples, alloc_samples;
 	struct sample sample[];
 };
 
@@ -166,6 +166,9 @@ struct dive_table {
 
 extern struct dive_table dive_table;
 
+extern int selected_dive;
+#define current_dive (get_dive(selected_dive))
+
 static inline struct dive *get_dive(unsigned int nr)
 {
 	if (nr >= dive_table.nr)
@@ -190,6 +193,15 @@ static inline unsigned int dive_size(int samples)
 	return sizeof(struct dive) + samples*sizeof(struct sample);
 }
 
+extern time_t utc_mktime(struct tm *tm);
+
+extern struct dive *alloc_dive(void);
+extern void record_dive(struct dive *dive);
+
+extern struct sample *prepare_sample(struct dive **divep);
+extern void finish_sample(struct dive *dive, struct sample *sample);
+
+extern void report_dives(void);
 extern struct dive *fixup_dive(struct dive *dive);
 extern struct dive *try_to_merge(struct dive *a, struct dive *b);