X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.hpp;h=282cfe557d0740682ef17d82318ea4d9443463c8;hb=cbb2e4da8042495531b406f745ee9d9e20448ef6;hp=1b655662bcb707dfe5fd83dbc847164e81bc04a2;hpb=9f97b3576f527239594ea0accb82a4087147c746;p=pulseview.git

diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 1b655662..282cfe55 100644
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -23,13 +23,15 @@
 #include <map>
 #include <memory>
 #include <set>
+#include <vector>
 
 #include <glib.h>
 
+#include <pv/data/signalbase.hpp>
+
 using std::map;
-using std::set;
-using std::shared_ptr;
 using std::string;
+using std::vector;
 
 struct srd_decoder;
 struct srd_decoder_inst;
@@ -45,6 +47,28 @@ class SignalBase;
 
 namespace decode {
 
+class Decoder;
+
+struct DecodeChannel
+{
+	uint16_t id;     ///< Global numerical ID for the decode channels in the stack
+	uint16_t bit_id; ///< Tells which bit within a sample represents this channel
+	const bool is_optional;
+	const pv::data::SignalBase *assigned_signal;
+	const QString name, desc;
+	int initial_pin_state;
+	const shared_ptr<Decoder> decoder_;
+	const srd_channel *pdch_;
+};
+
+struct DecodeBinaryClassInfo
+{
+	uint32_t bin_class_id;
+	char* name;
+	char* description;
+};
+
+
 class Decoder
 {
 public:
@@ -54,31 +78,37 @@ public:
 
 	const srd_decoder* decoder() const;
 
+	const char* name() const;
+
 	bool shown() const;
 	void show(bool show = true);
 
-	const map<const srd_channel*,
-		shared_ptr<data::SignalBase> >& channels() const;
-	void set_channels(map<const srd_channel*,
-		shared_ptr<data::SignalBase> > channels);
+	const vector<DecodeChannel*>& channels() const;
+	void set_channels(vector<DecodeChannel*> channels);
 
 	const map<string, GVariant*>& options() const;
 
 	void set_option(const char *id, GVariant *value);
 
+	void apply_all_options();
+
 	bool have_required_channels() const;
 
-	srd_decoder_inst* create_decoder_inst(srd_session *session) const;
+	srd_decoder_inst* create_decoder_inst(srd_session *session);
+	void invalidate_decoder_inst();
 
-	set< shared_ptr<pv::data::Logic> > get_data();
+	uint32_t get_binary_class_count() const;
+	const DecodeBinaryClassInfo* get_binary_class(uint32_t id) const;
 
 private:
-	const srd_decoder *const decoder_;
+	const srd_decoder* const srd_decoder_;
 
 	bool shown_;
 
-	map<const srd_channel*, shared_ptr<pv::data::SignalBase> > channels_;
+	vector<DecodeChannel*> channels_;
+	vector<DecodeBinaryClassInfo> bin_classes_;
 	map<string, GVariant*> options_;
+	srd_decoder_inst *decoder_inst_;
 };
 
 } // namespace decode