From: Martin Ling <redacted>
Date: Tue, 14 Jan 2014 20:36:53 +0000 (+0000)
Subject: Use SR_CONF_DEVICE_OPTIONS to decide if LIMIT_SAMPLES is supported.
X-Git-Tag: pulseview-0.2.0~124
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=df3c1aa3b358de058efa677fd0d51ca54da97bcd;hp=6546a6a70c9da402794297cbdc9aba67854a4037

Use SR_CONF_DEVICE_OPTIONS to decide if LIMIT_SAMPLES is supported.
---

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 987719d8..15eaf3b4 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -204,28 +204,43 @@ void SamplingBar::update_sample_count_selector()
 {
 	sr_dev_inst *const sdi = get_selected_device();
 	GVariant *gvar;
-	uint64_t samplecount;
+	uint64_t samplecount = 0;
 
 	assert(sdi);
 
-	if (sr_config_get(sdi->driver, sdi, NULL,
-		SR_CONF_LIMIT_SAMPLES, &gvar) != SR_OK)
+	_sample_count_supported = false;
+
+	if (sr_config_list(sdi->driver, sdi, NULL,
+		SR_CONF_DEVICE_OPTIONS, &gvar) == SR_OK)
 	{
-		_sample_count_supported = false;
-		_sample_count.show_none();
+		gsize num_opts;
+		const int *const options = (const int32_t *)g_variant_get_fixed_array(
+	        gvar, &num_opts, sizeof(int32_t));
+		for (unsigned int i = 0; i < num_opts; i++)
+		{
+			if (options[i] == SR_CONF_LIMIT_SAMPLES)
+			{
+				_sample_count_supported = true;
+				break;
+			}
+		}
 	}
-	else
-	{
-		_sample_count_supported = true;
+
+	if (_sample_count_supported)
 		_sample_count.show_min_max_step(0, UINT64_MAX, 1);
+	else
+		_sample_count.show_none();
 
+	if (sr_config_get(sdi->driver, sdi, NULL,
+		SR_CONF_LIMIT_SAMPLES, &gvar) == SR_OK)
+	{
 		samplecount = g_variant_get_uint64(gvar);
 		g_variant_unref(gvar);
-
-		_updating_sample_count = true;
-		_sample_count.set_value(samplecount);
-		_updating_sample_count = false;
 	}
+
+	_updating_sample_count = true;
+	_sample_count.set_value(samplecount);
+	_updating_sample_count = false;
 }
 
 void SamplingBar::commit_sample_count()