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

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 40fce89f..8520a1e7 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -18,58 +18,112 @@
  * 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/function.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <QObject>
+#include <QString>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 namespace pv {
 
-class LogicData;
-class LogicDataSnapshot;
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+}
+
+namespace view {
 class Signal;
+}
 
 class SigSession : public QObject
 {
 	Q_OBJECT
 
+public:
+	enum capture_state {
+		Stopped,
+		Running
+	};
+
 public:
 	SigSession();
 
 	~SigSession();
 
-	void load_file(const std::string &name);
+	void load_file(const std::string &name,
+		boost::function<void (const QString)> error_handler);
 
-	void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
-		uint64_t sample_rate);
+	capture_state get_capture_state() const;
 
-	std::vector< boost::shared_ptr<Signal> >&
+	void start_capture(struct sr_dev_inst* sdi,
+		uint64_t record_length,
+		boost::function<void (const QString)> error_handler);
+
+	void stop_capture();
+
+	std::vector< boost::shared_ptr<view::Signal> >
 		get_signals();
 
-	boost::shared_ptr<LogicData> get_data();
+	boost::shared_ptr<data::Logic> get_data();
 
 private:
+	void set_capture_state(capture_state state);
+
+private:
+	void load_thread_proc(const std::string name,
+		boost::function<void (const QString)> error_handler);
+
+	void sample_thread_proc(struct sr_dev_inst *sdi,
+		uint64_t record_length,
+		boost::function<void (const QString)> error_handler);
+
+	void feed_in_header(const sr_dev_inst *sdi);
+
+	void feed_in_meta(const sr_dev_inst *sdi,
+		const sr_datafeed_meta &meta);
+
+	void feed_in_logic(const sr_datafeed_logic &logic);
+
+	void feed_in_analog(const sr_datafeed_analog &analog);
+
 	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, void *cb_data);
 
 private:
-	std::vector< boost::shared_ptr<Signal> > _signals;
-	boost::shared_ptr<LogicData> _logic_data;
-	boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+	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<data::Logic> _logic_data;
+	boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
+	boost::shared_ptr<data::Analog> _analog_data;
+	boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
+
+	std::auto_ptr<boost::thread> _sampling_thread;
 
 signals:
+	void capture_state_changed(int state);
+
+	void signals_changed();
+
 	void data_updated();
 
 private:
@@ -81,4 +135,4 @@ private:
 
 } // namespace pv
 
-#endif // SIGSESSION_H
+#endif // PULSEVIEW_PV_SIGSESSION_H