Pass new unit_size argument to srd_inst_probe_set_all()

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

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 77f91cc3a3511d637b3976339ea6f07e453f2915..8cde226da847327395bcb306e2cc28c4b0d6b0b0 100644 (file)
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -18,14 +18,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <libsigrok/libsigrok.h>
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include "decoder.h"
 
 #include <pv/view/logicsignal.h>
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::map;
+using std::string;
 
 namespace pv {
 namespace data {
@@ -33,14 +35,15 @@ namespace decode {
 
 Decoder::Decoder(const srd_decoder *const dec) :
        _decoder(dec),
-       _options(g_hash_table_new_full(g_str_hash,
-               g_str_equal, g_free, (GDestroyNotify)g_variant_unref))
+       _shown(true)
 {
 }
 
 Decoder::~Decoder()
 {
-       g_hash_table_destroy(_options);
+       for (map<string, GVariant*>::const_iterator i = _options.begin();
+               i != _options.end(); i++)
+               g_variant_unref((*i).second);
 }
 
 const srd_decoder* Decoder::decoder() const
@@ -48,6 +51,16 @@ const srd_decoder* Decoder::decoder() const
        return _decoder;
 }
 
+bool Decoder::shown() const
+{
+       return _shown;
+}
+
+void Decoder::show(bool show)
+{
+       _shown = show;
+}
+
 const map<const srd_probe*, shared_ptr<view::LogicSignal> >&
 Decoder::probes() const
 {
@@ -60,23 +73,48 @@ void Decoder::set_probes(std::map<const srd_probe*,
        _probes = probes;
 }
 
-const GHashTable* Decoder::options() const
+const std::map<std::string, GVariant*>& Decoder::options() const
 {
        return _options;
 }
 
 void Decoder::set_option(const char *id, GVariant *value)
 {
+       assert(value);
        g_variant_ref(value);
-       g_hash_table_replace(_options, (void*)g_strdup(id), value);
+       _options[id] = value;
 }
 
-srd_decoder_inst* Decoder::create_decoder_inst(
-       srd_session *const session) const
+bool Decoder::have_required_probes() const
 {
-       // Create the decoder instance
+       for (GSList *p = _decoder->probes; p; p = p->next) {
+               const srd_probe *const probe = (const srd_probe*)p->data;
+               assert(probe);
+               if (_probes.find(probe) == _probes.end())
+                       return false;
+       }
+
+       return true;
+}
+
+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);
+
+       for (map<string, GVariant*>::const_iterator i = _options.begin();
+               i != _options.end(); i++)
+       {
+               GVariant *const value = (*i).second;
+               g_variant_ref(value);
+               g_hash_table_replace(opt_hash, (void*)g_strdup(
+                       (*i).first.c_str()), value);
+       }
+
        srd_decoder_inst *const decoder_inst = srd_inst_new(
-               session, _decoder->id, _options);
+               session, _decoder->id, opt_hash);
+       g_hash_table_destroy(opt_hash);
+
        if(!decoder_inst)
                return NULL;
 
@@ -95,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;
 }