diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-04-19 16:48:53 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-05-06 13:58:09 -0700 |
| commit | 74f03e3537ee530000d4b11013bb12de91cb21dd (patch) | |
| tree | d534e7ee2718318b9ae0bba9578ec84001a5dff9 /core/dive.h | |
| parent | 093551363602e723864467af0812f13f4525855f (diff) | |
| download | subsurface-74f03e3537ee530000d4b11013bb12de91cb21dd.tar.gz | |
media: move addition of pictures out of create_picture()
If we want to make addition of pictures undoable, then create_picture()
must not add directly to the dive. Instead, return the dive to which the
picture should be added and let the caller perform the addition.
This means that the picture-test has to be adapted.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/dive.h')
| -rw-r--r-- | core/dive.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/dive.h b/core/dive.h index 33c7c8b0f..8e9ee280a 100644 --- a/core/dive.h +++ b/core/dive.h @@ -210,8 +210,9 @@ extern enum divemode_t get_divemode_at_time(const struct divecomputer *dc, int d for (struct picture *picture = (_dive)->pictures.pictures; \ picture < (_dive)->pictures.pictures + (_dive)->pictures.nr; \ picture++) -extern void create_picture(const char *filename, int shift_time, bool match_all); +extern struct picture *create_picture(const char *filename, int shift_time, bool match_all, struct dive **dive); extern bool picture_check_valid_time(timestamp_t timestamp, int shift_time); +extern void dive_set_geodata_from_picture(struct dive *dive, struct picture *picture, struct dive_site_table *table); extern bool has_gaschange_event(const struct dive *dive, const struct divecomputer *dc, int idx); extern int explicit_first_cylinder(const struct dive *dive, const struct divecomputer *dc); |