X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.h;h=339c1e0386daf3cd1b9421b67613956564444428;hp=844a2b547cef8f353007e09029b855024c2a4f44;hb=dd048a7ec035447c051c7937ce04aca5be065b4e;hpb=6e89374a6796f8d5d9cc61b0a2f7e98562a034ae

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 844a2b5..339c1e0 100644
--- a/pv/data/decoderstack.h
+++ b/pv/data/decoderstack.h
@@ -23,7 +23,7 @@
 
 #include "signaldata.h"
 
-#include <map>
+#include <list>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
@@ -31,9 +31,11 @@
 #include <QObject>
 #include <QString>
 
-#include <glib.h>
+#include <pv/data/decode/row.h>
+#include <pv/data/decode/rowdata.h>
 
 struct srd_decoder;
+struct srd_decoder_annotation_row;
 struct srd_probe;
 struct srd_proto_data;
 
@@ -45,15 +47,15 @@ namespace pv {
 
 namespace view {
 class LogicSignal;
+}
+
+namespace data {
 
 namespace decode {
 class Annotation;
+class Decoder;
 }
 
-}
-
-namespace data {
-
 class Logic;
 
 class DecoderStack : public QObject, public SignalData
@@ -70,27 +72,31 @@ public:
 
 	virtual ~DecoderStack();
 
-	const srd_decoder* decoder() const;
-
-	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::list< boost::shared_ptr<decode::Decoder> >& stack() const;
+	void push(boost::shared_ptr<decode::Decoder> decoder);
+	void remove(int index);
 
-	const GHashTable* options() const;
+	int64_t samples_decoded() const;
 
-	void set_option(const char *id, GVariant *value);
+	std::vector<decode::Row> get_visible_rows() const;
 
-	const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
-		annotations() const;
+	/**
+	 * Extracts sorted annotations between two period into a vector.
+	 */
+	void get_annotation_subset(
+		std::vector<pv::data::decode::Annotation> &dest,
+		const decode::Row &row, uint64_t start_sample,
+		uint64_t end_sample) const;
 
 	QString error_message();
 
-	void clear_snapshots();
+	void clear();
+
+	uint64_t get_max_sample_count() const;
 
-private:
 	void begin_decode();
 
+private:
 	void decode_proc(boost::shared_ptr<data::Logic> data);
 
 	static void annotation_callback(srd_proto_data *pdata,
@@ -109,14 +115,15 @@ private:
 	 */
 	static boost::mutex _global_decode_mutex;
 
-	const srd_decoder *const _decoder;
-	std::map<const srd_probe*, boost::shared_ptr<view::LogicSignal> >
-		_probes;
-	GHashTable *_options;
+	std::list< boost::shared_ptr<decode::Decoder> > _stack;
 
 	mutable boost::mutex _mutex;
-	std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
-		_annotations;
+	int64_t	_samples_decoded;
+
+	std::map<const decode::Row, decode::RowData> _rows;
+
+	std::map<std::pair<const srd_decoder*, int>, decode::Row> _class_rows;
+
 	QString _error_message;
 
 	boost::thread _decode_thread;