X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fdecode%2Fdecoder.h;h=fbe59059cf6190167d8cc0333c27e01008e094eb;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=d8ed469203cf804ac1c2eabc215b80a1d024c993;hpb=13a3528cfa6ed4dc18c44aae2353ac145b0160cc;p=pulseview.git

diff --git a/pv/data/decode/decoder.h b/pv/data/decode/decoder.h
index d8ed4692..fbe59059 100644
--- a/pv/data/decode/decoder.h
+++ b/pv/data/decode/decoder.h
@@ -22,14 +22,14 @@
 #define PULSEVIEW_PV_DATA_DECODE_DECODER_H
 
 #include <map>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
+#include <set>
 
 #include <glib.h>
 
 struct srd_decoder;
 struct srd_decoder_inst;
-struct srd_probe;
+struct srd_channel;
 struct srd_session;
 
 namespace pv {
@@ -39,6 +39,9 @@ class LogicSignal;
 }
 
 namespace data {
+
+class Logic;
+
 namespace decode {
 
 class Decoder
@@ -53,28 +56,30 @@ public:
 	bool shown() const;
 	void show(bool show = true);
 
-	const std::map<const srd_probe*,
-		boost::shared_ptr<view::LogicSignal> >& probes() const;
-	void set_probes(std::map<const srd_probe*,
-		boost::shared_ptr<view::LogicSignal> > probes);
+	const std::map<const srd_channel*,
+		std::shared_ptr<view::LogicSignal> >& channels() const;
+	void set_channels(std::map<const srd_channel*,
+		std::shared_ptr<view::LogicSignal> > channels);
 
 	const std::map<std::string, GVariant*>& options() const;
 
 	void set_option(const char *id, GVariant *value);
 
-	bool have_required_probes() const;
+	bool have_required_channels() const;
 
 	srd_decoder_inst* create_decoder_inst(
 		srd_session *session, int unit_size) const;
 
+	std::set< std::shared_ptr<pv::data::Logic> > get_data();	
+
 private:
-	const srd_decoder *const _decoder;
+	const srd_decoder *const decoder_;
 
-	bool _shown;
+	bool shown_;
 
-	std::map<const srd_probe*, boost::shared_ptr<pv::view::LogicSignal> >
-		_probes;
-	std::map<std::string, GVariant*> _options;
+	std::map<const srd_channel*, std::shared_ptr<pv::view::LogicSignal> >
+		channels_;
+	std::map<std::string, GVariant*> options_;
 };
 
 } // namespace decode