X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Foutput.c;h=0a9e7f880689bee89308cd9e30dd4e8b9075fce7;hb=64bc73f5282ec0e7da6e00a8d078191e5375dc5c;hp=5e2d409d525ddc0c9fee24eab8392504548124ba;hpb=e00b3f5897d9b5b85b552f9f8da7684229b9bdfc;p=libsigrok.git diff --git a/src/output/output.c b/src/output/output.c index 5e2d409d..0a9e7f88 100644 --- a/src/output/output.c +++ b/src/output/output.c @@ -18,7 +18,7 @@ */ #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" /** @cond PRIVATE */ @@ -156,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. @@ -245,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; @@ -258,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); @@ -335,6 +349,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;