Added missing includes and defintions

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

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index 787d1600bb89f5695c44c90625c06aed44a5cf0a..65fc8fff7c858312fa77a902d8df9d33ea3acddd 100644 (file)
--- a/pv/data/decoder.cpp
+++ b/pv/data/decoder.cpp
@@ -22,6 +22,8 @@
 
 #include <boost/thread/thread.hpp>
 
+#include <QDebug>
+
 #include "decoder.h"
 
 #include <pv/data/logic.h>
@@ -46,6 +48,7 @@ Decoder::Decoder(const srd_decoder *const dec,
        _decoder(dec),
        _probes(probes),
        _options(options),
+       _session(NULL),
        _decoder_inst(NULL)
 {
        init_decoder();
@@ -115,8 +118,14 @@ void Decoder::init_decoder()
                }
        }
 
-       _decoder_inst = srd_inst_new(_decoder->id, _options);
-       assert(_decoder_inst);
+       srd_session_new(&_session);
+       assert(_session);
+
+       _decoder_inst = srd_inst_new(_session, _decoder->id, _options);
+       if(!_decoder_inst) {
+               qDebug() << "Failed to initialise decoder";
+               return;
+       }
 
        _decoder_inst->data_samplerate = _samplerate;
 
@@ -159,9 +168,16 @@ void Decoder::decode_proc(shared_ptr<data::Logic> data)
        if (samplerate == 0.0)
                samplerate = 1.0;
 
-       srd_session_start(_probes.size(), snapshot->unit_size(), samplerate);
+       srd_session_config_set(_session, SRD_CONF_NUM_PROBES,
+               g_variant_new_uint64(_probes.size()));
+       srd_session_config_set(_session, SRD_CONF_UNITSIZE,
+               g_variant_new_uint64(snapshot->unit_size()));
+       srd_session_config_set(_session, SRD_CONF_SAMPLERATE,
+               g_variant_new_uint64((uint64_t)samplerate));
+
+       srd_session_start(_session);
 
-       srd_pd_output_callback_add(SRD_OUTPUT_ANN,
+       srd_pd_output_callback_add(_session, SRD_OUTPUT_ANN,
                Decoder::annotation_callback, this);
 
        for (int64_t i = 0;
@@ -172,7 +188,8 @@ void Decoder::decode_proc(shared_ptr<data::Logic> data)
                        i + DecodeChunkLength, sample_count);
                snapshot->get_samples(chunk, i, chunk_end);
 
-               if (srd_session_send(i, chunk, chunk_end - i) != SRD_OK)
+               if (srd_session_send(_session, i, chunk, chunk_end - i) !=
+                       SRD_OK)
                        break;
        }
 }
@@ -189,6 +206,8 @@ void Decoder::annotation_callback(srd_proto_data *pdata, void *decoder)
        shared_ptr<Annotation> a(new Annotation(pdata));
        lock_guard<mutex> lock(d->_annotations_mutex);
        d->_annotations.push_back(a);
+
+       d->new_decode_data();
 }
 
 } // namespace data