X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=03f4f0ebabdfc4cae68af572163d1b5345e49a98;hb=60d9b99a32e551cffd2b537d3e157d578a761c9b;hp=018051df0fccc0182a92fb9ce6727aa9303863a0;hpb=4c60462b00cc329e61daedd1c2e66724077bd412;p=pulseview.git diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp index 018051df..03f4f0eb 100644 --- a/pv/data/decode/decoder.cpp +++ b/pv/data/decode/decoder.cpp @@ -102,7 +102,7 @@ bool Decoder::have_required_channels() const set< shared_ptr > Decoder::get_data() { set< shared_ptr > data; - for(auto i = channels_.cbegin(); i != channels_.cend(); i++) { + for (auto i = channels_.cbegin(); i != channels_.cend(); i++) { shared_ptr signal((*i).second); assert(signal); data.insert(signal->logic_data()); @@ -111,7 +111,7 @@ set< shared_ptr > Decoder::get_data() return data; } -srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_size) const +srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const { GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_variant_unref); @@ -128,14 +128,14 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si session, decoder_->id, opt_hash); g_hash_table_destroy(opt_hash); - if(!decoder_inst) + if (!decoder_inst) return nullptr; // Setup the channels GHashTable *const channels = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_variant_unref); - for(auto i = channels_.cbegin(); i != channels_.cend(); i++) + for (auto i = channels_.cbegin(); i != channels_.cend(); i++) { shared_ptr signal((*i).second); GVariant *const gvar = g_variant_new_int32( @@ -144,7 +144,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si g_hash_table_insert(channels, (*i).first->id, gvar); } - srd_inst_channel_set_all(decoder_inst, channels, unit_size); + srd_inst_channel_set_all(decoder_inst, channels); return decoder_inst; }