From 13a3528cfa6ed4dc18c44aae2353ac145b0160cc Mon Sep 17 00:00:00 2001 From: Daniel Elstner Date: Thu, 20 Feb 2014 06:33:21 +0100 Subject: [PATCH 1/1] Pass new unit_size argument to srd_inst_probe_set_all() --- pv/data/decode/decoder.cpp | 5 ++--- pv/data/decode/decoder.h | 2 +- pv/data/decoderstack.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp index b293cacb..8cde226d 100644 --- a/pv/data/decode/decoder.cpp +++ b/pv/data/decode/decoder.cpp @@ -97,8 +97,7 @@ bool Decoder::have_required_probes() const return true; } -srd_decoder_inst* Decoder::create_decoder_inst( - srd_session *const session) const +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 +133,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; } diff --git a/pv/data/decode/decoder.h b/pv/data/decode/decoder.h index 08795585..d8ed4692 100644 --- a/pv/data/decode/decoder.h +++ b/pv/data/decode/decoder.h @@ -65,7 +65,7 @@ public: bool have_required_probes() const; srd_decoder_inst* create_decoder_inst( - srd_session *const session) const; + srd_session *session, int unit_size) const; private: const srd_decoder *const _decoder; diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp index e667693e..9b02f9e9 100644 --- a/pv/data/decoderstack.cpp +++ b/pv/data/decoderstack.cpp @@ -271,7 +271,7 @@ void DecoderStack::decode_proc(shared_ptr data) // Create the decoders BOOST_FOREACH(const shared_ptr &dec, _stack) { - srd_decoder_inst *const di = dec->create_decoder_inst(session); + srd_decoder_inst *const di = dec->create_decoder_inst(session, unit_size); if (!di) { -- 2.30.2