X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=a06de7e14db9ae7e83813932d95c7fec1ae8a5cc;hb=e9213170687cf4afd14e20acdc690ff9381d94ae;hp=10d1e23de55d618d9a44ea36085955d23b55b3e7;hpb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 10d1e23..a06de7e 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -21,8 +21,6 @@
 #ifndef PULSEVIEW_PV_SIGSESSION_H
 #define PULSEVIEW_PV_SIGSESSION_H
 
-#include <boost/function.hpp>
-
 #include <map>
 #include <memory>
 #include <mutex>
@@ -94,7 +92,7 @@ public:
 
 	capture_state get_capture_state() const;
 
-	void start_capture(boost::function<void (const QString)> error_handler);
+	void start_capture(std::function<void (const QString)> error_handler);
 
 	void stop_capture();
 
@@ -135,11 +133,11 @@ private:
 
 	static sr_input* load_input_file_format(
 		const std::string &filename,
-		boost::function<void (const QString)> error_handler,
+		std::function<void (const QString)> error_handler,
 		sr_input_format *format = NULL);
 
 	void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
-		boost::function<void (const QString)> error_handler);
+		std::function<void (const QString)> error_handler);
 
 	void feed_in_header(const sr_dev_inst *sdi);
 
@@ -182,7 +180,7 @@ private:
 
 	std::thread _sampling_thread;
 
-signals:
+Q_SIGNALS:
 	void capture_state_changed(int state);
 
 	void signals_changed();
@@ -198,6 +196,16 @@ private:
 	// sessions should should be supported and it should be
 	// possible to associate a pointer with a sr_session.
 	static SigSession *_session;
+
+public:
+	// TODO: Even more of a hack. The libsigrok API now allows for
+	// multiple sessions. However sr_session_* calls are scattered
+	// around the PV architecture and a single SigSession object is
+	// being used across multiple sequential sessions, which are
+	// created and destroyed in other classes in pv::device. This
+	// is a mess. For now just keep a single sr_session pointer here
+	// which we can use for all those scattered calls.
+	static struct sr_session *_sr_session;
 };
 
 } // namespace pv