X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=52cf4ac1ab24af7ae09051d4c30ec93e36b3c819;hb=32d83ce1a26322a433785746ea7465f9bdf830b6;hp=65ecae53724be4394418472ac84dd9c0f7fe567f;hpb=175d6573de78a10cc4ff461147d26c99ab3847b4;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 65ecae53..52cf4ac1 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -28,10 +28,11 @@
 #include "logicsignal.h"
 #include "view.h"
 
-#include "pv/sigsession.h"
-#include "pv/data/logic.h"
-#include "pv/data/logicsnapshot.h"
-#include "pv/view/view.h"
+#include <pv/sigsession.h>
+#include <pv/device/devinst.h>
+#include <pv/data/logic.h>
+#include <pv/data/logicsnapshot.h>
+#include <pv/view/view.h>
 
 using boost::shared_ptr;
 using std::deque;
@@ -62,9 +63,9 @@ const QColor LogicSignal::SignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(pv::SigSession &session, sr_probe *const probe,
-	shared_ptr<data::Logic> data) :
-	Signal(session, probe),
+LogicSignal::LogicSignal(shared_ptr<pv::device::DevInst> dev_inst,
+	const sr_probe *const probe, shared_ptr<data::Logic> data) :
+	Signal(dev_inst, probe),
 	_data(data),
 	_trigger_none(NULL),
 	_trigger_rising(NULL),
@@ -246,9 +247,8 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	Signal::populate_popup_form(parent, form);
 
 	// Add the trigger actions
-	const sr_dev_inst *const sdi = _session.get_device();
-	if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_TYPE,
-		&gvar) == SR_OK)
+	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);
@@ -302,7 +302,10 @@ void LogicSignal::set_trigger(char type)
 	const char *const trigger_string =
 		(type != 0) ? trigger_type_string : NULL;
 
-	const sr_dev_inst *const sdi = _session.get_device();
+	assert(_dev_inst);
+	const sr_dev_inst *const sdi = _dev_inst->dev_inst();
+	assert(sdi);
+
 	const int probe_count = g_slist_length(sdi->probes);
 	assert(probe_count > 0);