From: Gerhard Sittig <redacted>
Date: Sun, 10 May 2020 17:40:38 +0000 (+0200)
Subject: show: mark currently selected samplerate item in samplerates lists
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=917c8f83ba2f01677aec2b37aa2d6ae924171ff9;p=sigrok-cli.git

show: mark currently selected samplerate item in samplerates lists

Get the current value as well as the list for SR_CONF_SAMPLERATE keys,
and add the "(current)" marker to a list item when a match was found.

  $ sigrok-cli -d fx2lafw --show
---

diff --git a/show.c b/show.c
index e62f697..41474b3 100644
--- a/show.c
+++ b/show.c
@@ -393,6 +393,7 @@ void show_dev_detail(void)
 	gsize num_elements;
 	double dlow, dhigh, dcur_low, dcur_high;
 	const uint64_t *uint64;
+	uint64_t cur_rate, rate;
 	uint64_t p = 0, q = 0, low = 0, high = 0;
 	uint64_t tmp_uint64, mask, cur_low, cur_high, cur_p, cur_q;
 	GArray *opts;
@@ -535,6 +536,13 @@ void show_dev_detail(void)
 		} else if (key == SR_CONF_SAMPLERATE) {
 			/* Supported samplerates */
 			printf("    %s", srci->id);
+			cur_rate = ~0ull;
+			if (maybe_config_get(driver, sdi, channel_group,
+				SR_CONF_SAMPLERATE, &gvar) == SR_OK) {
+				if (g_variant_is_of_type(gvar, G_VARIANT_TYPE_UINT64))
+					cur_rate = g_variant_get_uint64(gvar);
+				g_variant_unref(gvar);
+			}
 			if (maybe_config_list(driver, sdi, channel_group, SR_CONF_SAMPLERATE,
 					&gvar_dict) != SR_OK) {
 				printf("\n");
@@ -546,9 +554,14 @@ void show_dev_detail(void)
 						&num_elements, sizeof(uint64_t));
 				printf(" - supported samplerates:\n");
 				for (i = 0; i < num_elements; i++) {
-					if (!(s = sr_samplerate_string(uint64[i])))
+					rate = uint64[i];
+					s = sr_samplerate_string(rate);
+					if (!s)
 						continue;
-					printf("      %s\n", s);
+					printf("      %s", s);
+					if (rate == cur_rate)
+						printf(" (current)");
+					printf("\n");
 					g_free(s);
 				}
 				g_variant_unref(gvar_list);