Invoke signals_changed outside locked region

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index fa2c7af413db55b174ad78ffa85593f409e69975..50768e6caf037152aafc62cf21ebae4799c4fb83 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -34,8 +34,12 @@
 
 #include <libsigrok/libsigrok.h>
 
+struct srd_decoder;
+
 namespace pv {
 
+class DeviceManager;
+
 namespace data {
 class Analog;
 class AnalogSnapshot;
@@ -44,6 +48,7 @@ class LogicSnapshot;
 }
 
 namespace view {
+class DecodeSignal;
 class Signal;
 }
 
@@ -54,17 +59,15 @@ class SigSession : public QObject
 public:
        enum capture_state {
                Stopped,
+               AwaitingTrigger,
                Running
        };
 
 public:
-       SigSession();
+       SigSession(DeviceManager &device_manager);
 
        ~SigSession();
 
-       /**
-        * Gets device instance that will be used in the next capture session.
-        */
        struct sr_dev_inst* get_device() const;
 
        /**
@@ -72,6 +75,8 @@ public:
         */
        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);
 
@@ -87,11 +92,37 @@ public:
 
        boost::shared_ptr<data::Logic> get_data();
 
+       void add_decoder(srd_decoder *const dec);
+
 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,
@@ -114,12 +145,15 @@ 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.
         */
        struct sr_dev_inst *_sdi;
 
+       std::vector< boost::shared_ptr<view::DecodeSignal> > _decode_traces;
+
        mutable boost::mutex _sampling_mutex;
        capture_state _capture_state;