X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=527b988a92a8be6dfdfac6eaa7e2b2db2772165d;hb=db51130df74d9188d98e1a3b8073d9d482d6fa60;hp=fad3db78548457d25e61f9b4f7dc0bf8042243cf;hpb=cf1541a18fcd007c9965a3199b9c4f917856b292;p=pulseview.git diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index fad3db78..527b988a 100644 --- a/pv/data/decodesignal.hpp +++ b/pv/data/decodesignal.hpp @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -79,7 +80,7 @@ struct DecodeSegment // Constructor is a no-op DecodeSegment() { }; // Copy constructor is a no-op - DecodeSegment(DecodeSegment&& ds) { (void)ds; }; + DecodeSegment(DecodeSegment&& ds) { (void)ds; qCritical() << "Empty DecodeSegment copy constructor called"; }; map annotation_rows; // Note: Row is the same for all segments while RowData is not pv::util::Timestamp start_time; @@ -209,6 +210,9 @@ private: void stop_srd_session(); void connect_input_notifiers(); + void disconnect_input_notifiers(); + void connect_input_segment_notifiers(uint32_t segment_id); + void disconnect_input_segment_notifiers(uint32_t segment_id); void create_decode_segment(); @@ -229,6 +233,7 @@ private Q_SLOTS: void on_capture_state_changed(int state); void on_data_cleared(); void on_data_received(); + void on_input_segment_completed(); void on_annotation_visibility_changed(); @@ -246,7 +251,7 @@ private: vector< shared_ptr > stack_; bool stack_config_changed_; - vector segments_; + deque segments_; uint32_t current_segment_id_; mutable mutex input_mutex_, output_mutex_, decode_pause_mutex_, logic_mux_mutex_;