Added empty context bar

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index b2dc467612655e59e1e189f78e813832f9b6bac4..f4e3d4af34d70b21cebe96992fc8f755797fb8a1 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -36,6 +36,8 @@
 
 namespace pv {
 
+class DeviceManager;
+
 namespace data {
 class Analog;
 class AnalogSnapshot;
@@ -58,17 +60,25 @@ public:
        };
 
 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);
 
        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();
@@ -81,7 +91,24 @@ public:
 private:
        void set_capture_state(capture_state state);
 
+       void update_signals();
+
 private:
+       /**
+        * 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_thread_proc(const std::string name,
                boost::function<void (const QString)> error_handler);
 
@@ -102,9 +129,16 @@ 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;