X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=e113cf4fdb77711d33a4aac0b45cff49521e88ce;hb=2b05d3110a0a50ce93c8c887a2dc00c1375e92fa;hp=0a8f018cbc1216a898d63d0393f80236cca486f7;hpb=2220e94218298b208041c5e828595d9e1b842c88;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 0a8f018..e113cf4 100644
--- 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;
 
@@ -112,8 +114,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> >
@@ -137,13 +137,14 @@ private:
 		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,11 +160,12 @@ 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::SignalData> > all_signal_data_;
 
 	mutable std::recursive_mutex data_mutex_;
 	std::shared_ptr<data::Logic> logic_data_;
@@ -182,6 +184,8 @@ Q_SIGNALS:
 
 	void signals_changed();
 
+	void trigger_event(util::Timestamp location);
+
 	void frame_began();
 
 	void data_received();