X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=deb95ed8b2cb8b18bf36235fbd453e9195ade31d;hp=b6e5a56842c5c79def1356532001823e3eb3cd69;hb=949f80503dff6502f9624aae8fa1ba26f2ea6b6c;hpb=640d091b45b196cc586fbc6a7bec71c5c7d75544

diff --git a/pv/sigsession.h b/pv/sigsession.h
index b6e5a568..deb95ed8 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -22,8 +22,10 @@
 #define PULSEVIEW_PV_SIGSESSION_H
 
 #include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -36,12 +38,21 @@ namespace pv {
 
 class LogicData;
 class LogicDataSnapshot;
+
+namespace view {
 class Signal;
+}
 
 class SigSession : public QObject
 {
 	Q_OBJECT
 
+public:
+	enum capture_state {
+		Stopped,
+		Running
+	};
+
 public:
 	SigSession();
 
@@ -49,27 +60,56 @@ public:
 
 	void load_file(const std::string &name);
 
+	capture_state get_capture_state() const;
+
 	void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
 		uint64_t sample_rate);
 
-	std::vector< boost::shared_ptr<Signal> >&
+	void stop_capture();
+
+	std::vector< boost::shared_ptr<view::Signal> >
 		get_signals();
 
 	boost::shared_ptr<LogicData> get_data();
 
 private:
+	void set_capture_state(capture_state state);
+
+private:
+	void load_thread_proc(const std::string name);
+
+	void sample_thread_proc(struct sr_dev_inst *sdi,
+		uint64_t record_length, uint64_t sample_rate);
+
+	void feed_in_meta_logic(const struct sr_dev_inst *sdi,
+		const sr_datafeed_meta_logic &meta_logic);
+
+	void feed_in_logic(const sr_datafeed_logic &logic);
+
 	void data_feed_in(const struct sr_dev_inst *sdi,
-		struct sr_datafeed_packet *packet);
+		const struct sr_datafeed_packet *packet);
 
 	static void data_feed_in_proc(const struct sr_dev_inst *sdi,
-		struct sr_datafeed_packet *packet);
+		const struct sr_datafeed_packet *packet);
 
 private:
-	std::vector< boost::shared_ptr<Signal> > _signals;
+	mutable boost::mutex _sampling_mutex;
+	capture_state _capture_state;
+
+	mutable boost::mutex _signals_mutex;
+	std::vector< boost::shared_ptr<view::Signal> > _signals;
+
+	mutable boost::mutex _data_mutex;
 	boost::shared_ptr<LogicData> _logic_data;
 	boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
 
+	std::auto_ptr<boost::thread> _sampling_thread;
+
 signals:
+	void capture_state_changed(int state);
+
+	void signals_changed();
+
 	void data_updated();
 
 private: