X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=095c4dd0217dd51f490c3d4d99bbc3d952b773b9;hb=56c4de9ada023505b16b6d188fb77d9fb10e52e1;hp=8d85996ec6ec05e9656ffa6519e9c86ee2f1d656;hpb=baf867eddd4efbc465f5a3490b1ea21dfe7ba597;p=pulseview.git diff --git a/pv/session.hpp b/pv/session.hpp index 8d85996e..095c4dd0 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -50,7 +50,6 @@ using std::function; -using std::list; using std::map; using std::mutex; using std::recursive_mutex; @@ -139,7 +138,7 @@ public: void set_name(QString name); - const list< shared_ptr > views() const; + const vector< shared_ptr > views() const; shared_ptr main_view() const; @@ -172,6 +171,8 @@ public: void set_default_device(); + bool using_file_device() const; + void load_init_file(const string &file_name, const string &format, const string &setup_file_name); @@ -198,7 +199,7 @@ public: bool has_view(shared_ptr view); - const unordered_set< shared_ptr > signalbases() const; + const vector< shared_ptr > signalbases() const; bool all_segments_complete(uint32_t segment_id) const; @@ -278,7 +279,7 @@ private: shared_ptr device_; QString default_name_, name_; - list< shared_ptr > views_; + vector< shared_ptr > views_; shared_ptr main_view_; shared_ptr main_bar_; @@ -286,7 +287,7 @@ private: mutable mutex sampling_mutex_; //!< Protects access to capture_state_. capture_state capture_state_; - unordered_set< shared_ptr > signalbases_; + vector< shared_ptr > signalbases_; unordered_set< shared_ptr > all_signal_data_; /// trigger_list_ contains pairs of values.