X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.hpp;h=cd380dfbec22a97e3ebfc737a1fe762adff10fc2;hp=e8aeed10f2b09da3db62e8fbc82c317c383ed536;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp index e8aeed1..cd380df 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" @@ -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 decoder); void remove(int index); + double samplerate() const; + + double start_time() const; + int64_t samples_decoded() const; std::vector 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 > stack_; - std::shared_ptr snapshot_; + std::shared_ptr 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