X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Foutput.c;h=1ddbd61ef683fb6d21f111d3393d78f6f1802324;hb=3250d8c7e05f2d6a3ffbdf2499af8a13fa99fe39;hp=6458395371a8eba323187fe2c2e983a91df74832;hpb=706f482a95f669f722a40fc30488d67431553d1e;p=libsigrok.git

diff --git a/src/output/output.c b/src/output/output.c
index 64583953..1ddbd61e 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libsigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,6 +60,7 @@ extern SR_PRIV struct sr_output_module output_gnuplot;
 extern SR_PRIV struct sr_output_module output_chronovu_la8;
 extern SR_PRIV struct sr_output_module output_csv;
 extern SR_PRIV struct sr_output_module output_analog;
+extern SR_PRIV struct sr_output_module output_srzip;
 extern SR_PRIV struct sr_output_module output_wav;
 /* @endcond */
 
@@ -74,12 +75,13 @@ static const struct sr_output_module *output_module_list[] = {
 	&output_vcd,
 	&output_chronovu_la8,
 	&output_analog,
+	&output_srzip,
 	&output_wav,
 	NULL,
 };
 
 /**
- * Returns a NULL-terminated list of all the available output modules.
+ * Returns a NULL-terminated list of all available output modules.
  *
  * @since 0.4.0
  */
@@ -160,39 +162,52 @@ SR_API const struct sr_output_module *sr_output_find(char *id)
  *
  * @since 0.4.0
  */
-SR_API const struct sr_option *sr_output_options_get(const struct sr_output_module *o)
+SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *o)
 {
+	const struct sr_option *mod_opts, **opts;
+	int size, i;
 
 	if (!o || !o->options)
 		return NULL;
 
-	return o->options();
+	mod_opts = o->options();
+
+	for (size = 0; mod_opts[size].id; size++)
+		;
+	opts = g_malloc((size + 1) * sizeof(struct sr_option *));
+
+	for (i = 0; i < size; i++)
+		opts[i] = &mod_opts[i];
+	opts[i] = NULL;
+
+	return opts;
 }
 
 /**
  * After a call to sr_output_options_get(), this function cleans up all
- * the resources allocated by that call.
+ * resources returned by that call.
  *
  * @since 0.4.0
  */
-SR_API void sr_output_options_free(const struct sr_output_module *o)
+SR_API void sr_output_options_free(const struct sr_option **options)
 {
-	struct sr_option *opt;
+	int i;
 
-	if (!o || !o->options)
+	if (!options)
 		return;
 
-	for (opt = o->options(); opt->id; opt++) {
-		if (opt->def) {
-			g_variant_unref(opt->def);
-			opt->def = NULL;
+	for (i = 0; options[i]; i++) {
+		if (options[i]->def) {
+			g_variant_unref(options[i]->def);
+			((struct sr_option *)options[i])->def = NULL;
 		}
 
-		if (opt->values) {
-			g_slist_free_full(opt->values, (GDestroyNotify)g_variant_unref);
-			opt->values = NULL;
+		if (options[i]->values) {
+			g_slist_free_full(options[i]->values, (GDestroyNotify)g_variant_unref);
+			((struct sr_option *)options[i])->values = NULL;
 		}
 	}
+	g_free(options);
 }
 
 /**
@@ -212,7 +227,7 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
 		GHashTable *options, const struct sr_dev_inst *sdi)
 {
 	struct sr_output *op;
-	struct sr_option *mod_opts;
+	const struct sr_option *mod_opts;
 	const GVariantType *gvt;
 	GHashTable *new_opts;
 	GHashTableIter iter;
@@ -223,14 +238,14 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
 	op->module = o;
 	op->sdi = sdi;
 
-	if (options) {
-		new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
-				(GDestroyNotify)g_variant_unref);
+	new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+			(GDestroyNotify)g_variant_unref);
+	if (o->options) {
 		mod_opts = o->options();
 		for (i = 0; mod_opts[i].id; i++) {
-			if (g_hash_table_lookup_extended(options, mod_opts[i].id,
-					&key, &value)) {
-				/* Option not given: insert the default value. */
+			if (options && g_hash_table_lookup_extended(options,
+					mod_opts[i].id, &key, &value)) {
+				/* Pass option along. */
 				gvt = g_variant_get_type(mod_opts[i].def);
 				if (!g_variant_is_of_type(value, gvt)) {
 					sr_err("Invalid type for '%s' option.", key);
@@ -240,27 +255,27 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
 				g_hash_table_insert(new_opts, g_strdup(mod_opts[i].id),
 						g_variant_ref(value));
 			} else {
-				/* Pass option along. */
+				/* Option not given: insert the default value. */
 				g_hash_table_insert(new_opts, g_strdup(mod_opts[i].id),
 						g_variant_ref(mod_opts[i].def));
 			}
 		}
 
 		/* Make sure no invalid options were given. */
-		g_hash_table_iter_init(&iter, options);
-		while (g_hash_table_iter_next(&iter, &key, &value)) {
-			if (!g_hash_table_lookup(new_opts, key)) {
-				sr_err("Output module '%s' has no option '%s'", o->id, key);
-				g_hash_table_destroy(new_opts);
-				g_free(op);
-				return NULL;
+		if (options) {
+			g_hash_table_iter_init(&iter, options);
+			while (g_hash_table_iter_next(&iter, &key, &value)) {
+				if (!g_hash_table_lookup(new_opts, key)) {
+					sr_err("Output module '%s' has no option '%s'", o->id, key);
+					g_hash_table_destroy(new_opts);
+					g_free(op);
+					return NULL;
+				}
 			}
 		}
-	} else
-		new_opts = NULL;
+	}
 
 	if (op->module->init && op->module->init(op, new_opts) != SR_OK) {
-		g_hash_table_destroy(new_opts);
 		g_free(op);
 		op = NULL;
 	}