X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=805f6ae07efda2f153a2514a24a64607b2e0f54d;hb=e8c9f8a5a3186f9c3e4f23ba4e35de7c59410bd3;hp=f4e3d4af34d70b21cebe96992fc8f755797fb8a1;hpb=b087ba7fd88610cbf54f6371367c7b9f9829dc63;p=pulseview.git diff --git a/pv/sigsession.h b/pv/sigsession.h index f4e3d4af..805f6ae0 100644 --- a/pv/sigsession.h +++ b/pv/sigsession.h @@ -56,6 +56,7 @@ class SigSession : public QObject public: enum capture_state { Stopped, + AwaitingTrigger, Running }; @@ -91,7 +92,9 @@ public: private: void set_capture_state(capture_state state); - void update_signals(); + void update_signals(const sr_dev_inst *const sdi); + + bool is_trigger_enabled() const; private: /** @@ -109,7 +112,10 @@ private: boost::function error_handler, sr_input_format *format = NULL); - void load_thread_proc(const std::string name, + void load_session_thread_proc( + boost::function error_handler); + + void load_input_thread_proc(const std::string name, sr_input *in, boost::function error_handler); void sample_thread_proc(struct sr_dev_inst *sdi,