X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=80c822e2cf14b76a8e07d988c1a874725d3fc26b;hb=14cbfcc8050f4fa116875a3d5baad7a114f5b061;hp=9e16c5119384f208f12f7760cb2c06dcca373d04;hpb=df5396800830d41a83a837b95b0f3787571905cf;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 9e16c51..80c822e 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -54,6 +54,7 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	_sample_rate("Hz", this),
 	_updating_sample_rate(false),
 	_updating_sample_count(false),
+	_sample_count_supported(false),
 	_icon_red(":/icons/status-red.svg"),
 	_icon_green(":/icons/status-green.svg"),
 	_icon_grey(":/icons/status-grey.svg"),
@@ -203,26 +204,25 @@ 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.show_none();
-	}
-	else
-	{
+	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()
@@ -263,6 +263,8 @@ void SamplingBar::commit_sample_rate()
 
 void SamplingBar::on_device_selected()
 {
+	GVariant *gvar;
+
 	using namespace pv::popups;
 
 	if (_updating_device_selector)
@@ -281,12 +283,37 @@ void SamplingBar::on_device_selected()
 	Probes *const probes = new Probes(_session, this);
 	_probes_button.set_popup(probes);
 
+	// Update supported options.
+	_sample_count_supported = false;
+
+	if (sr_config_list(sdi->driver, sdi, NULL,
+		SR_CONF_DEVICE_OPTIONS, &gvar) == SR_OK)
+	{
+		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++)
+		{
+			switch (options[i]) {
+			case SR_CONF_LIMIT_SAMPLES:
+				_sample_count_supported = true;
+				break;
+			case SR_CONF_LIMIT_FRAMES:
+				sr_config_set(sdi, NULL, SR_CONF_LIMIT_FRAMES,
+					g_variant_new_uint64(1));
+				break;
+			}
+		}
+	}
+
 	// Update sweep timing widgets.
 	update_sample_count_selector();
 	update_sample_rate_selector();
 
-	if (_sample_count.value() == 0)
+	if (_sample_count_supported && _sample_count.value() == 0) {
 		_sample_count.set_value(DefaultRecordLength);
+		commit_sample_count();
+	}
 }
 
 void SamplingBar::on_sample_count_changed()