X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Foutput.c;h=df22b22233720cc349b4bb88cc0c5b12ee33913a;hb=6433156c3275df933e4bf6dcfb020c91fca0ae86;hp=c9e49990fab91c5707e9a15ca9e0032122f93664;hpb=4fb0a5f8a022b4b551f0dcac5c458c7108ea613c;p=libsigrok.git

diff --git a/src/output/output.c b/src/output/output.c
index c9e49990..df22b222 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -18,10 +18,12 @@
  */
 
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
+/** @cond PRIVATE */
 #define LOG_PREFIX "output"
+/** @endcond */
 
 /**
  * @file
@@ -154,6 +156,18 @@ SR_API const char *const *sr_output_extensions_get(
 	return omod->exts;
 }
 
+/*
+ * Checks whether a given flag is set.
+ *
+ * @see sr_output_flag
+ * @since 0.4.0
+ */
+SR_API gboolean sr_output_test_flag(const struct sr_output_module *omod,
+		uint64_t flag)
+{
+	return (flag & omod->flags);
+}
+
 /**
  * Return the output module with the specified ID, or NULL if no module
  * with that id is found.
@@ -243,7 +257,8 @@ SR_API void sr_output_options_free(const struct sr_option **options)
  * @since 0.4.0
  */
 SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod,
-		GHashTable *options, const struct sr_dev_inst *sdi)
+		GHashTable *options, const struct sr_dev_inst *sdi,
+		const char *filename)
 {
 	struct sr_output *op;
 	const struct sr_option *mod_opts;
@@ -256,6 +271,7 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod
 	op = g_malloc(sizeof(struct sr_output));
 	op->module = omod;
 	op->sdi = sdi;
+	op->filename = g_strdup(filename);
 
 	new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
 			(GDestroyNotify)g_variant_unref);
@@ -267,7 +283,8 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod
 				/* 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);
+					sr_err("Invalid type for '%s' option.",
+						(char *)key);
 					g_free(op);
 					return NULL;
 				}
@@ -285,7 +302,8 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod
 			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'", omod->id, key);
+					sr_err("Output module '%s' has no option '%s'",
+						omod->id, (char *)key);
 					g_hash_table_destroy(new_opts);
 					g_free(op);
 					return NULL;
@@ -333,6 +351,7 @@ SR_API int sr_output_free(const struct sr_output *o)
 	ret = SR_OK;
 	if (o->module->cleanup)
 		ret = o->module->cleanup((struct sr_output *)o);
+	g_free((char *)o->filename);
 	g_free((gpointer)o);
 
 	return ret;