Show PD annotation row members by name, not number.

[sigrok-cli.git] / session.c

diff --git a/session.c b/session.c
index e8c52d549910de4f0d78a9316229caed744953d5..6465055a1c00f05dc3186066b17728bbca1e819e 100644 (file)
--- a/session.c
+++ b/session.c
@@ -71,28 +71,37 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-struct sr_output_format *find_output_module(char *name)
+GHashTable *generic_arg_to_opt(const struct sr_option *opts, GHashTable *genargs)
 {
-       struct sr_output_format **outputs, *omod;
-       int i;
-
-       omod = NULL;
-       outputs = sr_output_list();
-       for (i = 0; outputs[i]; i++) {
-               if (!strcmp(outputs[i]->id, name)) {
-                       omod = outputs[i];
-                       break;
-               }
+       GHashTable *hash;
+       GVariant *gvar;
+       const struct sr_option *opt;
+       char *s;
+
+       hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
+                       (GDestroyNotify)g_variant_unref);
+       for (opt = opts; opt->id && opt->def; opt++) {
+               if (!(s = g_hash_table_lookup(genargs, opt->id)))
+                       continue;
+               if (g_variant_is_of_type(opt->def, G_VARIANT_TYPE_UINT32)) {
+                       gvar = g_variant_new_uint32(strtoul(s, NULL, 10));
+                       g_hash_table_insert(hash, g_strdup(opt->id),
+                                       g_variant_ref_sink(gvar));
+               } else {
+                       g_critical("Don't know how to convert option '%s' to %s!",
+                                       opt->id, g_variant_get_type_string(opt->def));
+                }
        }
 
-       return omod;
+       return hash;
 }
 
-struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
+const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
 {
-       struct sr_output_format *omod;
-       GHashTable *fmtargs;
-       struct sr_output *o;
+       const struct sr_output_module *omod;
+       const struct sr_option *opts;
+       const struct sr_output *o;
+       GHashTable *fmtargs, *fmtopts;
        char *fmtspec;
 
        if (opt_output_format && !strcmp(opt_output_format, "sigrok")) {
@@ -114,10 +123,17 @@ struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
        fmtspec = g_hash_table_lookup(fmtargs, "sigrok_key");
        if (!fmtspec)
                g_critical("Invalid output format.");
-       if (!(omod = find_output_module(fmtspec)))
+       if (!(omod = sr_output_find(fmtspec)))
                g_critical("Unknown output format '%s'.", fmtspec);
        g_hash_table_remove(fmtargs, "sigrok_key");
-       o = sr_output_new(omod, fmtargs, sdi);
+       if ((opts = sr_output_options_get(omod))) {
+               fmtopts = generic_arg_to_opt(opts, fmtargs);
+               sr_output_options_free(omod);
+       } else
+               fmtopts = NULL;
+       o = sr_output_new(omod, fmtopts, sdi);
+       if (fmtopts)
+               g_hash_table_destroy(fmtopts);
        g_hash_table_destroy(fmtargs);
 
        return o;
@@ -132,8 +148,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
        struct sr_session *session;
        struct sr_config *src;
        struct sr_channel *ch;
-       static struct sr_output *o = NULL;
-       static struct sr_output *oa = NULL;
+       static const struct sr_output *o = NULL;
+       static const struct sr_output *oa = NULL;
        static uint64_t rcvd_samples_logic = 0;
        static uint64_t rcvd_samples_analog = 0;
        static uint64_t samplerate = 0;
@@ -158,7 +174,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
                o = setup_output_format(sdi);
 
                /* Set up backup analog output module. */
-               oa = sr_output_new(find_output_module("analog"), NULL, sdi);
+               oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
 
                /* Prepare non-stdout output. */
                outfile = stdout;
@@ -481,9 +497,11 @@ void run_session(void)
        }
        if (g_slist_length(devices) > 1) {
                g_critical("sigrok-cli only supports one device for capturing.");
+               g_slist_free(devices);
                return;
        }
        sdi = devices->data;
+       g_slist_free(devices);
 
        sr_session_new(&session);
        sr_session_datafeed_callback_add(session, datafeed_in, NULL);
@@ -598,7 +616,6 @@ void run_session(void)
 
        sr_session_datafeed_callback_remove_all(session);
        sr_session_destroy(session);
-       g_slist_free(devices);
 
 }