X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=4c6c73e37483e60f3b72ace3fd68b6a26befd8e0;hp=f5c87f694f8e22a574307e7ae3568968423df9e8;hb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;hpb=8e99ef9634a6c91d38e85c3fa7587a4ae22fcd2b

diff --git a/pv/session.hpp b/pv/session.hpp
index f5c87f6..4c6c73e 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;
 
@@ -62,9 +64,14 @@ class Analog;
 class AnalogSegment;
 class Logic;
 class LogicSegment;
+class SignalBase;
 class SignalData;
 }
 
+namespace devices {
+class Device;
+}
+
 namespace view {
 class DecodeTrace;
 class LogicSignal;
@@ -91,20 +98,14 @@ public:
 
 	const DeviceManager& device_manager() const;
 
-	const std::shared_ptr<sigrok::Session>& session() const;
+	std::shared_ptr<sigrok::Session> session() const;
 
-	std::shared_ptr<sigrok::Device> device() const;
+	std::shared_ptr<devices::Device> device() const;
 
 	/**
 	 * Sets device instance that will be used in the next capture session.
 	 */
-	void set_device(std::shared_ptr<sigrok::Device> device);
-
-	/**
-	 * Sets a sigrok session file as the capture device.
-	 * @param name the path to the file.
-	 */
-	void set_session_file(const std::string &name);
+	void set_device(std::shared_ptr<devices::Device> device);
 
 	void set_default_device();
 
@@ -114,11 +115,9 @@ public:
 
 	void stop_capture();
 
-	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
@@ -133,21 +132,19 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals(std::shared_ptr<sigrok::Device> device);
+	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;
 
-	void read_sample_rate(std::shared_ptr<sigrok::Device>);
-
 private:
-	void sample_thread_proc(std::shared_ptr<sigrok::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_header(std::shared_ptr<sigrok::Device> device);
+	void feed_in_meta(std::shared_ptr<sigrok::Meta> meta);
 
-	void feed_in_meta(std::shared_ptr<sigrok::Device> device,
-		std::shared_ptr<sigrok::Meta> meta);
+	void feed_in_trigger();
 
 	void feed_in_frame_begin();
 
@@ -160,22 +157,20 @@ private:
 
 private:
 	DeviceManager &device_manager_;
-	std::shared_ptr<sigrok::Session> session_;
-
-	/**
-	 * The device instance that will be used in the next capture session.
-	 */
-	std::shared_ptr<sigrok::Device> device_;
+	std::shared_ptr<devices::Device> device_;
 
 	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_;
 
-	mutable std::mutex data_mutex_;
+	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_;
 	std::shared_ptr<data::LogicSegment> cur_logic_segment_;
@@ -184,12 +179,16 @@ private:
 
 	std::thread sampling_thread_;
 
+	bool out_of_memory_;
+
 Q_SIGNALS:
 	void capture_state_changed(int state);
 	void device_selected();
 
 	void signals_changed();
 
+	void trigger_event(util::Timestamp location);
+
 	void frame_began();
 
 	void data_received();