X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoder.cpp;h=787d1600bb89f5695c44c90625c06aed44a5cf0a;hb=67fe5e9c02e4e9cfe94d465a0a5e5b598129e4e3;hp=2848d16ca4dffd166697b2517193acaec7030592;hpb=4206fe26e6b3f6439e382a072f5ff67c009f412a;p=pulseview.git diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp index 2848d16..787d160 100644 --- 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 > probes) : + boost::shared_ptr > probes, + GHashTable *options) : _decoder(dec), _probes(probes), + _options(options), _decoder_inst(NULL) { init_decoder(); @@ -54,6 +56,8 @@ Decoder::~Decoder() { _decode_thread.interrupt(); _decode_thread.join(); + + g_hash_table_destroy(_options); } 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;