X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=89d19b3ad7c3ec80dd3c6d2c4f7c73d0f2d5038d;hb=ddee4cf8c09fa27c329084b8706a984995648056;hp=b293cacb010790c61f46edef34c7f81f0306abfe;hpb=8d3e0764def48fdf19dc9100c87bbb42da5a9d6d;p=pulseview.git diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp index b293cacb..89d19b3a 100644 --- a/pv/data/decode/decoder.cpp +++ b/pv/data/decode/decoder.cpp @@ -26,6 +26,7 @@ #include using boost::shared_ptr; +using std::set; using std::map; using std::string; @@ -97,8 +98,22 @@ bool Decoder::have_required_probes() const return true; } -srd_decoder_inst* Decoder::create_decoder_inst( - srd_session *const session) const +set< shared_ptr > Decoder::get_data() +{ + set< shared_ptr > data; + for(map >:: + const_iterator i = _probes.begin(); + i != _probes.end(); i++) + { + shared_ptr signal((*i).second); + assert(signal); + data.insert(signal->logic_data()); + } + + return data; +} + +srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_size) const { GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_variant_unref); @@ -134,7 +149,7 @@ srd_decoder_inst* Decoder::create_decoder_inst( g_hash_table_insert(probes, (*i).first->id, gvar); } - srd_inst_probe_set_all(decoder_inst, probes); + srd_inst_probe_set_all(decoder_inst, probes, unit_size); return decoder_inst; }