Use SignalBase instead of LogicSignal for decoders

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

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index e2db774283496c6d3d1d58dfa068317433050b56..3b75f88482e6ec3bc5613471f3dfde9d40a826e1 100644 (file)
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -20,12 +20,12 @@
 
 #include <cassert>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 
-#include "decoder.h"
+#include "decoder.hpp"
 
-#include <pv/view/logicsignal.h>
+#include <pv/data/signalbase.hpp>
 
 using std::set;
 using std::map;
@@ -44,8 +44,8 @@ Decoder::Decoder(const srd_decoder *const dec) :
 
 Decoder::~Decoder()
 {
-       for (auto i = options_.begin(); i != options_.end(); i++)
-               g_variant_unref((*i).second);
+       for (auto& option : options_)
+               g_variant_unref(option.second);
 }
 
 const srd_decoder* Decoder::decoder() const
@@ -63,14 +63,14 @@ void Decoder::show(bool show)
        shown_ = show;
 }
 
-const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
+const map<const srd_channel*, shared_ptr<data::SignalBase> >&
 Decoder::channels() const
 {
        return channels_;
 }
 
 void Decoder::set_channels(std::map<const srd_channel*,
-       std::shared_ptr<view::LogicSignal> > channels)
+       std::shared_ptr<data::SignalBase> > channels)
 {
        channels_ = channels;
 }
@@ -102,49 +102,46 @@ bool Decoder::have_required_channels() const
 set< shared_ptr<pv::data::Logic> > Decoder::get_data()
 {
        set< shared_ptr<pv::data::Logic> > data;
-       for(auto i = channels_.cbegin(); i != channels_.cend(); i++) {
-               shared_ptr<view::LogicSignal> signal((*i).second);
-               assert(signal);
-               data.insert(signal->logic_data());
+       for (const auto& channel : channels_) {
+               shared_ptr<data::SignalBase> b(channel.second);
+               assert(b);
+               data.insert(b->logic_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);
 
-       for (auto i = options_.cbegin(); i != options_.cend(); i++)
-       {
-               GVariant *const value = (*i).second;
+       for (const auto& option : options_) {
+               GVariant *const value = option.second;
                g_variant_ref(value);
                g_hash_table_replace(opt_hash, (void*)g_strdup(
-                       (*i).first.c_str()), value);
+                       option.first.c_str()), value);
        }
 
        srd_decoder_inst *const decoder_inst = srd_inst_new(
                session, decoder_->id, opt_hash);
        g_hash_table_destroy(opt_hash);
 
-       if(!decoder_inst)
-               return NULL;
+       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++)
-       {
-               shared_ptr<view::LogicSignal> signal((*i).second);
-               GVariant *const gvar = g_variant_new_int32(
-                       signal->channel()->index());
+       for (const auto& channel : channels_) {
+               shared_ptr<data::SignalBase> b(channel.second);
+               GVariant *const gvar = g_variant_new_int32(b->index());
                g_variant_ref_sink(gvar);
-               g_hash_table_insert(channels, (*i).first->id, gvar);
+               g_hash_table_insert(channels, channel.first->id, gvar);
        }
 
-       srd_inst_channel_set_all(decoder_inst, channels, unit_size);
+       srd_inst_channel_set_all(decoder_inst, channels);
 
        return decoder_inst;
 }