Introduce pv::data::SignalBase

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 0a8f018cbc1216a898d63d0393f80236cca486f7..4c6c73e37483e60f3b72ace3fd68b6a26befd8e0 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -40,6 +40,8 @@
 #include <QObject>
 #include <QString>
 
+#include "util.hpp"
+
 struct srd_decoder;
 struct srd_channel;
 
@@ -62,6 +64,7 @@ class Analog;
 class AnalogSegment;
 class Logic;
 class LogicSegment;
+class SignalBase;
 class SignalData;
 }
 
@@ -112,8 +115,6 @@ public:
 
        void stop_capture();
 
-       std::set< std::shared_ptr<data::SignalData> > get_data() const;
-
        double get_samplerate() const;
 
        const std::unordered_set< std::shared_ptr<view::Signal> >
@@ -133,17 +134,18 @@ private:
 
        void update_signals();
 
-       std::shared_ptr<view::Signal> signal_from_channel(
+       std::shared_ptr<data::SignalBase> signal_from_channel(
                std::shared_ptr<sigrok::Channel> channel) const;
 
 private:
-       void sample_thread_proc(std::shared_ptr<devices::Device> device,
-               std::function<void (const QString)> error_handler);
+       void sample_thread_proc(std::function<void (const QString)> error_handler);
 
        void feed_in_header();
 
        void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
 
+       void feed_in_trigger();
+
        void feed_in_frame_begin();
 
        void feed_in_logic(std::shared_ptr<sigrok::Logic> logic);
@@ -159,12 +161,15 @@ private:
 
        std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
 
-       mutable std::mutex sampling_mutex_;
+       mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
        capture_state capture_state_;
 
        mutable boost::shared_mutex signals_mutex_;
        std::unordered_set< std::shared_ptr<view::Signal> > signals_;
 
+       std::set< std::shared_ptr<data::SignalBase> > signalbases_;
+       std::set< std::shared_ptr<data::SignalData> > all_signal_data_;
+
        mutable std::recursive_mutex data_mutex_;
        std::shared_ptr<data::Logic> logic_data_;
        uint64_t cur_samplerate_;
@@ -182,6 +187,8 @@ Q_SIGNALS:
 
        void signals_changed();
 
+       void trigger_event(util::Timestamp location);
+
        void frame_began();
 
        void data_received();