Device: add support for list of discrete values for probe factor

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

diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index 99df3887ce422a5a88f718d5c223c108023f65e3..7be7308bdda98ec8bd68edcb83ec02c44f573012 100644 (file)
--- a/pv/data/decoderstack.hpp
+++ b/pv/data/decoderstack.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;
@@ -78,8 +79,7 @@ private:
        static const unsigned int DecodeNotifyPeriod;
 
 public:
-       DecoderStack(pv::Session &session_,
-               const srd_decoder *const decoder);
+       DecoderStack(pv::Session &session, const srd_decoder *const dec);
 
        virtual ~DecoderStack();
 
@@ -89,7 +89,7 @@ public:
 
        double samplerate() const;
 
-       double start_time() const;
+       const pv::util::Timestamp& start_time() const;
 
        int64_t samples_decoded() const;
 
@@ -135,16 +135,16 @@ Q_SIGNALS:
 private:
        pv::Session &session_;
 
-       double start_time_;
+       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_;