From e332f6d399ecba201389c1e048239a7fe0cc87d5 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Tue, 1 Jan 2013 19:47:07 +0000
Subject: [PATCH] Create decoder instance

---
 pv/data/decoder.cpp | 31 ++++++++++++++++++++++++++++++-
 pv/data/decoder.h   | 11 +++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/pv/data/decoder.cpp b/pv/data/decoder.cpp
index cdfe57f9..65854ee0 100644
--- a/pv/data/decoder.cpp
+++ b/pv/data/decoder.cpp
@@ -18,10 +18,15 @@
  * 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 {
 
@@ -29,8 +34,10 @@ Decoder::Decoder(const srd_decoder *const dec,
 	std::map<const srd_probe*,
 		boost::shared_ptr<pv::view::Signal> > probes) :
 	_decoder(dec),
-	_probes(probes)
+	_probes(probes),
+	_decoder_inst(NULL)
 {
+	init_decoder();
 }
 
 const srd_decoder* Decoder::get_decoder() const
@@ -38,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()
 {
 }
diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index ddcf6674..c4f71152 100644
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -28,6 +28,7 @@
 #include <boost/shared_ptr.hpp>
 
 struct srd_decoder;
+struct srd_decoder_inst;
 struct srd_probe;
 
 namespace pv {
@@ -41,17 +42,23 @@ namespace data {
 class Decoder : public SignalData
 {
 public:
-	Decoder(const srd_decoder *const dec, std::map<const srd_probe*,
-		boost::shared_ptr<pv::view::Signal> > probes);
+	Decoder(const srd_decoder *const decoder,
+		std::map<const srd_probe*,
+			boost::shared_ptr<pv::view::Signal> > probes);
 
 	const srd_decoder* get_decoder() const;
 
 	void clear_snapshots();
 
+private:
+	void init_decoder();
+
 private:
 	const srd_decoder *const _decoder;
 	std::map<const srd_probe*, boost::shared_ptr<view::Signal> >
 		_probes;
+
+	srd_decoder_inst *_decoder_inst;
 };
 
 } // namespace data
-- 
2.30.2