X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=374dd4d360c9bf8bca84f544eaf04892395c9888;hp=db9816c4169f6bc131330274c51a25de88e54ef9;hb=da50281d;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index db9816c4..374dd4d3 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -18,12 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <libsigrok/libsigrok.h>
+#include <cassert>
+
+#include <libsigrokcxx/libsigrokcxx.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 
-#include "decoder.h"
+#include "decoder.hpp"
 
-#include <pv/view/logicsignal.h>
+#include <pv/view/logicsignal.hpp>
 
 using std::set;
 using std::map;
@@ -35,62 +37,62 @@ namespace data {
 namespace decode {
 
 Decoder::Decoder(const srd_decoder *const dec) :
-	_decoder(dec),
-	_shown(true)
+	decoder_(dec),
+	shown_(true)
 {
 }
 
 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
 {
-	return _decoder;
+	return decoder_;
 }
 
 bool Decoder::shown() const
 {
-	return _shown;
+	return shown_;
 }
 
 void Decoder::show(bool show)
 {
-	_shown = show;
+	shown_ = show;
 }
 
 const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
 Decoder::channels() const
 {
-	return _probes;
+	return channels_;
 }
 
-void Decoder::set_probes(std::map<const srd_channel*,
-	std::shared_ptr<view::LogicSignal> > probes)
+void Decoder::set_channels(std::map<const srd_channel*,
+	std::shared_ptr<view::LogicSignal> > channels)
 {
-	_probes = probes;
+	channels_ = channels;
 }
 
 const std::map<std::string, GVariant*>& Decoder::options() const
 {
-	return _options;
+	return options_;
 }
 
 void Decoder::set_option(const char *id, GVariant *value)
 {
 	assert(value);
 	g_variant_ref(value);
-	_options[id] = value;
+	options_[id] = value;
 }
 
-bool Decoder::have_required_probes() const
+bool Decoder::have_required_channels() const
 {
-	for (GSList *l = _decoder->channels; l; l = l->next) {
+	for (GSList *l = decoder_->channels; l; l = l->next) {
 		const srd_channel *const pdch = (const srd_channel*)l->data;
 		assert(pdch);
-		if (_probes.find(pdch) == _probes.end())
+		if (channels_.find(pdch) == channels_.end())
 			return false;
 	}
 
@@ -100,8 +102,8 @@ bool Decoder::have_required_probes() const
 set< shared_ptr<pv::data::Logic> > Decoder::get_data()
 {
 	set< shared_ptr<pv::data::Logic> > data;
-	for(auto i = _probes.cbegin(); i != _probes.cend(); i++) {
-		shared_ptr<view::LogicSignal> signal((*i).second);
+	for (const auto & channel : channels_) {
+		shared_ptr<view::LogicSignal> signal(channel.second);
 		assert(signal);
 		data.insert(signal->logic_data());
 	}
@@ -109,40 +111,38 @@ 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);
 
-	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);
+		session, decoder_->id, opt_hash);
 	g_hash_table_destroy(opt_hash);
 
-	if(!decoder_inst)
-		return NULL;
+	if (!decoder_inst)
+		return nullptr;
 
-	// Setup the probes
-	GHashTable *const probes = g_hash_table_new_full(g_str_hash,
+	// 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 = _probes.cbegin(); i != _probes.cend(); i++)
-	{
-		shared_ptr<view::LogicSignal> signal((*i).second);
+	for (const auto & channel : channels_) {
+		shared_ptr<view::LogicSignal> signal(channel.second);
 		GVariant *const gvar = g_variant_new_int32(
-			signal->probe()->index);
+			signal->channel()->index());
 		g_variant_ref_sink(gvar);
-		g_hash_table_insert(probes, (*i).first->id, gvar);
+		g_hash_table_insert(channels, channel.first->id, gvar);
 	}
 
-	srd_inst_channel_set_all(decoder_inst, probes, unit_size);
+	srd_inst_channel_set_all(decoder_inst, channels);
 
 	return decoder_inst;
 }