X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=d1f3a6062cde8b02f881bd9ffa33972edd39b5ef;hb=0a47889b01386b1e55c7df73ca301046a195ff97;hp=2e49422fb9a60746246c1d858e66234940674426;hpb=e8d009288de28cb194bc7964f96677c2baf900c9;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 2e49422f..d1f3a606 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -78,17 +78,11 @@ using Glib::VariantBase;
 using Glib::Variant;
 
 namespace pv {
-
-// TODO: This should not be necessary
-shared_ptr<Session> SigSession::_sr_session = nullptr;
-
 SigSession::SigSession(DeviceManager &device_manager) :
 	_device_manager(device_manager),
+	_session(device_manager.context()->create_session()),
 	_capture_state(Stopped)
 {
-	// TODO: This should not be necessary
-	_sr_session = device_manager.context()->create_session();
-
 	set_default_device();
 }
 
@@ -98,7 +92,22 @@ SigSession::~SigSession()
 	stop_capture();
 }
 
-shared_ptr<Device> SigSession::get_device() const
+DeviceManager& SigSession::device_manager()
+{
+	return _device_manager;
+}
+
+const DeviceManager& SigSession::device_manager() const
+{
+	return _device_manager;
+}
+
+const shared_ptr<sigrok::Session>& SigSession::session() const
+{
+	return _session;
+}
+
+shared_ptr<Device> SigSession::device() const
 {
 	return _device;
 }
@@ -114,15 +123,15 @@ void SigSession::set_device(shared_ptr<Device> device)
 	auto prev_session_device = dynamic_pointer_cast<SessionDevice>(_device);
 
 	if (_device) {
-		_sr_session->remove_datafeed_callbacks();
+		_session->remove_datafeed_callbacks();
 		if (!prev_session_device) {
 			_device->close();
-			_sr_session->remove_devices();
+			_session->remove_devices();
 		}
 	}
 
 	if (session_device)
-		_sr_session = session_device->parent();
+		_session = session_device->parent();
 
 	_device = device;
 	_decode_traces.clear();
@@ -130,11 +139,11 @@ void SigSession::set_device(shared_ptr<Device> device)
 	if (device) {
 		if (!session_device)
 		{
-			_sr_session = _device_manager.context()->create_session();
+			_session = _device_manager.context()->create_session();
 			device->open();
-			_sr_session->add_device(device);
+			_session->add_device(device);
 		}
-		_sr_session->add_datafeed_callback([=]
+		_session->add_datafeed_callback([=]
 			(shared_ptr<Device> device, shared_ptr<Packet> packet) {
 				data_feed_in(device, packet);
 			});
@@ -144,13 +153,14 @@ void SigSession::set_device(shared_ptr<Device> device)
 
 void SigSession::set_file(const string &name)
 {
-	_sr_session = _device_manager.context()->load_session(name);
-	_device = _sr_session->devices()[0];
+	_session = _device_manager.context()->load_session(name);
+	_device = _session->devices()[0];
 	_decode_traces.clear();
-	_sr_session->add_datafeed_callback([=]
+	_session->add_datafeed_callback([=]
 		(shared_ptr<Device> device, shared_ptr<Packet> packet) {
 			data_feed_in(device, packet);
 		});
+	_device_manager.update_display_name(_device);
 	update_signals(_device);
 }
 
@@ -210,7 +220,7 @@ void SigSession::start_capture(function<void (const QString)> error_handler)
 void SigSession::stop_capture()
 {
 	if (get_capture_state() != Stopped)
-		_sr_session->stop();
+		_session->stop();
 
 	// Check that sampling stopped
 	if (_sampling_thread.joinable())
@@ -264,7 +274,7 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 					dynamic_pointer_cast<view::LogicSignal>(s);
 				if (l && QString::fromUtf8(pdch->name).
 					toLower().contains(
-					l->get_name().toLower()))
+					l->name().toLower()))
 					channels[pdch] = l;
 			}
 
@@ -347,7 +357,7 @@ void SigSession::update_signals(shared_ptr<Device> device)
 	}
 
 	// Make the Signals list
-	do {
+	{
 		lock_guard<mutex> lock(_signals_mutex);
 
 		_signals.clear();
@@ -358,7 +368,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 +377,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 +391,7 @@ void SigSession::update_signals(shared_ptr<Device> device)
 			_signals.push_back(signal);
 		}
 
-	} while(0);
+	}
 
 	signals_changed();
 }
@@ -418,16 +430,16 @@ void SigSession::sample_thread_proc(shared_ptr<Device> device,
 	read_sample_rate(device);
 
 	try {
-		_sr_session->start();
+		_session->start();
 	} catch(Error e) {
 		error_handler(e.what());
 		return;
 	}
 
-	set_capture_state(_sr_session->trigger() ?
+	set_capture_state(_session->trigger() ?
 		AwaitingTrigger : Running);
 
-	_sr_session->run();
+	_session->run();
 	set_capture_state(Stopped);
 
 	// Confirm that SR_DF_END was received