projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Removed device parameter from update_signals
[pulseview.git]
/
pv
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index 542b88b798188696eabc216947065bf5f43c06ce..dd78f4a176088ebb69cc5089558b4d310a7d4415 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-133,7
+133,7
@@
void Session::set_device(shared_ptr<devices::Device> device)
(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
data_feed_in(device, packet);
});
(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
data_feed_in(device, packet);
});
- update_signals(
device_
);
+ update_signals();
decode_traces_.clear();
decode_traces_.clear();
@@
-301,12
+301,12
@@
void Session::set_capture_state(capture_state state)
capture_state_changed(state);
}
capture_state_changed(state);
}
-void Session::update_signals(
shared_ptr<devices::Device> device
)
+void Session::update_signals()
{
{
- assert(device);
+ assert(device
_
);
assert(capture_state_ == Stopped);
assert(capture_state_ == Stopped);
- const shared_ptr<sigrok::Device> sr_dev = device->device();
+ const shared_ptr<sigrok::Device> sr_dev = device
_
->device();
if (!sr_dev) {
signals_.clear();
logic_data_.reset();
if (!sr_dev) {
signals_.clear();
logic_data_.reset();
@@
-364,7
+364,7
@@
void Session::update_signals(shared_ptr<devices::Device> device)
case SR_CHANNEL_LOGIC:
signal = shared_ptr<view::Signal>(
new view::LogicSignal(*this,
case SR_CHANNEL_LOGIC:
signal = shared_ptr<view::Signal>(
new view::LogicSignal(*this,
- device, channel,
+ device
_
, channel,
logic_data_));
break;
logic_data_));
break;