Update for 'probe' -> 'channel' rename in libsigrok.

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 8e0ea27d43f775c687cab6a2b09ad7ee0e1b0b80..0b4426475d6e52a36e7f87f96a58933e144a903c 100644 (file)
--- 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,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_channel *const probe, shared_ptr<data::Logic> data) :
+       Signal(dev_inst, probe),
        _data(data),
        _trigger_none(NULL),
        _trigger_rising(NULL),
@@ -247,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);
@@ -304,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);