X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=f51bb642aad35149972029991210d906ed3e26f8;hp=9fa545ec690a35fc5b6f3e742df2eb472ec5ce0c;hb=cbbea0871ba979786ea00f0cf9ed4abe3cc0b857;hpb=23c40b60cd87f9779c6e99a99653f7c68682c852

diff --git a/session.c b/session.c
index 9fa545e..f51bb64 100644
--- 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;
@@ -75,23 +74,19 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-const 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, FILE **outfile)
 {
 	const struct sr_output_module *omod;
 	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,17 @@ 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 (opt_output_file) {
+		if (!sr_output_test_flag(omod, SR_OUTPUT_INTERNAL_IO_HANDLING))
+			*outfile = g_fopen(opt_output_file, "wb");
+		else
+			*outfile = NULL;
+	} else {
+		*outfile = stdout;
+	}
+
 	if (fmtopts)
 		g_hash_table_destroy(fmtopts);
 	g_hash_table_destroy(fmtargs);
@@ -178,16 +183,11 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	switch (packet->type) {
 	case SR_DF_HEADER:
 		g_debug("cli: Received SR_DF_HEADER.");
-		if (!(o = setup_output_format(sdi)))
+		if (!(o = setup_output_format(sdi, &outfile)))
 			g_critical("Failed to initialize output module.");
 
 		/* Set up backup analog output module. */
-		oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
-
-		if (opt_output_file)
-			outfile = g_fopen(opt_output_file, "wb");
-		else
-			outfile = stdout;
+		oa = sr_output_new(sr_output_find("analog"), NULL, sdi, NULL);
 
 		rcvd_samples_logic = rcvd_samples_analog = 0;
 
@@ -271,7 +271,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 		if (opt_pds) {
 #ifdef HAVE_SRD
 			if (srd_session_send(srd_sess, rcvd_samples_logic, end_sample,
-					logic->data, input_len) != SRD_OK)
+					logic->data, input_len, logic->unitsize) != SRD_OK)
 				sr_session_stop(session);
 #endif
 		}
@@ -303,7 +303,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 		break;
 	}
 
-	if (o && outfile && !opt_pds) {
+	if (o && !opt_pds) {
 		if (sr_output_send(o, packet, &out) == SR_OK) {
 			if (!out || (out->len == 0
 					&& !opt_output_format
@@ -314,7 +314,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 				 */
 				sr_output_send(oa, packet, &out);
 			}
-			if (out && out->len > 0) {
+			if (outfile && out && out->len > 0) {
 				fwrite(out->str, 1, out->len, outfile);
 				fflush(outfile);
 			}
@@ -330,10 +330,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);