X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=710f3128af727cf4ef51ce90178d6efaa94f3ab6;hp=cddfa5f5d39f8d9a8b327038757e690d598d877e;hb=50288bdb7bf361e34474a8b53efc49d133de1508;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index cddfa5f5..710f3128 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -111,7 +111,7 @@ SamplingBar::SamplingBar(Session &session, MainWindow &main_window) :
 }
 
 void SamplingBar::set_device_list(
-	const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
+	const std::list< std::shared_ptr<sigrok::Device> > &devices,
 	shared_ptr<Device> selected)
 {
 	int selected_index = -1;
@@ -122,12 +122,12 @@ void SamplingBar::set_device_list(
 
 	device_selector_.clear();
 
-	for (auto entry : devices) {
-		auto device = entry.first;
-		auto display_name = entry.second;
-
+	for (auto device : devices) {
 		assert(device);
 
+		string display_name =
+			session_.device_manager().get_display_name(device);
+
 		if (selected == device)
 			selected_index = device_selector_.count();
 
@@ -183,8 +183,17 @@ void SamplingBar::update_sample_rate_selector()
 	const auto iter = keys.find(ConfigKey::SAMPLERATE);
 	if (iter != keys.end() &&
 		(*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
-		gvar_dict = device->config_list(ConfigKey::SAMPLERATE);
-	} else {
+		const auto keys = device->config_keys(
+			ConfigKey::DEVICE_OPTIONS);
+		try {
+			gvar_dict = device->config_list(ConfigKey::SAMPLERATE);
+		} catch(const sigrok::Error &e) {
+			// Failed to enunmerate samplerate
+			(void)e;
+		}
+	}
+
+	if (!gvar_dict) {
 		sample_rate_.show_none();
 		updating_sample_rate_ = false;
 		return;
@@ -284,9 +293,16 @@ void SamplingBar::update_sample_count_selector()
 	const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES);
 	if (iter != keys.end() &&
 		(*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
-		auto gvar = device->config_list(ConfigKey::LIMIT_SAMPLES);
-		g_variant_get(gvar.gobj(), "(tt)",
-			&min_sample_count, &max_sample_count);
+		try {
+			auto gvar =
+				device->config_list(ConfigKey::LIMIT_SAMPLES);
+			if (gvar)
+				g_variant_get(gvar.gobj(), "(tt)",
+					&min_sample_count, &max_sample_count);
+		} catch(const sigrok::Error &e) {
+			// Failed to query sample limit
+			(void)e;
+		}
 	}
 
 	min_sample_count = min(max(min_sample_count, MinSampleCount),
@@ -432,7 +448,7 @@ void SamplingBar::on_device_selected()
 	if (!device)
 		return;
 
-	session_.set_device(device);
+	main_window_.select_device(device);
 
 	update_device_config_widgets();
 }