X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=81ccca720a0b38ca7d5d0a2b58b926f8e91c51ed;hp=40c46f04e57278993cba2ec01cfa486a5feb398f;hb=8d634081d8b0cc741dd34d8c646474ff6754aea8;hpb=51e77110d4316fd0106f8306f5e1f0523c5bf7d7 diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 40c46f04..81ccca72 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -22,7 +22,7 @@ #include "logicdata.h" #include "logicdatasnapshot.h" -#include "logicsignal.h" +#include "view/logicsignal.h" #include @@ -94,7 +94,7 @@ void SigSession::start_capture(struct sr_dev_inst *sdi, sr_session_destroy(); } -vector< shared_ptr >& SigSession::get_signals() +vector< shared_ptr >& SigSession::get_signals() { return _signals; } @@ -107,6 +107,8 @@ boost::shared_ptr SigSession::get_data() void SigSession::data_feed_in(const struct sr_dev_inst *sdi, struct sr_datafeed_packet *packet) { + using view::LogicSignal; + assert(sdi); assert(packet); @@ -136,7 +138,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi, sdi->probes, i); if(probe->enabled) { - boost::shared_ptr signal( + shared_ptr signal( new LogicSignal(probe->name, _logic_data, probe->index));