projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SigSession: Renamed get_device to device
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 1d424c000bf3972a8c697534af02522a05d99591..ce74829401486f0c6597486398f1cf68e9c78dd3 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-98,7
+98,7
@@
SigSession::~SigSession()
stop_capture();
}
stop_capture();
}
-shared_ptr<Device> SigSession::
get_
device() const
+shared_ptr<Device> SigSession::device() const
{
return _device;
}
{
return _device;
}
@@
-348,7
+348,7
@@
void SigSession::update_signals(shared_ptr<Device> device)
}
// Make the Signals list
}
// Make the Signals list
-
do
{
+ {
lock_guard<mutex> lock(_signals_mutex);
_signals.clear();
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>(
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:
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>(
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;
}
break;
}
@@
-380,7
+382,7
@@
void SigSession::update_signals(shared_ptr<Device> device)
_signals.push_back(signal);
}
_signals.push_back(signal);
}
- }
while(0);
+ }
signals_changed();
}
signals_changed();
}