X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=67d4f404d1162577f9afe524ea46f547d31b402c;hb=474e817a724fdad4db635ba59202283fbcc22ef9;hp=4d823a02b204c32daade5e96a586b44709b4d2eb;hpb=fe3a1c218407f6b8a0d7ac7c454593809212ea9e;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 4d823a02..67d4f404 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -48,6 +48,7 @@
 #include "viewport.hpp"
 
 #include "pv/session.hpp"
+#include "pv/devices/device.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
 #include "pv/util.hpp"
@@ -297,7 +298,7 @@ void View::set_scale_offset(double scale, double offset)
 set< shared_ptr<SignalData> > View::get_visible_data() const
 {
 	shared_lock<shared_mutex> lock(session().signals_mutex());
-	const vector< shared_ptr<Signal> > &sigs(session().signals());
+	const unordered_set< shared_ptr<Signal> > &sigs(session().signals());
 
 	// Make a set of all the visible data objects
 	set< shared_ptr<SignalData> > visible_data;
@@ -323,7 +324,7 @@ pair<double, double> View::get_time_extents() const
 			const double start_time = s->start_time();
 			left_time = min(left_time, start_time);
 			right_time = max(right_time, start_time +
-				d->get_max_sample_count() / samplerate);
+				d->max_sample_count() / samplerate);
 		}
 	}
 
@@ -675,7 +676,7 @@ void View::signals_changed()
 	// Populate the traces
 	clear_child_items();
 
-	shared_ptr<sigrok::Device> device = session_.device();
+	shared_ptr<sigrok::Device> device = session_.device()->device();
 	assert(device);
 
 	// Collect a set of signals
@@ -683,7 +684,7 @@ void View::signals_changed()
 		signal_map;
 
 	shared_lock<shared_mutex> lock(session_.signals_mutex());
-	const vector< shared_ptr<Signal> > &sigs(session_.signals());
+	const unordered_set< shared_ptr<Signal> > &sigs(session_.signals());
 
 	for (const shared_ptr<Signal> &sig : sigs)
 		signal_map[sig->channel()] = sig;