X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=03f4f0ebabdfc4cae68af572163d1b5345e49a98;hb=69e33a1b71599bbe35176ef7a77b58793a7d6ca2;hp=c5fffa6764385dbe6265f9441b32b312f06fcf70;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index c5fffa67..03f4f0eb 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -20,7 +20,7 @@
 
 #include <cassert>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include "decoder.hpp"
@@ -102,7 +102,7 @@ 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++) {
+	for (auto i = channels_.cbegin(); i != channels_.cend(); i++) {
 		shared_ptr<view::LogicSignal> signal((*i).second);
 		assert(signal);
 		data.insert(signal->logic_data());
@@ -111,7 +111,7 @@ set< shared_ptr<pv::data::Logic> > Decoder::get_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);
@@ -128,14 +128,14 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si
 		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++)
+	for (auto i = channels_.cbegin(); i != channels_.cend(); i++)
 	{
 		shared_ptr<view::LogicSignal> signal((*i).second);
 		GVariant *const gvar = g_variant_new_int32(
@@ -144,7 +144,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_si
 		g_hash_table_insert(channels, (*i).first->id, gvar);
 	}
 
-	srd_inst_channel_set_all(decoder_inst, channels, unit_size);
+	srd_inst_channel_set_all(decoder_inst, channels);
 
 	return decoder_inst;
 }