X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fconnect.cpp;h=e205c45047c8c07b97bdaa944577b8add97bdf10;hb=2b82262fa05427247b583bc1a7fd802e6dfef387;hp=f7a75da0c6e081840ee9cd597c90a31d1605d4ac;hpb=c9de8b3297469aad87554ad6fcc6909223424f54;p=pulseview.git

diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index f7a75da..e205c45 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -70,10 +70,22 @@ Connect::Connect(QWidget *parent) :
 	_layout.addWidget(&_button_box);
 }
 
+struct sr_dev_inst* Connect::get_selected_device() const
+{
+	const QListWidgetItem *const item = _device_list.currentItem();
+	if (!item)
+		return NULL;
+
+	return (sr_dev_inst*)item->data(Qt::UserRole).value<void*>();
+}
+
 void Connect::populate_drivers()
 {
-	const int *hwopts;
+	gsize num_opts = 0;
+	const int32_t *hwopts;
 	struct sr_dev_driver **drivers = sr_driver_list();
+	GVariant *gvar_opts;
+
 	for (int i = 0; drivers[i]; ++i) {
 		/**
 		 * We currently only support devices that can deliver
@@ -84,14 +96,16 @@ void Connect::populate_drivers()
 		 */
 		bool supported_device = false;
 		if ((sr_config_list(drivers[i], SR_CONF_DEVICE_OPTIONS,
-			(const void **)&hwopts, NULL) == SR_OK) && hwopts)
-			for (int j = 0; hwopts[j]; j++)
-				if(hwopts[j] == SR_CONF_SAMPLERATE) {
+				&gvar_opts, NULL) == SR_OK))
+			hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_opts,
+					&num_opts, sizeof(int32_t));
+			for (unsigned int j = 0; j < num_opts; j++)
+				if (hwopts[j] == SR_CONF_SAMPLERATE) {
 					supported_device = true;
 					break;
 				}
 
-		if(supported_device)
+		if (supported_device)
 			_drivers.addItem(QString("%1 (%2)").arg(
 				drivers[i]->longname).arg(drivers[i]->name),
 				qVariantFromValue((void*)drivers[i]));
@@ -103,6 +117,7 @@ void Connect::unset_connection()
 	_device_list.clear();
 	_serial_device.hide();
 	_form_layout.labelForField(&_serial_device)->hide();
+	_button_box.button(QDialogButtonBox::Ok)->setDisabled(true);
 }
 
 void Connect::set_serial_connection()
@@ -116,7 +131,7 @@ void Connect::scan_pressed()
 	_device_list.clear();
 
 	const int index = _drivers.currentIndex();
-	if(index == -1)
+	if (index == -1)
 		return;
 
 	sr_dev_driver *const driver = (sr_dev_driver*)_drivers.itemData(
@@ -128,7 +143,7 @@ void Connect::scan_pressed()
 		sr_config *const src = (sr_config*)g_try_malloc(sizeof(sr_config));
 		src->key = SR_CONF_CONN;
 		const QByteArray byteArray = _serial_device.text().toUtf8();
-		src->value = g_strdup((const gchar*)byteArray.constData());
+		src->data = g_variant_new_string((const gchar*)byteArray.constData());
 		drvopts = g_slist_append(drvopts, src);
 	}
 
@@ -150,25 +165,35 @@ void Connect::scan_pressed()
 				g_slist_length(sdi->probes));
 		}
 
-		_device_list.addItem(text);
+		QListWidgetItem *const item = new QListWidgetItem(text,
+			&_device_list);
+		item->setData(Qt::UserRole, qVariantFromValue((void*)sdi));
+		_device_list.addItem(item);
 	}
 
 	g_slist_free(devices);
 	g_slist_free_full(drvopts, (GDestroyNotify)free_drvopts);
+
+	_device_list.setCurrentRow(0);
+	_button_box.button(QDialogButtonBox::Ok)->setDisabled(false);
 }
 
 void Connect::device_selected(int index)
 {
-	const int *hwopts;
+	gsize num_opts = 0;
+	const int32_t *hwopts;
+	GVariant *gvar_list;
 	sr_dev_driver *const driver = (sr_dev_driver*)_drivers.itemData(
 		index).value<void*>();
 
 	unset_connection();
 
 	if ((sr_config_list(driver, SR_CONF_SCAN_OPTIONS,
-		(const void **)&hwopts, NULL) == SR_OK) && hwopts) {
+				&gvar_list, NULL) == SR_OK)) {
+		hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_list,
+				&num_opts, sizeof(int32_t));
 
-		for (int i = 0; hwopts[i]; i++) {
+		for (unsigned int i = 0; i < num_opts; i++) {
 			switch(hwopts[i]) {
 			case SR_CONF_SERIALCOMM:
 				set_serial_connection();
@@ -180,12 +205,13 @@ void Connect::device_selected(int index)
 
 			break;
 		}
+		g_variant_unref(gvar_list);
 	}
 }
 
 void Connect::free_drvopts(struct sr_config *src)
 {
-	g_free((void *)src->value);
+	g_variant_unref(src->data);
 	g_free(src);
 }