X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=0b4426475d6e52a36e7f87f96a58933e144a903c;hb=ea86bc4d01851dab34b6ec0e1015a224cecc0fd5;hp=81ddd6e92ea4a925b0eb9d06e22b417d4f8f83cc;hpb=8d3e0764def48fdf19dc9100c87bbb42da5a9d6d;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 81ddd6e9..0b442647 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -29,7 +29,7 @@
 #include "view.h"
 
 #include <pv/sigsession.h>
-#include <pv/devinst.h>
+#include <pv/device/devinst.h>
 #include <pv/data/logic.h>
 #include <pv/data/logicsnapshot.h>
 #include <pv/view/view.h>
@@ -63,10 +63,9 @@ const QColor LogicSignal::SignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(pv::SigSession &session,
-	shared_ptr<pv::DevInst> dev_inst, sr_probe *const probe,
-	shared_ptr<data::Logic> data) :
-	Signal(session, dev_inst, probe),
+LogicSignal::LogicSignal(shared_ptr<pv::device::DevInst> dev_inst,
+	const sr_channel *const probe, shared_ptr<data::Logic> data) :
+	Signal(dev_inst, probe),
 	_data(data),
 	_trigger_none(NULL),
 	_trigger_rising(NULL),
@@ -248,10 +247,8 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	Signal::populate_popup_form(parent, form);
 
 	// Add the trigger actions
-	boost::shared_ptr<DevInst> dev_inst = _session.get_device();
-	assert(dev_inst);
-
-	if (!(gvar = dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
+	assert(_dev_inst);
+	if ((gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
 	{
 		const char *const trig_types =
 			g_variant_get_string(gvar, NULL);
@@ -305,13 +302,11 @@ void LogicSignal::set_trigger(char type)
 	const char *const trigger_string =
 		(type != 0) ? trigger_type_string : NULL;
 
-	boost::shared_ptr<DevInst> dev_inst = _session.get_device();
-	assert(dev_inst);
-
-	const sr_dev_inst *const sdi = dev_inst->dev_inst();
+	assert(_dev_inst);
+	const sr_dev_inst *const sdi = _dev_inst->dev_inst();
 	assert(sdi);
 
-	const int probe_count = g_slist_length(sdi->probes);
+	const int probe_count = g_slist_length(sdi->channels);
 	assert(probe_count > 0);
 
 	assert(_probe && _probe->index < probe_count);