projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move run/stop button from the menu bar to the tab widget
[pulseview.git]
/
pv
/
data
/
decoderstack.cpp
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index d4daa5902a1d2a47d9f727da8dda74c5c6f5ef9c..6f1eb1925dc3e34fe59e35e3343cb5f0e93e7fd0 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-191,7
+191,7
@@
void DecoderStack::clear()
void DecoderStack::begin_decode()
{
void DecoderStack::begin_decode()
{
- shared_ptr<pv::
view::LogicSignal> logic_signal
;
+ shared_ptr<pv::
data::SignalBase> signalbase
;
shared_ptr<pv::data::Logic> data;
if (decode_thread_.joinable()) {
shared_ptr<pv::data::Logic> data;
if (decode_thread_.joinable()) {
@@
-241,11
+241,11
@@
void DecoderStack::begin_decode()
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
// We get the logic data of the first channel in the list.
// This works because we are currently assuming all
- //
LogicS
ignals have the same data/segment
+ //
logic s
ignals have the same data/segment
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (dec && !dec->channels().empty() &&
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (dec && !dec->channels().empty() &&
- ((
logic_signal
= (*dec->channels().begin()).second)) &&
- ((data =
logic_signal
->logic_data())))
+ ((
signalbase
= (*dec->channels().begin()).second)) &&
+ ((data =
signalbase
->logic_data())))
break;
if (!data)
break;
if (!data)