X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=9148ba9bdcaafd8985f5b1f7c833f87d3b1e81f0;hp=19fd993872edc04ba8bae3ca8ad11568dce9a894;hb=7ea2a4ff0765fdad34b84e4b4631d6f3f5588714;hpb=056f443e2a6f8db80161ce08d7ff8111175bc3d6 diff --git a/pv/session.hpp b/pv/session.hpp index 19fd9938..9148ba9b 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -165,6 +165,8 @@ public: uint32_t get_segment_count() const; + vector get_triggers(uint32_t segment_id) const; + void register_view(shared_ptr view); void deregister_view(shared_ptr view); @@ -224,7 +226,7 @@ Q_SIGNALS: void name_changed(); - void trigger_event(util::Timestamp location); + void trigger_event(int segment_id, util::Timestamp location); void new_segment(int new_segment_id); void segment_completed(int segment_id); @@ -253,6 +255,9 @@ private: unordered_set< shared_ptr > signalbases_; unordered_set< shared_ptr > all_signal_data_; + /// trigger_list_ contains pairs of values. + vector< std::pair > trigger_list_; + mutable recursive_mutex data_mutex_; shared_ptr logic_data_; uint64_t cur_samplerate_;