projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented decoder options binding
[pulseview.git]
/
pv
/
data
/
decoder.cpp
diff --git
a/pv/data/decoder.cpp
b/pv/data/decoder.cpp
index 2848d16ca4dffd166697b2517193acaec7030592..787d1600bb89f5695c44c90625c06aed44a5cf0a 100644
(file)
--- a/
pv/data/decoder.cpp
+++ b/
pv/data/decoder.cpp
@@
-41,9
+41,11
@@
const int64_t Decoder::DecodeChunkLength = 4096;
Decoder::Decoder(const srd_decoder *const dec,
std::map<const srd_probe*,
Decoder::Decoder(const srd_decoder *const dec,
std::map<const srd_probe*,
- boost::shared_ptr<pv::view::Signal> > probes) :
+ boost::shared_ptr<pv::view::Signal> > probes,
+ GHashTable *options) :
_decoder(dec),
_probes(probes),
_decoder(dec),
_probes(probes),
+ _options(options),
_decoder_inst(NULL)
{
init_decoder();
_decoder_inst(NULL)
{
init_decoder();
@@
-54,6
+56,8
@@
Decoder::~Decoder()
{
_decode_thread.interrupt();
_decode_thread.join();
{
_decode_thread.interrupt();
_decode_thread.join();
+
+ g_hash_table_destroy(_options);
}
const srd_decoder* Decoder::get_decoder() const
}
const srd_decoder* Decoder::get_decoder() const
@@
-111,7
+115,7
@@
void Decoder::init_decoder()
}
}
}
}
- _decoder_inst = srd_inst_new(_decoder->id,
NULL
);
+ _decoder_inst = srd_inst_new(_decoder->id,
_options
);
assert(_decoder_inst);
_decoder_inst->data_samplerate = _samplerate;
assert(_decoder_inst);
_decoder_inst->data_samplerate = _samplerate;