Ported pv::prop::binding::DeviceOptions to GVariants

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 5bdd23456cfbdf88e7044d638ef434897efe2557..b2dc467612655e59e1e189f78e813832f9b6bac4 100644 (file)
--- 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,12 @@ 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);
 
@@ -103,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;