Fix generic sr_option enumeration.

[sigrok-cli.git] / session.c

diff --git a/session.c b/session.c
index 5742eed1e69857730f51cf2649d59bdedff33676..d7bdf8a0579e9a7cb9686ca50f5a4523cec57687 100644 (file)
--- a/session.c
+++ b/session.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-static struct sr_output_format *output_format = NULL;
 static int default_output_format = FALSE;
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
@@ -72,12 +71,12 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-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)
 {
-       GHashTable *fmtargs;
-       struct sr_output *o;
-       struct sr_output_format **outputs;
-       int i;
+       const struct sr_output_module *omod;
+       const struct sr_option **options;
+       const struct sr_output *o;
+       GHashTable *fmtargs, *fmtopts;
        char *fmtspec;
 
        if (opt_output_format && !strcmp(opt_output_format, "sigrok")) {
@@ -99,17 +98,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.");
-       outputs = sr_output_list();
-       for (i = 0; outputs[i]; i++) {
-               if (strcmp(outputs[i]->id, fmtspec))
-                       continue;
-               g_hash_table_remove(fmtargs, "sigrok_key");
-               output_format = outputs[i];
-               break;
-       }
-       if (!output_format)
-               g_critical("Invalid output format '%s'.", opt_output_format);
-       o = sr_output_new(output_format, fmtargs, sdi);
+       if (!(omod = sr_output_find(fmtspec)))
+               g_critical("Unknown output module '%s'.", fmtspec);
+       g_hash_table_remove(fmtargs, "sigrok_key");
+       if ((options = sr_output_options_get(omod))) {
+               fmtopts = generic_arg_to_opt(options, fmtargs);
+               sr_output_options_free(options);
+       } else
+               fmtopts = NULL;
+       o = sr_output_new(omod, fmtopts, sdi);
+       if (fmtopts)
+               g_hash_table_destroy(fmtopts);
        g_hash_table_destroy(fmtargs);
 
        return o;
@@ -124,7 +123,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 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;
@@ -146,7 +146,11 @@ void datafeed_in(const struct sr_dev_inst *sdi,
        switch (packet->type) {
        case SR_DF_HEADER:
                g_debug("cli: Received SR_DF_HEADER.");
-               o = setup_output_format(sdi);
+               if (!(o = setup_output_format(sdi)))
+                       g_critical("Failed to initialize output module.");
+
+               /* Set up backup analog output module. */
+               oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
 
                /* Prepare non-stdout output. */
                outfile = stdout;
@@ -292,10 +296,19 @@ void datafeed_in(const struct sr_dev_inst *sdi,
        }
 
        if (o && outfile && !opt_pds) {
-               if (sr_output_send(o, packet, &out) == SR_OK && out) {
-                       fwrite(out->str, 1, out->len, outfile);
-                       fflush(outfile);
-                       g_string_free(out, TRUE);
+               if (sr_output_send(o, packet, &out) == SR_OK) {
+                       if (!out || (out->len == 0 && default_output_format
+                                       && packet->type == SR_DF_ANALOG)) {
+                               /* The user didn't specify an output module,
+                                * but needs to see this analog data. */
+                               sr_output_send(oa, packet, &out);
+                       }
+                       if (out && out->len > 0) {
+                               fwrite(out->str, 1, out->len, outfile);
+                               fflush(outfile);
+                       }
+                       if (out)
+                               g_string_free(out, TRUE);
                }
        }
 
@@ -308,6 +321,9 @@ void datafeed_in(const struct sr_dev_inst *sdi,
                        sr_output_free(o);
                o = NULL;
 
+               sr_output_free(oa);
+               oa = NULL;
+
                if (outfile && outfile != stdout)
                        fclose(outfile);
 
@@ -457,9 +473,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);
@@ -574,7 +592,6 @@ void run_session(void)
 
        sr_session_datafeed_callback_remove_all(session);
        sr_session_destroy(session);
-       g_slist_free(devices);
 
 }