X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=6c5dbcc23496cf0730bb3fc1b701b9f8f66e4a48;hb=e1171a57a76c1f3277c54bcc48a9fe6c29b741ec;hp=9e5d2c49e4ab7a1db5fe9cc887887c2e8a703ed4;hpb=0c4e1697db2d9e15a05bc76056fca13e9ccb9ba4;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 9e5d2c4..6c5dbcc 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;
 
@@ -132,12 +132,14 @@ struct dive {
 	time_t when;
 	char *location;
 	char *notes;
+	char *divemaster, *buddy;
+	double latitude, longitude;
 	depth_t maxdepth, meandepth;
 	duration_t duration, surfacetime;
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
-	int samples;
+	int samples, alloc_samples;
 	struct sample sample[];
 };
 
@@ -193,9 +195,20 @@ 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);
 
+extern void update_air_info(char *buffer);
+
 #define DIVE_ERROR_PARSE 1
 
 #endif /* DIVE_H */