X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=0b4426475d6e52a36e7f87f96a58933e144a903c;hp=89c375cc0551cb7689e7b63a4693b70c8d962f3b;hb=4871ed92f2d9e6e514223383ba16e6ad78c81161;hpb=e183f4e328db8bb134652254ba9bf0707dc16c66

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 89c375cc..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,8 +63,8 @@ const QColor LogicSignal::SignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(shared_ptr<pv::DevInst> dev_inst,
-	const sr_probe *const probe, shared_ptr<data::Logic> data) :
+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),
@@ -248,7 +248,7 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 	// Add the trigger actions
 	assert(_dev_inst);
-	if (!(gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
+	if ((gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
 	{
 		const char *const trig_types =
 			g_variant_get_string(gvar, NULL);
@@ -306,7 +306,7 @@ void LogicSignal::set_trigger(char type)
 	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);