projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SigSession: Added signals_mutex(), and made signals() give a reference
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 5a794417f2112754f6cf0cc566202b452b49c5d8..9ff6efe4df6e5d00d00b21a5c41d68f0f4f79acc 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-92,6
+92,16
@@
SigSession::~SigSession()
stop_capture();
}
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;
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;
}
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;
}
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(
dynamic_pointer_cast<view::LogicSignal>(s);
if (l && QString::fromUtf8(pdch->name).
toLower().contains(
- l->
get_
name().toLower()))
+ l->name().toLower()))
channels[pdch] = l;
}
channels[pdch] = l;
}