X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=dce7aa38417753c7927f3eefa0c23cd0369b7ae4;hb=32d83ce1a26322a433785746ea7465f9bdf830b6;hp=35de916b6ef76465535f9852c65a4dc88437960c;hpb=8dd4419097191563045396946f0dcff5ac9714b2;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 35de916b..dce7aa38 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -30,7 +30,7 @@
 #include "samplingbar.h"
 
 #include <pv/devicemanager.h>
-#include <pv/devinst.h>
+#include <pv/device/devinst.h>
 #include <pv/popups/deviceoptions.h>
 #include <pv/popups/probes.h>
 
@@ -96,14 +96,14 @@ SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 }
 
 void SamplingBar::set_device_list(
-	const std::list< shared_ptr<pv::DevInst> > &devices)
+	const std::list< shared_ptr<pv::device::DevInst> > &devices)
 {
 	_updating_device_selector = true;
 
 	_device_selector.clear();
 	_device_selector_map.clear();
 
-	BOOST_FOREACH (shared_ptr<pv::DevInst> dev_inst, devices) {
+	BOOST_FOREACH (shared_ptr<pv::device::DevInst> dev_inst, devices) {
 		assert(dev_inst);
 		const string title = dev_inst->format_device_title();
 		const sr_dev_inst *sdi = dev_inst->dev_inst();
@@ -115,36 +115,36 @@ void SamplingBar::set_device_list(
 	}
 
 	_updating_device_selector = false;
-
-	on_device_selected();
 }
 
-shared_ptr<pv::DevInst> SamplingBar::get_selected_device() const
+shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
 {
 	const int index = _device_selector.currentIndex();
 	if (index < 0)
-		return shared_ptr<pv::DevInst>();
+		return shared_ptr<pv::device::DevInst>();
 
 	const sr_dev_inst *const sdi =
 		(const sr_dev_inst*)_device_selector.itemData(
 			index).value<void*>();
 	assert(sdi);
 
-	map<const sr_dev_inst*, boost::weak_ptr<DevInst> >::
+	map<const sr_dev_inst*, boost::weak_ptr<device::DevInst> >::
 		const_iterator iter = _device_selector_map.find(sdi);
 	if (iter == _device_selector_map.end())
-		return shared_ptr<pv::DevInst>();
+		return shared_ptr<pv::device::DevInst>();
 
-	return shared_ptr<pv::DevInst>((*iter).second);
+	return shared_ptr<pv::device::DevInst>((*iter).second);
 }
 
-void SamplingBar::set_selected_device(boost::shared_ptr<pv::DevInst> dev_inst)
+void SamplingBar::set_selected_device(shared_ptr<pv::device::DevInst> dev_inst)
 {
 	assert(dev_inst);
 
 	for (int i = 0; i < _device_selector.count(); i++)
 		if (dev_inst->dev_inst() ==
 			_device_selector.itemData(i).value<void*>()) {
+			// Calling this leads to on_device_selected being
+			// invoked, which updates the sampling bar widgets.
 			_device_selector.setCurrentIndex(i);
 			return;
 		}
@@ -164,10 +164,14 @@ void SamplingBar::update_sample_rate_selector()
 	const uint64_t *elements = NULL;
 	gsize num_elements;
 
-	const shared_ptr<DevInst> dev_inst = get_selected_device();
+	if (_updating_sample_rate)
+		return;
+
+	const shared_ptr<device::DevInst> dev_inst = get_selected_device();
 	if (!dev_inst)
 		return;
 
+	assert(!_updating_sample_rate);
 	_updating_sample_rate = true;
 
 	if (!(gvar_dict = dev_inst->list_config(NULL, SR_CONF_SAMPLERATE)))
@@ -224,7 +228,10 @@ void SamplingBar::update_sample_rate_selector_value()
 	GVariant *gvar;
 	uint64_t samplerate;
 
-	const shared_ptr<DevInst> dev_inst = get_selected_device();
+	if (_updating_sample_rate)
+		return;
+
+	const shared_ptr<device::DevInst> dev_inst = get_selected_device();
 	if (!dev_inst)
 		return;
 
@@ -235,6 +242,7 @@ void SamplingBar::update_sample_rate_selector_value()
 	samplerate = g_variant_get_uint64(gvar);
 	g_variant_unref(gvar);
 
+	assert(!_updating_sample_rate);
 	_updating_sample_rate = true;
 	_sample_rate.set_value(samplerate);
 	_updating_sample_rate = false;
@@ -244,18 +252,25 @@ void SamplingBar::update_sample_count_selector()
 {
 	GVariant *gvar;
 
-	const shared_ptr<DevInst> dev_inst = get_selected_device();
+	if (_updating_sample_count)
+		return;
+
+	const shared_ptr<device::DevInst> dev_inst = get_selected_device();
 	if (!dev_inst)
 		return;
 
+	assert(!_updating_sample_count);
 	_updating_sample_count = true;
 
 	if (_sample_count_supported)
 	{
-		uint64_t sample_count = DefaultSampleCount;
+		uint64_t sample_count = _sample_count.value();
 		uint64_t min_sample_count = 0;
 		uint64_t max_sample_count = MaxSampleCount;
 
+		if (sample_count == 0)
+			sample_count = DefaultSampleCount;
+
 		if ((gvar = dev_inst->list_config(NULL, SR_CONF_LIMIT_SAMPLES)))
 		{
 			g_variant_get(gvar, "(tt)",
@@ -292,25 +307,35 @@ void SamplingBar::commit_sample_count()
 {
 	uint64_t sample_count = 0;
 
-	const shared_ptr<DevInst> dev_inst = get_selected_device();
+	if (_updating_sample_count)
+		return;
+
+	const shared_ptr<device::DevInst> dev_inst = get_selected_device();
 	if (!dev_inst)
 		return;
 
 	sample_count = _sample_count.value();
 
 	// Set the sample count
-	if (!dev_inst->set_config(NULL, SR_CONF_LIMIT_SAMPLES,
+	assert(!_updating_sample_count);
+	_updating_sample_count = true;
+	if (_sample_count_supported &&
+		!dev_inst->set_config(NULL, SR_CONF_LIMIT_SAMPLES,
 		g_variant_new_uint64(sample_count))) {
 		qDebug() << "Failed to configure sample count.";
 		return;
 	}
+	_updating_sample_count = false;
 }
 
 void SamplingBar::commit_sample_rate()
 {
 	uint64_t sample_rate = 0;
 
-	const shared_ptr<DevInst> dev_inst = get_selected_device();
+	if (_updating_sample_rate)
+		return;
+
+	const shared_ptr<device::DevInst> dev_inst = get_selected_device();
 	if (!dev_inst)
 		return;
 
@@ -319,11 +344,14 @@ void SamplingBar::commit_sample_rate()
 		return;
 
 	// Set the samplerate
+	assert(!_updating_sample_rate);
+	_updating_sample_rate = true;
 	if (!dev_inst->set_config(NULL, SR_CONF_SAMPLERATE,
 		g_variant_new_uint64(sample_rate))) {
 		qDebug() << "Failed to configure samplerate.";
 		return;
 	}
+	_updating_sample_rate = false;
 }
 
 void SamplingBar::on_device_selected()
@@ -335,7 +363,7 @@ void SamplingBar::on_device_selected()
 	if (_updating_device_selector)
 		return;
 
-	const shared_ptr<DevInst> dev_inst = get_selected_device();
+	const shared_ptr<device::DevInst> dev_inst = get_selected_device();
 	if (!dev_inst)
 		return;
 
@@ -374,6 +402,11 @@ void SamplingBar::on_device_selected()
 		}
 	}
 
+	// Add notification of reconfigure events
+	disconnect(this, SLOT(on_config_changed()));
+	connect(dev_inst.get(), SIGNAL(config_changed()),
+		this, SLOT(on_config_changed()));
+
 	// Update sweep timing widgets.
 	update_sample_count_selector();
 	update_sample_rate_selector();
@@ -381,14 +414,12 @@ void SamplingBar::on_device_selected()
 
 void SamplingBar::on_sample_count_changed()
 {
-	if(!_updating_sample_count)
-		commit_sample_count();
+	commit_sample_count();
 }
 
 void SamplingBar::on_sample_rate_changed()
 {
-	if (!_updating_sample_rate)
-		commit_sample_rate();
+	commit_sample_rate();
 }
 
 void SamplingBar::on_run_stop()
@@ -398,5 +429,13 @@ void SamplingBar::on_run_stop()
 	run_stop();
 }
 
+void SamplingBar::on_config_changed()
+{
+	commit_sample_count();
+	update_sample_count_selector();	
+	commit_sample_rate();	
+	update_sample_rate_selector();
+}
+
 } // namespace toolbars
 } // namespace pv