X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fsession.hpp;h=f2f8c7c8e26549be7e6ba8a5e5977c3faf6b10f2;hb=3e8a7cc6af5558a249c114b1609ececa2a381774;hp=3d303da47f198a6b3f88d046298126b4d5453270;hpb=e7216ae0a66fe1563514cbd3f67f2e240d010315;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 3d303da4..f2f8c7c8 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -31,15 +31,17 @@
 #include <vector>
 
 #ifdef _WIN32
-// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h).
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
 #define NOGDI
 #define NORESOURCE
 #endif
-#include <boost/thread.hpp>
+#include <boost/thread/shared_mutex.hpp>
 
 #include <QObject>
 #include <QString>
 
+#include "util.hpp"
+
 struct srd_decoder;
 struct srd_channel;
 
@@ -114,9 +116,9 @@ public:
 
 	std::set< std::shared_ptr<data::SignalData> > get_data() const;
 
-	boost::shared_mutex& signals_mutex() const;
+	double get_samplerate() const;
 
-	const std::unordered_set< std::shared_ptr<view::Signal> >&
+	const std::unordered_set< std::shared_ptr<view::Signal> >
 		signals() const;
 
 #ifdef ENABLE_DECODE
@@ -144,6 +146,8 @@ private:
 
 	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);
@@ -182,6 +186,8 @@ Q_SIGNALS:
 
 	void signals_changed();
 
+	void trigger_event(util::Timestamp location);
+
 	void frame_began();
 
 	void data_received();