X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.hpp;h=e2bf1bd9283b1ed8c39f580f9de039915ffabd2e;hb=da50281d69f15d125b56971a3009fd31cbbab58b;hp=e8aeed10f2b09da3db62e8fbc82c317c383ed536;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb;p=pulseview.git

diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index e8aeed1..e2bf1bd 100644
--- a/pv/data/decoderstack.hpp
+++ b/pv/data/decoderstack.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_H
-#define PULSEVIEW_PV_DATA_DECODERSTACK_H
+#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_HPP
+#define PULSEVIEW_PV_DATA_DECODERSTACK_HPP
 
 #include "signaldata.hpp"
 
@@ -37,6 +37,7 @@
 
 #include <pv/data/decode/row.hpp>
 #include <pv/data/decode/rowdata.hpp>
+#include <pv/util.hpp>
 
 struct srd_decoder;
 struct srd_decoder_annotation_row;
@@ -58,7 +59,7 @@ class LogicSignal;
 
 namespace data {
 
-class LogicSnapshot;
+class LogicSegment;
 
 namespace decode {
 class Annotation;
@@ -67,7 +68,7 @@ class Decoder;
 
 class Logic;
 
-class DecoderStack : public QObject, public SignalData
+class DecoderStack : public QObject
 {
 	Q_OBJECT
 
@@ -87,6 +88,10 @@ public:
 	void push(std::shared_ptr<decode::Decoder> decoder);
 	void remove(int index);
 
+	double samplerate() const;
+
+	const pv::util::Timestamp& start_time() const;
+
 	int64_t samples_decoded() const;
 
 	std::vector<decode::Row> get_visible_rows() const;
@@ -103,7 +108,7 @@ public:
 
 	void clear();
 
-	uint64_t get_max_sample_count() const;
+	uint64_t max_sample_count() const;
 
 	void begin_decode();
 
@@ -131,17 +136,20 @@ Q_SIGNALS:
 private:
 	pv::Session &session_;
 
+	pv::util::Timestamp start_time_;
+	double samplerate_;
+
 	/**
-	 * This mutex prevents more than one decode operation occuring
-	 * concurrently.
+	 * This mutex prevents more than one thread from accessing
+	 * libsigrokdecode concurrently.
 	 * @todo A proper solution should be implemented to allow multiple
-	 * decode operations.
+	 * decode operations in parallel.
 	 */
-	static std::mutex global_decode_mutex_;
+	static std::mutex global_srd_mutex_;
 
 	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_;
@@ -166,4 +174,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
+#endif // PULSEVIEW_PV_DATA_DECODERSTACK_HPP