X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=ce74829401486f0c6597486398f1cf68e9c78dd3;hp=1d424c000bf3972a8c697534af02522a05d99591;hb=d260d425863efa6d80a5a5f3d920373a6d159aef;hpb=a4cf020a253c8c874ed8652f38a1c61c9a4754a4

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 1d424c00..ce748294 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -98,7 +98,7 @@ SigSession::~SigSession()
 	stop_capture();
 }
 
-shared_ptr<Device> SigSession::get_device() const
+shared_ptr<Device> SigSession::device() const
 {
 	return _device;
 }
@@ -348,7 +348,7 @@ void SigSession::update_signals(shared_ptr<Device> device)
 	}
 
 	// Make the Signals list
-	do {
+	{
 		lock_guard<mutex> lock(_signals_mutex);
 
 		_signals.clear();
@@ -359,7 +359,8 @@ void SigSession::update_signals(shared_ptr<Device> device)
 			switch(channel->type()->id()) {
 			case SR_CHANNEL_LOGIC:
 				signal = shared_ptr<view::Signal>(
-					new view::LogicSignal(device, channel, _logic_data));
+					new view::LogicSignal(*this, device,
+						channel, _logic_data));
 				break;
 
 			case SR_CHANNEL_ANALOG:
@@ -367,7 +368,8 @@ void SigSession::update_signals(shared_ptr<Device> device)
 				shared_ptr<data::Analog> data(
 					new data::Analog());
 				signal = shared_ptr<view::Signal>(
-					new view::AnalogSignal(channel, data));
+					new view::AnalogSignal(
+						*this, channel, data));
 				break;
 			}
 
@@ -380,7 +382,7 @@ void SigSession::update_signals(shared_ptr<Device> device)
 			_signals.push_back(signal);
 		}
 
-	} while(0);
+	}
 
 	signals_changed();
 }