mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move events and samples into a 'struct divecomputer'

Browse source 
For now we only have one fixed divecomputer associated with each dive,
so this doesn't really change any current semantics.  But it will make
it easier for us to associate a dive with multiple dive computers.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2012-11-23 16:51:27 -10:00 • committed by Dirk Hohndel
parent a9786564c2
commit 25b4fee655
9 changed files with 144 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

8
parse-xml.c
View file

@ -1199,7 +1199,7 @@ static void try_to_fill_trip(dive_trip_t **dive_trip_p, const char *name, char *
static gboolean is_dive(void)
{
return (cur_dive &&
(cur_dive->location || cur_dive->when || cur_dive->samples));
(cur_dive->location || cur_dive->when || cur_dive->dc.samples));
}
static void dive_start(void)
@ -1254,7 +1254,7 @@ static void event_start(void)
static void event_end(void)
{
if (cur_event.name && strcmp(cur_event.name, "surface") != 0)
add_event(cur_dive, cur_event.time.seconds,
add_event(&cur_dive->dc, cur_event.time.seconds,
cur_event.type, cur_event.flags,
cur_event.value, cur_event.name);
cur_event.active = 0;
@ -1280,7 +1280,7 @@ static void ws_end(void)
static void sample_start(void)
{
cur_sample = prepare_sample(cur_dive);
cur_sample = prepare_sample(&cur_dive->dc);
}
static void sample_end(void)
@ -1288,7 +1288,7 @@ static void sample_end(void)
if (!cur_dive)
return;
finish_sample(cur_dive);
finish_sample(&cur_dive->dc);
cur_sample = NULL;
}