X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=8da89d09b3fd6d0cde07fea0fde589d90e779902;hp=40fce89fdb7660bce2b276e1dd4bcac2f27148d7;hb=5b7cf66c34d7beeef055b06b95d72f9d7a3de680;hpb=51e77110d4316fd0106f8306f5e1f0523c5bf7d7

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 40fce89f..8da89d09 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -18,12 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGSESSION_H
-#define SIGSESSION_H
+#ifndef PULSEVIEW_PV_SIGSESSION_H
+#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,15 +60,22 @@ 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 sample_thread_proc(struct sr_dev_inst *sdi,
+		uint64_t record_length, uint64_t sample_rate);
+
 	void data_feed_in(const struct sr_dev_inst *sdi,
 		struct sr_datafeed_packet *packet);
 
@@ -65,11 +83,21 @@ private:
 		struct sr_datafeed_packet *packet);
 
 private:
-	std::vector< boost::shared_ptr<Signal> > _signals;
+	mutable boost::mutex _state_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 signals_changed();
+
 	void data_updated();
 
 private:
@@ -81,4 +109,4 @@ private:
 
 } // namespace pv
 
-#endif // SIGSESSION_H
+#endif // PULSEVIEW_PV_SIGSESSION_H