X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fpopups%2Fchannels.cpp;h=3ad494d31660fb17953ad8e7b110f4221868d79b;hb=da30ecb7e72bd2547e524258efa5ec642988b70b;hp=61a8aee071b382e9fc626a89ec08e2cda7975213;hpb=3cc9ad7b867853315473df611612c562d562ed8a;p=pulseview.git diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp index 61a8aee..3ad494d 100644 --- a/pv/popups/channels.cpp +++ b/pv/popups/channels.cpp @@ -28,6 +28,7 @@ #include "channels.hpp" #include +#include #include #include @@ -42,6 +43,7 @@ using std::map; using std::mutex; using std::set; using std::shared_ptr; +using std::unordered_set; using std::vector; using sigrok::Channel; @@ -64,14 +66,14 @@ Channels::Channels(Session &session, QWidget *parent) : // Create the layout setLayout(&layout_); - shared_ptr device = session_.device(); + const shared_ptr device = session_.device()->device(); assert(device); // Collect a set of signals map, shared_ptr > signal_map; shared_lock lock(session_.signals_mutex()); - const vector< shared_ptr > &sigs(session_.signals()); + const unordered_set< shared_ptr > &sigs(session_.signals()); for (const shared_ptr &sig : sigs) signal_map[sig->channel()] = sig;