X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fdecoder.cpp;h=d8a538cbec9368ddffde92d474e2478d9027adbc;hb=baee87e3597c3e9ff49e6e457f5b932dcdcff9ed;hp=00b9e0b7efb0b87b3d508828922707e46f73f5e6;hpb=9cef95672622f4ecdb21edef9d81a10c789daf1e;p=pulseview.git

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index 00b9e0b7..d8a538cb 100644
--- a/pv/data/decoder.cpp
+++ b/pv/data/decoder.cpp
@@ -22,6 +22,10 @@
 
 #include <boost/thread/thread.hpp>
 
+#include <stdexcept>
+
+#include <QDebug>
+
 #include "decoder.h"
 
 #include <pv/data/logic.h>
@@ -46,9 +50,12 @@ Decoder::Decoder(const srd_decoder *const dec,
 	_decoder(dec),
 	_probes(probes),
 	_options(options),
+	_session(NULL),
 	_decoder_inst(NULL)
 {
-	init_decoder();
+	if (!init_decoder())
+		throw runtime_error("Failed to initialise decoder.");
+
 	begin_decode();
 }
 
@@ -58,6 +65,9 @@ Decoder::~Decoder()
 	_decode_thread.join();
 
 	g_hash_table_destroy(_options);
+
+	if (_session)
+		srd_session_destroy(_session);
 }
 
 const srd_decoder* Decoder::get_decoder() const
@@ -98,7 +108,7 @@ void Decoder::clear_snapshots()
 {
 }
 
-void Decoder::init_decoder()
+bool Decoder::init_decoder()
 {
 	if (!_probes.empty())
 	{
@@ -115,8 +125,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 false;
+	}
 
 	_decoder_inst->data_samplerate = _samplerate;
 
@@ -135,6 +151,8 @@ void Decoder::init_decoder()
 	}
 
 	srd_inst_probe_set_all(_decoder_inst, probes);
+
+	return true;
 }
 
 void Decoder::decode_proc(shared_ptr<data::Logic> data)
@@ -159,9 +177,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 +197,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;
 	}
 }