X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.hpp;h=545992f8a24a379b2381c93739432656aa45bcc7;hb=63e9fa9d569cfa2f098054b49317b6030a425f17;hp=b7ef608033b8d84a4a60217f455e30c26e107b2f;hpb=a82325d16a1412f3474423fa3fa56bb85af1fb00;p=pulseview.git

diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index b7ef6080..545992f8 100644
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -28,6 +28,7 @@
 #include <glib.h>
 
 #include <pv/data/signalbase.hpp>
+#include <pv/data/decode/row.hpp>
 
 using std::map;
 using std::string;
@@ -49,6 +50,15 @@ namespace decode {
 
 class Decoder;
 
+struct AnnotationClass
+{
+	size_t id;
+	char* name;
+	char* description;
+	Row* row;
+	bool visible;
+};
+
 struct DecodeChannel
 {
 	uint16_t id;     ///< Global numerical ID for the decode channels in the stack
@@ -61,6 +71,13 @@ struct DecodeChannel
 	const srd_channel *pdch_;
 };
 
+struct DecodeBinaryClassInfo
+{
+	uint32_t bin_class_id;
+	char* name;
+	char* description;
+};
+
 
 class Decoder
 {
@@ -69,10 +86,12 @@ public:
 
 	virtual ~Decoder();
 
-	const srd_decoder* decoder() const;
+	const srd_decoder* get_srd_decoder() const;
 
-	bool shown() const;
-	void show(bool show = true);
+	const char* name() const;
+
+	bool visible() const;
+	void set_visible(bool visible);
 
 	const vector<DecodeChannel*>& channels() const;
 	void set_channels(vector<DecodeChannel*> channels);
@@ -88,14 +107,25 @@ public:
 	srd_decoder_inst* create_decoder_inst(srd_session *session);
 	void invalidate_decoder_inst();
 
+	vector<Row*> get_rows();
+	Row* get_row_by_id(size_t id);
+
+	vector<const AnnotationClass*> ann_classes() const;
+	vector<AnnotationClass*> ann_classes();
+	AnnotationClass* get_ann_class_by_id(size_t id);
 
+	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_;
+	bool visible_;
 
 	vector<DecodeChannel*> channels_;
+	vector<Row> rows_;
+	vector<AnnotationClass> ann_classes_;
+	vector<DecodeBinaryClassInfo> bin_classes_;
 	map<string, GVariant*> options_;
 	srd_decoder_inst *decoder_inst_;
 };