X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=2ee31cfee5afb8ef6de44171322d1d20086e755a;hp=76019612a977eaff33fed75c6c5d932897863a2a;hb=f6b6c9bf50999dc99f9517318ffd3114cae4960f;hpb=341d9a7975be53bb44af8d2deeba9b4a5e086929

diff --git a/pv/session.hpp b/pv/session.hpp
index 76019612..2ee31cfe 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -20,6 +20,7 @@
 #ifndef PULSEVIEW_PV_SESSION_HPP
 #define PULSEVIEW_PV_SESSION_HPP
 
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
@@ -163,7 +164,9 @@ public:
 
 	double get_samplerate() const;
 
-	int get_segment_count() const;
+	uint32_t get_segment_count() const;
+
+	vector<util::Timestamp> get_triggers(uint32_t segment_id) const;
 
 	void register_view(shared_ptr<views::ViewBase> view);
 
@@ -173,6 +176,8 @@ public:
 
 	const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
 
+	bool all_segments_complete(uint32_t segment_id) const;
+
 #ifdef ENABLE_DECODE
 	shared_ptr<data::DecodeSignal> add_decode_signal();
 
@@ -191,12 +196,12 @@ private:
 		vector<string> user_spec,
 		map<string, shared_ptr<Option>> fmt_opts);
 
-private:
 	void sample_thread_proc(function<void (const QString)> error_handler);
 
 	void free_unused_memory();
 
 	void signal_new_segment();
+	void signal_segment_completed();
 
 	void feed_in_header();
 
@@ -214,6 +219,27 @@ private:
 	void data_feed_in(shared_ptr<sigrok::Device> device,
 		shared_ptr<sigrok::Packet> packet);
 
+Q_SIGNALS:
+	void capture_state_changed(int state);
+	void device_changed();
+
+	void signals_changed();
+
+	void name_changed();
+
+	void trigger_event(int segment_id, util::Timestamp location);
+
+	void new_segment(int new_segment_id);
+	void segment_completed(int segment_id);
+
+	void data_received();
+
+	void add_view(const QString &title, views::ViewType type,
+		Session *session);
+
+public Q_SLOTS:
+	void on_data_saved();
+
 private:
 	DeviceManager &device_manager_;
 	shared_ptr<devices::Device> device_;
@@ -230,6 +256,9 @@ private:
 	unordered_set< shared_ptr<data::SignalBase> > signalbases_;
 	unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
 
+	/// trigger_list_ contains pairs of <segment_id, timestamp> values.
+	vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
+
 	mutable recursive_mutex data_mutex_;
 	shared_ptr<data::Logic> logic_data_;
 	uint64_t cur_samplerate_;
@@ -243,26 +272,6 @@ private:
 	bool out_of_memory_;
 	bool data_saved_;
 	bool frame_began_;
-
-Q_SIGNALS:
-	void capture_state_changed(int state);
-	void device_changed();
-
-	void signals_changed();
-
-	void name_changed();
-
-	void trigger_event(util::Timestamp location);
-
-	void new_segment(int new_segment_id);
-
-	void data_received();
-
-	void add_view(const QString &title, views::ViewType type,
-		Session *session);
-
-public Q_SLOTS:
-	void on_data_saved();
 };
 
 } // namespace pv