summaryrefslogtreecommitdiffstats
path: root/dive.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-08 17:48:07 +1100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-08 17:48:07 +1100
commit9846ba9e945c59062463fd43ed09eb73b5a528c8 (patch)
tree499d3784002a0fbec96e9b7231b888dd9dfbbd6e /dive.h
parent5692131a79f2adcfabc30804ccac62e077df402d (diff)
downloadsubsurface-9846ba9e945c59062463fd43ed09eb73b5a528c8.tar.gz
Duration of a dive is the maximum duration from all divecomputers
So far we always used the duration of the first divecomputer. The same fix needs to be done for some of the other calculations that always use the first divecomputer. This commit also removes some obsolete code from the webservice merging. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.h')
-rw-r--r--dive.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/dive.h b/dive.h
index af1d3942b..54c4fd470 100644
--- a/dive.h
+++ b/dive.h
@@ -530,7 +530,7 @@ extern void report_dives(gboolean imported, gboolean prefer_imported);
extern struct dive *fixup_dive(struct dive *dive);
extern struct dive *merge_dives(struct dive *a, struct dive *b, int offset, gboolean prefer_downloaded);
extern struct dive *try_to_merge(struct dive *a, struct dive *b, gboolean prefer_downloaded);
-
+extern int get_duration_in_sec(struct dive *dive);
extern void renumber_dives(int nr);
extern void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int time, int idx);