X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=e240ebad751307e15cfcc926e9f2481f2a092f22;hb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;hp=31b8f0a2f03a5907656c910cbcd70cbc2be4a427;hpb=b213ef0991a13af0c74ffe5c54382c5c455c5496;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 31b8f0a..e240eba 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -33,8 +33,12 @@
 #include "pv/data/logicsnapshot.h"
 #include "pv/view/view.h"
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::deque;
+using std::max;
+using std::min;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -76,7 +80,12 @@ LogicSignal::~LogicSignal()
 {
 }
 
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+boost::shared_ptr<pv::data::SignalData> LogicSignal::data() const
+{
+	return _data;
+}
+
+boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
 	return _data;
 }
@@ -121,7 +130,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
 	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
 		snapshots.front();
 
-	double samplerate = _data->get_samplerate();
+	double samplerate = _data->samplerate();
 
 	// Show sample rate as 1Hz when it is unknown
 	if (samplerate == 0.0)
@@ -238,8 +247,8 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 	// Add the trigger actions
 	const sr_dev_inst *const sdi = _session.get_device();
-	if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE,
-		&gvar, sdi) == SR_OK)
+	if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_TYPE,
+		&gvar) == SR_OK)
 	{
 		const char *const trig_types =
 			g_variant_get_string(gvar, NULL);