Enumerate probes when session is loaded

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 1978293481423b0dbae4645c6f57d38e98ceb2e1..805f6ae07efda2f153a2514a24a64607b2e0f54d 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -36,6 +36,8 @@
 
 namespace pv {
 
+class DeviceManager;
+
 namespace data {
 class Analog;
 class AnalogSnapshot;
@@ -54,19 +56,24 @@ class SigSession : public QObject
 public:
        enum capture_state {
                Stopped,
+               AwaitingTrigger,
                Running
        };
 
 public:
-       SigSession();
+       SigSession(DeviceManager &device_manager);
 
        ~SigSession();
 
+       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);
 
@@ -85,8 +92,30 @@ public:
 private:
        void set_capture_state(capture_state state);
 
+       void update_signals(const sr_dev_inst *const sdi);
+
+       bool is_trigger_enabled() const;
+
 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,
@@ -109,6 +138,7 @@ private:
                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.