X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=2fa2d3919af81048b6783ff91eb08bef9179007e;hb=68162c2925e3c5a3c7d0b4d3d100184e5c649eba;hp=ae4f298b6f2eae30f744ce4636e344459b87b5c6;hpb=51d4a9ab96a6bf64a1fcd1700e7e174498d4c118;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index ae4f298..2fa2d39 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -64,11 +64,14 @@ const uint64_t SamplingBar::RecordLengths[20] = {
 
 const uint64_t SamplingBar::DefaultRecordLength = 1000000;
 
-SamplingBar::SamplingBar(QWidget *parent) :
+SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
 	QToolBar("Sampling Bar", parent),
+	_session(session),
 	_device_selector(this),
+	_updating_device_selector(false),
 	_configure_button(this),
 	_probes_button(this),
+	_probes_popup(_session, this),
 	_record_length_selector(this),
 	_sample_rate_list(this),
 	_icon_red(":/icons/status-red.svg"),
@@ -100,8 +103,10 @@ SamplingBar::SamplingBar(QWidget *parent) :
 
 	_configure_button.setIcon(QIcon::fromTheme("configure",
 		QIcon(":/icons/configure.png")));
+
 	_probes_button.setIcon(QIcon::fromTheme("probes",
 		QIcon(":/icons/probes.svg")));
+	_probes_button.set_popup(&_probes_popup);
 
 	_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
@@ -122,6 +127,8 @@ SamplingBar::SamplingBar(QWidget *parent) :
 void SamplingBar::set_device_list(
 	const std::list<struct sr_dev_inst*> &devices)
 {
+	_updating_device_selector = true;
+
 	_device_selector.clear();
 
 	BOOST_FOREACH (sr_dev_inst *sdi, devices) {
@@ -130,7 +137,9 @@ void SamplingBar::set_device_list(
 			qVariantFromValue((void*)sdi));
 	}
 
-	update_sample_rate_selector();
+	_updating_device_selector = false;
+
+	on_device_selected();
 }
 
 struct sr_dev_inst* SamplingBar::get_selected_device() const
@@ -183,8 +192,8 @@ void SamplingBar::update_sample_rate_selector()
 	if (!sdi)
 		return;
 
-	if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
-			&gvar_dict, sdi) != SR_OK)
+	if (sr_config_list(sdi->driver, sdi, NULL,
+			SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK)
 		return;
 
 	_sample_rate_list_action->setVisible(false);
@@ -238,8 +247,8 @@ void SamplingBar::update_sample_rate_selector_value()
 
 	assert(sdi);
 
-	if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-		&gvar, sdi) != SR_OK) {
+	if (sr_config_get(sdi->driver, sdi, NULL,
+		SR_CONF_SAMPLERATE, &gvar) != SR_OK) {
 		qDebug() <<
 				"WARNING: Failed to get value of sample rate";
 		return;
@@ -285,7 +294,7 @@ void SamplingBar::commit_sample_rate()
 		return;
 
 	// Set the samplerate
-	if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
+	if (sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE,
 		g_variant_new_uint64(sample_rate)) != SR_OK) {
 		qDebug() << "Failed to configure samplerate.";
 		return;
@@ -296,14 +305,15 @@ void SamplingBar::on_device_selected()
 {
 	using namespace pv::popups;
 
+	if (_updating_device_selector)
+		return;
+
 	update_sample_rate_selector();
 
 	sr_dev_inst *const sdi = get_selected_device();
+	_session.set_device(sdi);
 
 	_configure_button.set_popup(new DeviceOptions(sdi, this));
-	_probes_button.set_popup(new Probes(sdi, this));
-
-	device_selected();
 }
 
 void SamplingBar::on_sample_rate_changed()