X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=b2dc467612655e59e1e189f78e813832f9b6bac4;hp=177e47c9b0ccc1d3cc20385f16b9d5e1e75426d9;hb=4d5d5d6aeb7d936fb6b939f6c6531b3f054dac1f;hpb=be73bdfa788fcc62bda3187cb1ba04fed2b9d721

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 177e47c9..b2dc4676 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,10 +30,9 @@
 #include <vector>
 
 #include <QObject>
+#include <QString>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 namespace pv {
 
@@ -62,12 +62,14 @@ public:
 
 	~SigSession();
 
-	void load_file(const std::string &name);
+	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(struct sr_dev_inst* sdi,
+		uint64_t record_length,
+		boost::function<void (const QString)> error_handler);
 
 	void stop_capture();
 
@@ -80,10 +82,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);
@@ -101,7 +107,6 @@ private:
 private:
 	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;