X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=83a73f4af7678252dc28b0afee6f25cf2b02b553;hb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;hp=689b3f832dcf40752f789fb9f3bc59db2e64bc98;hpb=e71eb81c946c3524e01eaef9781ccbf170143d0c;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 689b3f8..83a73f4 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -31,7 +31,7 @@
 #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
@@ -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;
 }
 
@@ -71,8 +74,7 @@ class Device;
 
 namespace view {
 class DecodeTrace;
-class LogicSignal;
-class Signal;
+class View;
 }
 
 class Session : public QObject
@@ -112,12 +114,14 @@ public:
 
 	void stop_capture();
 
-	std::set< std::shared_ptr<data::SignalData> > get_data() const;
+	double get_samplerate() const;
+
+	void register_view(std::shared_ptr<pv::view::View> view);
 
-	boost::shared_mutex& signals_mutex() const;
+	void deregister_view(std::shared_ptr<pv::view::View> view);
 
-	const std::unordered_set< std::shared_ptr<view::Signal> >&
-		signals() const;
+	const std::unordered_set< std::shared_ptr<data::SignalBase> >
+		signalbases() const;
 
 #ifdef ENABLE_DECODE
 	bool add_decoder(srd_decoder *const dec);
@@ -133,17 +137,18 @@ private:
 
 	void update_signals();
 
-	std::shared_ptr<view::Signal> signal_from_channel(
+	std::shared_ptr<data::SignalBase> signalbase_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);
@@ -157,13 +162,16 @@ private:
 	DeviceManager &device_manager_;
 	std::shared_ptr<devices::Device> device_;
 
+	std::unordered_set< std::shared_ptr<pv::view::View> > views_;
+
 	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::unordered_set< std::shared_ptr<data::SignalBase> > signalbases_;
+	std::unordered_set< std::shared_ptr<data::SignalData> > all_signal_data_;
 
 	mutable std::recursive_mutex data_mutex_;
 	std::shared_ptr<data::Logic> logic_data_;
@@ -182,6 +190,8 @@ Q_SIGNALS:
 
 	void signals_changed();
 
+	void trigger_event(util::Timestamp location);
+
 	void frame_began();
 
 	void data_received();