X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=56ebc7e598299f4faae507a0aea943d9401b77f1;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=b293cacb010790c61f46edef34c7f81f0306abfe;hpb=8d3e0764def48fdf19dc9100c87bbb42da5a9d6d;p=pulseview.git

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index b293cac..56ebc7e 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -18,15 +18,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <libsigrok/libsigrok.h>
+#include <cassert>
+
+#include <libsigrok/libsigrok.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include "decoder.h"
 
 #include <pv/view/logicsignal.h>
 
-using boost::shared_ptr;
+using std::set;
 using std::map;
+using std::shared_ptr;
 using std::string;
 
 namespace pv {
@@ -41,8 +44,7 @@ Decoder::Decoder(const srd_decoder *const dec) :
 
 Decoder::~Decoder()
 {
-	for (map<string, GVariant*>::const_iterator i = _options.begin();
-		i != _options.end(); i++)
+	for (auto i = _options.begin(); i != _options.end(); i++)
 		g_variant_unref((*i).second);
 }
 
@@ -61,16 +63,16 @@ void Decoder::show(bool show)
 	_shown = show;
 }
 
-const map<const srd_probe*, shared_ptr<view::LogicSignal> >&
-Decoder::probes() const
+const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
+Decoder::channels() const
 {
-	return _probes;
+	return _channels;
 }
 
-void Decoder::set_probes(std::map<const srd_probe*,
-	boost::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
@@ -85,26 +87,36 @@ void Decoder::set_option(const char *id, GVariant *value)
 	_options[id] = value;
 }
 
-bool Decoder::have_required_probes() const
+bool Decoder::have_required_channels() const
 {
-	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())
+	for (GSList *l = _decoder->channels; l; l = l->next) {
+		const srd_channel *const pdch = (const srd_channel*)l->data;
+		assert(pdch);
+		if (_channels.find(pdch) == _channels.end())
 			return false;
 	}
 
 	return true;
 }
 
-srd_decoder_inst* Decoder::create_decoder_inst(
-	srd_session *const session) 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++) {
+		shared_ptr<view::LogicSignal> signal((*i).second);
+		assert(signal);
+		data.insert(signal->logic_data());
+	}
+
+	return data;
+}
+
+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++)
+	for (auto i = _options.cbegin(); i != _options.cend(); i++)
 	{
 		GVariant *const value = (*i).second;
 		g_variant_ref(value);
@@ -119,22 +131,20 @@ srd_decoder_inst* Decoder::create_decoder_inst(
 	if(!decoder_inst)
 		return NULL;
 
-	// 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(map<const srd_probe*, shared_ptr<view::LogicSignal> >::
-		const_iterator i = _probes.begin();
-		i != _probes.end(); i++)
+	for(auto i = _channels.cbegin(); i != _channels.cend(); i++)
 	{
 		shared_ptr<view::LogicSignal> signal((*i).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, (*i).first->id, gvar);
 	}
 
-	srd_inst_probe_set_all(decoder_inst, probes);
+	srd_inst_channel_set_all(decoder_inst, channels, unit_size);
 
 	return decoder_inst;
 }