Read out the sample rate when loading files

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 5bdd23456cfbdf88e7044d638ef434897efe2557..88c603e20127baeb171d97b3ddbb154762c5d7cf 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,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;
@@ -54,20 +56,31 @@ class SigSession : public QObject
 public:
        enum capture_state {
                Stopped,
+               AwaitingTrigger,
                Running
        };
 
 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();
 
@@ -79,11 +92,37 @@ public:
 private:
        void set_capture_state(capture_state state);
 
+       void update_signals(const sr_dev_inst *const sdi);
+
+       bool is_trigger_enabled() const;
+
+       void read_sample_rate(const sr_dev_inst *const sdi);
+
 private:
-       void load_thread_proc(const std::string name);
+       /**
+        * Attempts to autodetect the format. Failing that
+        * @param filename The filename of the input file.
+        * @return A pointer to the 'struct sr_input_format' that should be
+        *      used, or NULL if no input format was selected or
+        *      auto-detected.
+        */
+       static sr_input_format* determine_input_file_format(
+               const std::string &filename);
+
+       static sr_input* load_input_file_format(
+               const std::string &filename,
+               boost::function<void (const QString)> error_handler,
+               sr_input_format *format = NULL);
+
+       void load_session_thread_proc(
+               boost::function<void (const QString)> error_handler);
+
+       void load_input_thread_proc(const std::string name, sr_input *in,
+               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);
 
@@ -98,12 +137,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;