X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsamplingbar.cpp;h=4ea2686b4d2b522c2203dab01a00cfee86e4951b;hb=18203d86e200131f50e9830c4f16a9edba96d669;hp=6eea6d78040af5b8be211e5037294a1e819139bc;hpb=488883133fefe0af41737cea9b2fc9eb114042b8;p=pulseview.git

diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp
index 6eea6d78..4ea2686b 100644
--- a/pv/samplingbar.cpp
+++ b/pv/samplingbar.cpp
@@ -22,6 +22,8 @@
 
 #include <assert.h>
 
+#include <boost/foreach.hpp>
+
 #include <libsigrok/libsigrok.h>
 
 #include <QAction>
@@ -104,15 +106,33 @@ SamplingBar::SamplingBar(QWidget *parent) :
 	_sample_rate_value_action = addWidget(&_sample_rate_value);
 	addWidget(&_run_stop_button);
 
-	update_device_selector();
-
-	update_sample_rate_selector();
 	connect(&_sample_rate_list, SIGNAL(currentIndexChanged(int)),
 		this, SLOT(on_sample_rate_changed()));
-	connect(&_sample_rate_value, SIGNAL(valueChanged(double)),
+	connect(&_sample_rate_value, SIGNAL(editingFinished()),
 		this, SLOT(on_sample_rate_changed()));
 }
 
+void SamplingBar::set_device_list(
+	const std::list<struct sr_dev_inst*> &devices)
+{
+	_device_selector.clear();
+
+	BOOST_FOREACH (sr_dev_inst *sdi, devices) {
+		QString title;
+		if (sdi->vendor && sdi->vendor[0])
+			title += sdi->vendor + QString(" ");
+		if (sdi->model && sdi->model[0])
+			title += sdi->model + QString(" ");
+		if (sdi->version && sdi->version[0])
+			title += sdi->version + QString(" ");
+
+		_device_selector.addItem(title, qVariantFromValue(
+			(void*)sdi));
+	}
+
+	update_sample_rate_selector();
+}
+
 struct sr_dev_inst* SamplingBar::get_selected_device() const
 {
 	const int index = _device_selector.currentIndex();
@@ -138,37 +158,6 @@ void SamplingBar::set_sampling(bool sampling)
 	_run_stop_button.setText(sampling ? "Stop" : "Run");
 }
 
-void SamplingBar::update_device_selector()
-{
-	GSList *devices = NULL;
-
-	/* Scan all drivers for all devices. */
-	struct sr_dev_driver **const drivers = sr_driver_list();
-	for (struct sr_dev_driver **driver = drivers; *driver; driver++) {
-		GSList *tmpdevs = sr_driver_scan(*driver, NULL);
-		for (GSList *l = tmpdevs; l; l = l->next)
-			devices = g_slist_append(devices, l->data);
-		g_slist_free(tmpdevs);
-	}
-
-	for (GSList *l = devices; l; l = l->next) {
-		sr_dev_inst *const sdi = (sr_dev_inst*)l->data;
-
-		QString title;
-		if (sdi->vendor && sdi->vendor[0])
-			title += sdi->vendor + QString(" ");
-		if (sdi->model && sdi->model[0])
-			title += sdi->model + QString(" ");
-		if (sdi->version && sdi->version[0])
-			title += sdi->version + QString(" ");
-
-		_device_selector.addItem(title, qVariantFromValue(
-			(void*)sdi));
-	}
-
-	g_slist_free(devices);
-}
-
 void SamplingBar::update_sample_rate_selector()
 {
 	const sr_dev_inst *const sdi = get_selected_device();
@@ -177,6 +166,9 @@ void SamplingBar::update_sample_rate_selector()
 	assert(_sample_rate_value_action);
 	assert(_sample_rate_list_action);
 
+	if (!sdi)
+		return;
+
 	if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
 		(const void **)&samplerates, sdi) != SR_OK)
 		return;
@@ -211,13 +203,13 @@ void SamplingBar::update_sample_rate_selector_value()
 	sr_dev_inst *const sdi = get_selected_device();
 	assert(sdi);
 
-        uint64_t *samplerate = NULL;
-        if(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-                (const void**)&samplerate, sdi) != SR_OK) {
-                qDebug() <<
-                        "WARNING: Failed to get value of sample rate";
-                return;
-        }
+	uint64_t *samplerate = NULL;
+	if(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
+		(const void**)&samplerate, sdi) != SR_OK) {
+		qDebug() <<
+				"WARNING: Failed to get value of sample rate";
+		return;
+	}
 
 	assert(_sample_rate_value_action);
 	assert(_sample_rate_list_action);