LogicSignal: Un-break trigger configuration. (bug #318)

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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 81ddd6e92ea4a925b0eb9d06e22b417d4f8f83cc..cc974f5210050729493a368b6e726d06ba86923f 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -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::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),
@@ -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,10 +302,8 @@ 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);