Re-use DecodeTrace::ChannelSelector as DecodeChannel

[pulseview.git] / pv / data / decode / decoder.cpp

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 5fae925886155a900394cb64d6861e6e3fb37b82..ffdbeb93bc3835eee32594045af1e79f32260467 100644 (file)
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -68,13 +68,13 @@ Decoder::channels() const
        return channels_;
 }
 
-void Decoder::set_channels(std::map<const srd_channel*,
-       std::shared_ptr<data::SignalBase> > channels)
+void Decoder::set_channels(map<const srd_channel*,
+       shared_ptr<data::SignalBase> > channels)
 {
        channels_ = channels;
 }
 
-const std::map<std::string, GVariant*>& Decoder::options() const
+const map<string, GVariant*>& Decoder::options() const
 {
        return options_;
 }
@@ -130,11 +130,20 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
                return nullptr;
 
        // Setup the channels
+       GArray *const init_pin_states = g_array_sized_new(FALSE, TRUE,
+               sizeof(uint8_t), channels_.size());
+
+       g_array_set_size(init_pin_states, channels_.size());
+
        GHashTable *const channels = g_hash_table_new_full(g_str_hash,
                g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
        for (const auto& channel : channels_) {
                shared_ptr<data::SignalBase> b(channel.second);
+
+//             init_pin_states->data[pdch->order] =
+//                     channel.initial_pin_state;
+
                GVariant *const gvar = g_variant_new_int32(b->index());
                g_variant_ref_sink(gvar);
                g_hash_table_insert(channels, channel.first->id, gvar);
@@ -142,9 +151,12 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 
        srd_inst_channel_set_all(decoder_inst, channels);
 
+//     srd_inst_initial_pins_set_all(decoder_inst, initial_pin_states);
+       g_array_free(init_pin_states, TRUE);
+
        return decoder_inst;
 }
 
-} // decode
-} // data
-} // pv
+}  // namespace decode
+}  // namespace data
+}  // namespace pv