summaryrefslogtreecommitdiffstats
path: root/libdivecomputer.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-22 18:02:54 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-22 18:02:54 -0700
commit3a77eb85101a5fb1dc186b88a3a02d2ae27690c7 (patch)
treebf40abf756c788347830b1990423f9c5ce9968b8 /libdivecomputer.c
parent50c2bb7c71b279237f05c1c0a530d494bad534c8 (diff)
downloadsubsurface-3a77eb85101a5fb1dc186b88a3a02d2ae27690c7.tar.gz
Start handling dive events
Parse them, save them, take them from libdivecomputer. This doesn't merge them or show them in the profile yet, though. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'libdivecomputer.c')
-rw-r--r--libdivecomputer.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libdivecomputer.c b/libdivecomputer.c
index b20acdbec..806ea651f 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -118,7 +118,7 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
return PARSER_STATUS_SUCCESS;
}
-static void handle_event(struct dive **divep, struct sample *sample, parser_sample_value_t value)
+static void handle_event(struct dive *dive, struct sample *sample, parser_sample_value_t value)
{
int type, time;
static const char *events[] = {
@@ -152,9 +152,7 @@ static void handle_event(struct dive **divep, struct sample *sample, parser_samp
if (sample)
time += sample->time.seconds;
- printf(" <event type=\"%u\" time=\"%u:%02u\" flags=\"%u\" value=\"%u\" name=\"%s\" />\n",
- type, time / 60, time % 60,
- value.event.flags, value.event.value, name);
+ add_event(dive, time, type, value.event.flags, value.event.value, name);
}
void
@@ -188,7 +186,7 @@ sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata
sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5;
break;
case SAMPLE_TYPE_EVENT:
- handle_event(divep, sample, value);
+ handle_event(dive, sample, value);
break;
case SAMPLE_TYPE_RBT:
printf(" <rbt>%u</rbt>\n", value.rbt);