More consistency improvements

Treat SAC and OTU consistently:
- SAC is now a member of struct dive
- it's calculated / populated at the same time with a helper function with
  consistent API

Create get_volume_units function that returns volumes (e.g. used in SAC
rates) based on preferred units - make sure we have these conversions just
once in the code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 7 insertions, 1 deletions

diff --git a/dive.h b/dive.h
index 97654dc52..5eec6f170 100644
--- a/dive.h
+++ b/dive.h
@@ -87,8 +87,14 @@ typedef struct {
 } cylinder_t;
 
 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 ml_to_cuft(int ml)
+{
+	return ml / 28317.0;
+}
+
 static inline double mm_to_feet(int mm)
 {
 	return mm * 0.00328084;
@@ -177,7 +183,7 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
-	int otu;
+	int sac, otu;
 	struct event *events;
 	int samples, alloc_samples;
 	struct sample sample[];