X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=dive.h;h=bbc5c67ae36413fead1c033f136e7685aa001d6c;hb=e9d28901341d4cefb4c80a98239daaf81fb3d941;hp=ee57cf820e1eb49b51dffbd6acce6c8ca204ad17;hpb=aa416e3c96dfa53db5ae277e72f6a03821c45cac;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index ee57cf8..bbc5c67 100644
--- a/dive.h
+++ b/dive.h
@@ -91,18 +91,28 @@ static inline int to_feet(depth_t depth)
 	return depth.mm * 0.00328084 + 0.5;
 }
 
+static double mkelvin_to_C(int mkelvin)
+{
+	return (mkelvin - 273150) / 1000.0;
+}
+
+static double mkelvin_to_F(int mkelvin)
+{
+	return mkelvin * 9 / 5000.0 - 459.670;
+}
+
 static inline int to_C(temperature_t temp)
 {
 	if (!temp.mkelvin)
 		return 0;
-	return (temp.mkelvin - 273150 + 499) / 1000;
+	return mkelvin_to_C(temp.mkelvin) + 0.5;
 }
 
 static inline int to_F(temperature_t temp)
 {
 	if (!temp.mkelvin)
 		return 0;
-	return temp.mkelvin * 9 / 5000.0 - 459.670 + 0.5;
+	return mkelvin_to_F(temp.mkelvin) + 0.5;
 }
 
 static inline int to_K(temperature_t temp)
@@ -132,6 +142,8 @@ 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;
@@ -193,15 +205,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 */