Modified header guards to match file names

[pulseview.git] / pv / data / decoderstack.hpp

diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index e8aeed10f2b09da3db62e8fbc82c317c383ed536..cd380dfbec22a97e3ebfc737a1fe762adff10fc2 100644 (file)
--- 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"
 
@@ -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
 
@@ -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;
@@ -131,6 +135,9 @@ Q_SIGNALS:
 private:
        pv::Session &session_;
 
+       double start_time_;
+       double samplerate_;
+
        /**
         * This mutex prevents more than one decode operation occuring
         * concurrently.
@@ -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_;
@@ -166,4 +173,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
+#endif // PULSEVIEW_PV_DATA_DECODERSTACK_HPP