X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.hpp;h=383109905c03ae5e23912d186c6214b58b4a70bf;hb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b;hp=979a56fa0699f306075609f1e5959cbd65056624;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git

diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index 979a56f..3831099 100644
--- a/pv/data/decoderstack.hpp
+++ b/pv/data/decoderstack.hpp
@@ -50,7 +50,7 @@ struct TwoDecoderStack;
 
 namespace pv {
 
-class SigSession;
+class Session;
 
 namespace view {
 class LogicSignal;
@@ -58,7 +58,7 @@ class LogicSignal;
 
 namespace data {
 
-class LogicSnapshot;
+class LogicSegment;
 
 namespace decode {
 class Annotation;
@@ -67,7 +67,7 @@ class Decoder;
 
 class Logic;
 
-class DecoderStack : public QObject, public SignalData
+class DecoderStack : public QObject
 {
 	Q_OBJECT
 
@@ -78,7 +78,7 @@ private:
 	static const unsigned int DecodeNotifyPeriod;
 
 public:
-	DecoderStack(pv::SigSession &session_,
+	DecoderStack(pv::Session &session_,
 		const srd_decoder *const decoder);
 
 	virtual ~DecoderStack();
@@ -87,6 +87,10 @@ public:
 	void push(std::shared_ptr<decode::Decoder> decoder);
 	void remove(int index);
 
+	double samplerate() const;
+
+	double start_time() const;
+
 	int64_t samples_decoded() const;
 
 	std::vector<decode::Row> get_visible_rows() const;
@@ -129,7 +133,10 @@ Q_SIGNALS:
 	void new_decode_data();
 
 private:
-	pv::SigSession &session_;
+	pv::Session &session_;
+
+	double start_time_;
+	double samplerate_;
 
 	/**
 	 * This mutex prevents more than one decode operation occuring
@@ -141,7 +148,7 @@ private:
 
 	std::list< std::shared_ptr<decode::Decoder> > stack_;
 
-	std::shared_ptr<pv::data::LogicSnapshot> snapshot_;
+	std::shared_ptr<pv::data::LogicSegment> segment_;
 
 	mutable std::mutex input_mutex_;
 	mutable std::condition_variable input_cond_;