X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=ce74829401486f0c6597486398f1cf68e9c78dd3;hb=d260d425863efa6d80a5a5f3d920373a6d159aef;hp=2e49422fb9a60746246c1d858e66234940674426;hpb=e8d009288de28cb194bc7964f96677c2baf900c9;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 2e49422..ce74829 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;
 }
@@ -151,6 +151,7 @@ void SigSession::set_file(const string &name)
 		(shared_ptr<Device> device, shared_ptr<Packet> packet) {
 			data_feed_in(device, packet);
 		});
+	_device_manager.update_display_name(_device);
 	update_signals(_device);
 }
 
@@ -347,7 +348,7 @@ void SigSession::update_signals(shared_ptr<Device> device)
 	}
 
 	// Make the Signals list
-	do {
+	{
 		lock_guard<mutex> lock(_signals_mutex);
 
 		_signals.clear();
@@ -358,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:
@@ -366,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;
 			}
 
@@ -379,7 +382,7 @@ void SigSession::update_signals(shared_ptr<Device> device)
 			_signals.push_back(signal);
 		}
 
-	} while(0);
+	}
 
 	signals_changed();
 }