X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoder.cpp;h=65854ee056b9384c1c0a7a774de78ee9fdb3f1b3;hb=e332f6d399ecba201389c1e048239a7fe0cc87d5;hp=ea0fed6bd47a0faf9f506a43053060c9f2889363;hpb=119aff65d8ad0c4cdaff32d9b68cee00d90a5f35;p=pulseview.git

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index ea0fed6..65854ee 100644
--- a/pv/data/decoder.cpp
+++ b/pv/data/decoder.cpp
@@ -18,14 +18,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <libsigrokdecode/libsigrokdecode.h>
+
 #include "decoder.h"
 
+#include <pv/view/signal.h>
+
+using namespace boost;
+using namespace std;
+
 namespace pv {
 namespace data {
 
-Decoder::Decoder(const srd_decoder *const dec) :
-	_decoder(dec)
+Decoder::Decoder(const srd_decoder *const dec,
+	std::map<const srd_probe*,
+		boost::shared_ptr<pv::view::Signal> > probes) :
+	_decoder(dec),
+	_probes(probes),
+	_decoder_inst(NULL)
 {
+	init_decoder();
 }
 
 const srd_decoder* Decoder::get_decoder() const
@@ -33,6 +45,28 @@ const srd_decoder* Decoder::get_decoder() const
 	return _decoder;
 }
 
+void Decoder::init_decoder()
+{
+	_decoder_inst = srd_inst_new(_decoder->id, NULL);
+	assert(_decoder_inst);
+
+	GHashTable *probes = 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::Signal> >::
+		const_iterator i = _probes.begin();
+		i != _probes.end(); i++)
+	{
+		shared_ptr<view::Signal> signal((*i).second);
+		GVariant *const gvar = g_variant_new_int32(
+			signal->probe()->index);
+		g_variant_ref_sink(gvar);
+		g_hash_table_insert(probes, (*i).first->id, gvar);
+	}
+
+	srd_inst_probe_set_all(_decoder_inst, probes);
+}
+
 void Decoder::clear_snapshots()
 {
 }