session: Supply filename to the output module directly

[sigrok-cli.git] / session.c

diff --git a/session.c b/session.c
index 86eea7c44b462b10dbe9a83cc038d9c7ddc0b04c..b045119483a8238b1091fd8bf2c42e1c4343e98d 100644 (file)
--- a/session.c
+++ b/session.c
@@ -25,7 +25,6 @@
 
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
-static char *srzip_and_filename = NULL;
 
 #ifdef HAVE_SRD
 extern struct srd_session *srd_sess;
@@ -53,7 +52,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
                }
        } else if (config_key_has_cap(driver, sdi, NULL, SR_CONF_SAMPLERATE,
                        SR_CONF_GET | SR_CONF_SET)) {
-               /* Convert to samples based on the samplerate.  */
+               /* Convert to samples based on the samplerate. */
                sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
                samplerate = g_variant_get_uint64(gvar);
                g_variant_unref(gvar);
@@ -81,17 +80,13 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
        const struct sr_option **options;
        const struct sr_output *o;
        GHashTable *fmtargs, *fmtopts;
-       int size;
        char *fmtspec;
 
        if (!opt_output_format) {
                if (opt_output_file) {
-                       size = strlen(opt_output_file) + 32;
-                       srzip_and_filename = g_malloc(size);
-                       snprintf(srzip_and_filename, size, "srzip:filename=%s", opt_output_file);
-                       opt_output_format = srzip_and_filename;
+                       opt_output_format = DEFAULT_OUTPUT_FORMAT_FILE;
                } else {
-                       opt_output_format = DEFAULT_OUTPUT_FORMAT;
+                       opt_output_format = DEFAULT_OUTPUT_FORMAT_NOFILE;
                }
        }
 
@@ -107,7 +102,8 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
                sr_output_options_free(options);
        } else
                fmtopts = NULL;
-       o = sr_output_new(omod, fmtopts, sdi);
+       o = sr_output_new(omod, fmtopts, sdi, opt_output_file);
+
        if (fmtopts)
                g_hash_table_destroy(fmtopts);
        g_hash_table_destroy(fmtargs);
@@ -171,7 +167,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
        driver = sr_dev_inst_driver_get(sdi);
 
        /* If the first packet to come in isn't a header, don't even try. */
-       if (packet->type != SR_DF_HEADER && o == NULL)
+       if (packet->type != SR_DF_HEADER && !o)
                return;
 
        session = cb_data;
@@ -182,7 +178,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
                        g_critical("Failed to initialize output module.");
 
                /* Set up backup analog output module. */
-               oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
+               oa = sr_output_new(sr_output_find("analog"), NULL, sdi, NULL);
 
                if (opt_output_file)
                        outfile = g_fopen(opt_output_file, "wb");
@@ -330,10 +326,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
        if (packet->type == SR_DF_END) {
                g_debug("cli: Received SR_DF_END.");
 
-               if (o) {
+               if (o)
                        sr_output_free(o);
-                       g_free(srzip_and_filename);
-               }
                o = NULL;
 
                sr_output_free(oa);
@@ -371,7 +365,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
        }
        src->key = srci->key;
 
-       if ((value == NULL || strlen(value) == 0) &&
+       if ((!value || strlen(value) == 0) &&
                (srci->datatype != SR_T_BOOL)) {
                g_critical("Option '%s' needs a value.", (char *)key);
                return -1;