X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=b20acdbecd0ebf41cc32b2244488d4ad82dcf8a5;hb=d344d15a905576ca25a0585e6beb554388628bc6;hp=cf8b048c9e79e62ea63f30bc04a364ce3ce59855;hpb=682135838ff313594c7f67fabd9be8f88a33883b;p=ext%2Fsubsurface.git

diff --git a/libdivecomputer.c b/libdivecomputer.c
index cf8b048..b20acdb 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -118,16 +118,49 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
 	return PARSER_STATUS_SUCCESS;
 }
 
-void
-sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata)
+static void handle_event(struct dive **divep, struct sample *sample, parser_sample_value_t value)
 {
-	int i;
+	int type, time;
 	static const char *events[] = {
 		"none", "deco", "rbt", "ascent", "ceiling", "workload", "transmitter",
 		"violation", "bookmark", "surface", "safety stop", "gaschange",
 		"safety stop (voluntary)", "safety stop (mandatory)", "deepstop",
 		"ceiling (safety stop)", "unknown", "divetime", "maxdepth",
-		"OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"};
+		"OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"
+	};
+	const int nr_events = sizeof(events) / sizeof(const char *);
+	const char *name;
+
+	/*
+	 * Just ignore surface events.  They are pointless.  What "surface"
+	 * means depends on the dive computer (and possibly even settings
+	 * in the dive computer). It does *not* necessarily mean "depth 0",
+	 * so don't even turn it into that.
+	 */
+	if (value.event.type == SAMPLE_EVENT_SURFACE)
+		return;
+
+	/*
+	 * Other evens might be more interesting, but for now we just print them out.
+	 */
+	type = value.event.type;
+	name = "invalid event number";
+	if (type < nr_events)
+		name = events[type];
+
+	time = value.event.time;
+	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);
+}
+
+void
+sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata)
+{
+	int i;
 	struct dive **divep = userdata;
 	struct dive *dive = *divep;
 	struct sample *sample;
@@ -155,8 +188,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:
-		printf("   <event type=\"%u\" time=\"%u\" flags=\"%u\" value=\"%u\">%s</event>\n",
-			value.event.type, value.event.time, value.event.flags, value.event.value, events[value.event.type]);
+		handle_event(divep, sample, value);
 		break;
 	case SAMPLE_TYPE_RBT:
 		printf("   <rbt>%u</rbt>\n", value.rbt);
@@ -369,7 +401,7 @@ static void event_cb(device_t *device, device_event_t event, const void *data, v
 		printf("Event: waiting for user action\n");
 		break;
 	case DEVICE_EVENT_PROGRESS:
-		update_progressbar(devdata->progress,
+		update_progressbar(&devdata->progress,
 			(double) progress->current / (double) progress->maximum);
 		break;
 	case DEVICE_EVENT_DEVINFO: