Reinstate the main window title

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index cc6e85da2c50b627f0ae1d68b6f41eb5a5e14382..109d0c57da1a984e59aa03dd0792c3f6ac258276 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -86,23 +86,38 @@ typedef struct {
        pressure_t start, end;
 } cylinder_t;
 
+static inline double mm_to_feet(int mm)
+{
+       return mm * 0.00328084;
+}
+
 static inline int to_feet(depth_t depth)
 {
-       return depth.mm * 0.00328084 + 0.5;
+       return mm_to_feet(depth.mm) + 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 +147,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;
@@ -205,6 +222,11 @@ 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
 
+const char *weekday(int wday);
+const char *monthname(int mon);
+
 #endif /* DIVE_H */