X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=ae33c3a8a508713acde59c650cfadaeb256e634e;hb=1d43d7677a7ead4ee6e1da49d87a1848b45ef75d;hp=177e47c9b0ccc1d3cc20385f16b9d5e1e75426d9;hpb=be73bdfa788fcc62bda3187cb1ba04fed2b9d721;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 177e47c..ae33c3a 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -21,6 +21,7 @@
 #ifndef PULSEVIEW_PV_SIGSESSION_H
 #define PULSEVIEW_PV_SIGSESSION_H
 
+#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
@@ -29,13 +30,14 @@
 #include <vector>
 
 #include <QObject>
+#include <QString>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 namespace pv {
 
+class DeviceManager;
+
 namespace data {
 class Analog;
 class AnalogSnapshot;
@@ -58,16 +60,26 @@ public:
 	};
 
 public:
-	SigSession();
+	SigSession(DeviceManager &device_manager);
 
 	~SigSession();
 
-	void load_file(const std::string &name);
+	struct sr_dev_inst* get_device() const;
+
+	/**
+	 * Sets device instance that will be used in the next capture session.
+	 */
+	void set_device(struct sr_dev_inst *sdi);
+
+	void release_device(struct sr_dev_inst *sdi);
+
+	void load_file(const std::string &name,
+		boost::function<void (const QString)> error_handler);
 
 	capture_state get_capture_state() const;
 
-	void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
-		uint64_t sample_rate);
+	void start_capture(uint64_t record_length,
+		boost::function<void (const QString)> error_handler);
 
 	void stop_capture();
 
@@ -80,10 +92,14 @@ private:
 	void set_capture_state(capture_state state);
 
 private:
-	void load_thread_proc(const std::string name);
+	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);
+		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);
@@ -96,12 +112,18 @@ private:
 		const struct sr_datafeed_packet *packet);
 
 	static void data_feed_in_proc(const struct sr_dev_inst *sdi,
-		const struct sr_datafeed_packet *packet);
+		const struct sr_datafeed_packet *packet, void *cb_data);
 
 private:
+	DeviceManager &_device_manager;
+
+	/**
+	 * The device instance that will be used in the next capture session.
+	 */
+	struct sr_dev_inst *_sdi;
+
 	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;
-	uint64_t _sample_rate;
 
 	mutable boost::mutex _signals_mutex;
 	std::vector< boost::shared_ptr<view::Signal> > _signals;