projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove DecodeStack dependency from decode binding wrapper
[pulseview.git]
/
pv
/
binding
/
decoder.cpp
diff --git
a/pv/binding/decoder.cpp
b/pv/binding/decoder.cpp
index f2e2e1d579f46eabe7b67104de3a103a6647055a..28f42a08b38027ca87a9e42a5c6bec84e31c7a09 100644
(file)
--- a/
pv/binding/decoder.cpp
+++ b/
pv/binding/decoder.cpp
@@
-24,7
+24,7
@@
#include <boost/none_t.hpp>
#include <pv/data/decode/decoder.hpp>
#include <boost/none_t.hpp>
#include <pv/data/decode/decoder.hpp>
-#include <pv/data/decode
rstack
.hpp>
+#include <pv/data/decode
signal
.hpp>
#include <pv/prop/double.hpp>
#include <pv/prop/enum.hpp>
#include <pv/prop/int.hpp>
#include <pv/prop/double.hpp>
#include <pv/prop/enum.hpp>
#include <pv/prop/int.hpp>
@@
-48,9
+48,9
@@
namespace pv {
namespace binding {
Decoder::Decoder(
namespace binding {
Decoder::Decoder(
- shared_ptr<pv::data::Decode
rStack> decoder_stack
,
+ shared_ptr<pv::data::Decode
Signal> decode_signal
,
shared_ptr<data::decode::Decoder> decoder) :
shared_ptr<data::decode::Decoder> decoder) :
- decode
r_stack_(decoder_stack
),
+ decode
_signal_(decode_signal
),
decoder_(decoder)
{
assert(decoder_);
decoder_(decoder)
{
assert(decoder_);
@@
-137,8
+137,8
@@
void Decoder::setter(const char *id, Glib::VariantBase value)
assert(decoder_);
decoder_->set_option(id, value.gobj());
assert(decoder_);
decoder_->set_option(id, value.gobj());
- assert(decode
r_stack
_);
- decode
r_stack
_->begin_decode();
+ assert(decode
_signal
_);
+ decode
_signal
_->begin_decode();
}
} // namespace binding
}
} // namespace binding