X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=cfc69d4aa94e4fbdda0fb4d8806058a0ecaa491c;hp=7c7d0dde3ab13bfb8a961c55b09fa11e79f0ebb8;hb=554af71bf515d2763ca13c3829dbeb2064cc4c83;hpb=999869aa676f7077b7181355eee28e9b025d4cea

diff --git a/pv/session.hpp b/pv/session.hpp
index 7c7d0dde..cfc69d4a 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -25,6 +25,7 @@
 #include <condition_variable>
 #endif
 
+#include <deque>
 #include <functional>
 #include <map>
 #include <memory>
@@ -48,6 +49,7 @@
 #include "util.hpp"
 #include "views/viewbase.hpp"
 
+using std::deque;
 using std::function;
 using std::map;
 using std::mutex;
@@ -93,6 +95,7 @@ class Logic;
 class LogicSegment;
 class SignalBase;
 class SignalData;
+class SignalGroup;
 }
 
 namespace devices {
@@ -107,6 +110,7 @@ namespace views {
 class ViewBase;
 }
 
+using pv::views::ViewType;
 
 class Session : public QObject
 {
@@ -191,14 +195,14 @@ public:
 	void add_generated_signal(shared_ptr<data::SignalBase> signal);
 	void remove_generated_signal(shared_ptr<data::SignalBase> signal);
 
-	bool all_segments_complete(uint32_t segment_id) const;
-
 #ifdef ENABLE_DECODE
 	shared_ptr<data::DecodeSignal> add_decode_signal();
 
 	void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
+	bool all_segments_complete(uint32_t segment_id) const;
+
 	MetadataObjManager* metadata_obj_manager();
 
 private:
@@ -252,7 +256,7 @@ Q_SIGNALS:
 
 	void data_received();
 
-	void add_view(views::ViewType type, Session *session);
+	void add_view(ViewType type, Session *session);
 
 public Q_SLOTS:
 	void on_data_saved();
@@ -262,6 +266,8 @@ public Q_SLOTS:
 #endif
 
 private:
+	bool shutting_down_;
+
 	DeviceManager &device_manager_;
 	shared_ptr<devices::Device> device_;
 	QString default_name_, name_;
@@ -276,6 +282,7 @@ private:
 
 	vector< shared_ptr<data::SignalBase> > signalbases_;
 	unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
+	deque<data::SignalGroup*> signal_groups_;
 
 	/// trigger_list_ contains pairs of <segment_id, timestamp> values
 	vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;