X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=57a988c38e736fc908c99cbd0b64d337a871c910;hb=e80da8d9b7d81cc91ef0a4cc23533f26cc47d238;hp=bc6e09fa2aaf9e63adad840686ec7d3cdd634e98;hpb=19adbc2c342b190161ec1223377a3619974b91f7;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index bc6e09f..57a988c 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -63,9 +63,10 @@ const QColor LogicSignal::SignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(pv::SigSession &session, sr_probe *const probe,
+LogicSignal::LogicSignal(pv::SigSession &session,
+	shared_ptr<pv::DevInst> dev_inst, sr_probe *const probe,
 	shared_ptr<data::Logic> data) :
-	Signal(session, probe),
+	Signal(session, dev_inst, probe),
 	_data(data),
 	_trigger_none(NULL),
 	_trigger_rising(NULL),
@@ -247,14 +248,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);
-
-	const sr_dev_inst *const sdi = dev_inst->dev_inst();
-	assert(sdi);
-
-	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);
@@ -308,10 +303,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);