Made the sdi a persisent property of SigSession

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 7805eec65085ee24d7d2f8917eb09f0eca774172..fa2c7af413db55b174ad78ffa85593f409e69975 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,6 +30,7 @@
 #include <vector>
 
 #include <QObject>
+#include <QString>
 
 #include <libsigrok/libsigrok.h>
 
@@ -60,12 +62,23 @@ public:
 
        ~SigSession();
 
-       void load_file(const std::string &name);
+       /**
+        * Gets device instance that will be used in the next capture session.
+        */
+       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 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);
+       void start_capture(uint64_t record_length,
+               boost::function<void (const QString)> error_handler);
 
        void stop_capture();
 
@@ -78,10 +91,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);
 
@@ -96,9 +111,15 @@ 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:
+
+       /**
+        * 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;