#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>
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),
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);
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);