X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=5d92362e714bf87175b616495a3f3a3e5c844e78;hb=7ac79fb6edfdece09b9f503142bc647dc4ac52aa;hp=edf3d12bdae898686c0c8e16123ed01d62f3a422;hpb=c7639c1d63d85687618087acdbf5279b94c24117;p=sigrok-cli.git

diff --git a/session.c b/session.c
index edf3d12..5d92362 100644
--- a/session.c
+++ b/session.c
@@ -45,14 +45,14 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	if (sr_dev_config_capabilities(sdi, NULL, SR_CONF_LIMIT_MSEC)
+	if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_LIMIT_MSEC)
 			& SR_CONF_SET) {
 		gvar = g_variant_new_uint64(time_msec);
 		if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
 			g_critical("Failed to configure time limit.");
 			return SR_ERR;
 		}
-	} else if (sr_dev_config_capabilities(sdi, NULL, SR_CONF_SAMPLERATE)
+	} else if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_SAMPLERATE)
 			& (SR_CONF_GET | SR_CONF_SET)) {
 		/* Convert to samples based on the samplerate. */
 		sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
@@ -175,6 +175,10 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	uint64_t input_len;
 	struct sr_dev_driver *driver;
 
+	/* Avoid warnings when building without decoder support. */
+	(void)session;
+	(void)input_len;
+
 	driver = sr_dev_inst_driver_get(sdi);
 
 	/* If the first packet to come in isn't a header, don't even try. */
@@ -189,7 +193,9 @@ 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, NULL);
+		if (outfile)
+			oa = sr_output_new(sr_output_find("analog"), NULL,
+					sdi, NULL);
 
 		rcvd_samples_logic = rcvd_samples_analog = 0;
 
@@ -307,9 +313,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 
 	if (o && !opt_pds) {
 		if (sr_output_send(o, packet, &out) == SR_OK) {
-			if (!out || (out->len == 0
-					&& !opt_output_format
-					&& packet->type == SR_DF_ANALOG)) {
+			if (oa && !out) {
 				/*
 				 * The user didn't specify an output module,
 				 * but needs to see this analog data.
@@ -336,7 +340,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 			sr_output_free(o);
 		o = NULL;
 
-		sr_output_free(oa);
+		if (oa)
+			sr_output_free(oa);
 		oa = NULL;
 
 		if (outfile && outfile != stdout)
@@ -527,7 +532,7 @@ void run_session(void)
 	struct sr_trigger *trigger;
 	struct sr_dev_inst *sdi;
 	uint64_t min_samples, max_samples;
-	GArray *dev_opts;
+	GArray *drv_opts;
 	guint i;
 	int is_demo_dev;
 	struct sr_dev_driver *driver;
@@ -546,18 +551,18 @@ void run_session(void)
 
 		driver = sr_dev_inst_driver_get(sdi);
 
-		if (!(dev_opts = sr_dev_options(driver, sdi, NULL))) {
-			g_critical("Failed to query list device options.");
+		if (!(drv_opts = sr_dev_options(driver, NULL, NULL))) {
+			g_critical("Failed to query list of driver options.");
 			return;
 		}
 
 		is_demo_dev = 0;
-		for (i = 0; i < dev_opts->len; i++) {
-			if (g_array_index(dev_opts, uint32_t, i) == SR_CONF_DEMO_DEV)
+		for (i = 0; i < drv_opts->len; i++) {
+			if (g_array_index(drv_opts, uint32_t, i) == SR_CONF_DEMO_DEV)
 				is_demo_dev = 1;
 		}
 
-		g_array_free(dev_opts, TRUE);
+		g_array_free(drv_opts, TRUE);
 
 		if (!is_demo_dev)
 			real_devices = g_slist_append(real_devices, sdi);