X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=49d1263642b9b97ee3bac15c95fbe8a897e2f724;hb=4c60462b00cc329e61daedd1c2e66724077bd412;hp=0d31696100545ae99e80c4fd0f64bc749bc67b48;hpb=8e097c274b5258b7f46d2dc534cadcb3bb1f059b;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 0d31696..49d1263 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -33,6 +33,7 @@
 
 #include <pv/session.hpp>
 #include <pv/devicemanager.hpp>
+#include <pv/devices/device.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/view/view.hpp>
@@ -49,7 +50,6 @@ using std::vector;
 
 using sigrok::Channel;
 using sigrok::ConfigKey;
-using sigrok::Device;
 using sigrok::Error;
 using sigrok::Trigger;
 using sigrok::TriggerStage;
@@ -99,18 +99,18 @@ QCache<QString, const QPixmap> LogicSignal::pixmap_cache_;
 
 LogicSignal::LogicSignal(
 	pv::Session &session,
-	shared_ptr<Device> device,
+	shared_ptr<devices::Device> device,
 	shared_ptr<Channel> channel,
 	shared_ptr<data::Logic> data) :
 	Signal(session, channel),
 	device_(device),
 	data_(data),
-	trigger_none_(NULL),
-	trigger_rising_(NULL),
-	trigger_high_(NULL),
-	trigger_falling_(NULL),
-	trigger_low_(NULL),
-	trigger_change_(NULL)
+	trigger_none_(nullptr),
+	trigger_rising_(nullptr),
+	trigger_high_(nullptr),
+	trigger_falling_(nullptr),
+	trigger_low_(nullptr),
+	trigger_change_(nullptr)
 {
 	shared_ptr<Trigger> trigger;
 
@@ -321,13 +321,14 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 
 const vector<int32_t> LogicSignal::get_trigger_types() const
 {
-	const auto keys = device_->config_keys(ConfigKey::DEVICE_OPTIONS);
+	const auto sr_dev = device_->device();
+	const auto keys = sr_dev->config_keys(ConfigKey::DEVICE_OPTIONS);
 	const auto iter = keys.find(ConfigKey::TRIGGER_MATCH);
 	if (iter != keys.end() &&
 		(*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
 		try {
 			const Glib::VariantContainerBase gvar =
-				device_->config_list(ConfigKey::TRIGGER_MATCH);
+				sr_dev->config_list(ConfigKey::TRIGGER_MATCH);
 			return Glib::VariantBase::cast_dynamic<
 				Glib::Variant<vector<int32_t>>>(gvar).get();
 		} catch (Error e) {