X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=88c603e20127baeb171d97b3ddbb154762c5d7cf;hb=df840662d228637f84d44ec24005e8b9bed8628f;hp=1638db838f91ecc89623002adc3ab8a41c741e55;hpb=728e5ef71a1a87e764f78bfbdd3cc4cc1da1163c;p=pulseview.git diff --git a/pv/sigsession.h b/pv/sigsession.h index 1638db8..88c603e 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,6 +92,12 @@ 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: /** * Attempts to autodetect the format. Failing that @@ -107,7 +114,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,