X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=sigsession.h;h=f6b1d8e4951e0e021b2f3e76851ce525af44a888;hp=f91a2b927c1d75c611ee03ef46652dc0c4dc6899;hb=c352ce6001d9f21eed1903f4363a4f6d181371de;hpb=28a4c9c5eb20296199fc3496bb40b7733dffac75

diff --git a/sigsession.h b/sigsession.h
index f91a2b92..f6b1d8e4 100644
--- a/sigsession.h
+++ b/sigsession.h
@@ -23,9 +23,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <list>
-#include <map>
 #include <string>
+#include <vector>
 
 #include <QObject>
 
@@ -46,28 +45,36 @@ public:
 
 	~SigSession();
 
-	void loadFile(const std::string &name);
+	void load_file(const std::string &name);
+
+	void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
+		uint64_t sample_rate);
+
+	std::vector< boost::shared_ptr<Signal> >&
+		get_signals();
+
+	boost::shared_ptr<LogicData> get_data();
 
 private:
-	void dataFeedIn(const struct sr_dev_inst *sdi,
+	void data_feed_in(const struct sr_dev_inst *sdi,
 		struct sr_datafeed_packet *packet);
 
-	static void dataFeedInProc(const struct sr_dev_inst *sdi,
+	static void data_feed_in_proc(const struct sr_dev_inst *sdi,
 		struct sr_datafeed_packet *packet);
 
 private:
-	std::list< boost::shared_ptr<Signal> > _signals;
+	std::vector< boost::shared_ptr<Signal> > _signals;
 	boost::shared_ptr<LogicData> _logic_data;
 	boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
 
 signals:
-	void dataUpdated();
+	void data_updated();
 
 private:
 	// TODO: This should not be necessary. Multiple concurrent
 	// sessions should should be supported and it should be
 	// possible to associate a pointer with a sr_session.
-	static SigSession *session;
+	static SigSession *_session;
 };
 
 #endif // SIGSESSION_H