X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=9ff6efe4df6e5d00d00b21a5c41d68f0f4f79acc;hb=c3a740dd5d095eb1cdf42e00df4d5a5c480ac5b3;hp=5a794417f2112754f6cf0cc566202b452b49c5d8;hpb=1f4caa772cd691da7578816bf3744496c9cde1cf;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 5a79441..9ff6efe 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -92,6 +92,16 @@ SigSession::~SigSession()
 	stop_capture();
 }
 
+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;
@@ -229,9 +239,13 @@ set< shared_ptr<data::SignalData> > SigSession::get_data() const
 	return data;
 }
 
-vector< shared_ptr<view::Signal> > SigSession::get_signals() const
+mutex& SigSession::signals_mutex() const
+{
+	return _signals_mutex;
+}
+
+const vector< shared_ptr<view::Signal> >& SigSession::signals() const
 {
-	lock_guard<mutex> lock(_signals_mutex);
 	return _signals;
 }
 
@@ -264,7 +278,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;
 			}