X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=sigsession.h;h=f7ec3853e9df05003cf7eb5f04076cf0e72df044;hb=b3f22de060b73f15ad3eb2dabee04a0b4f5d947e;hp=a08ba8129914ae0f61c6031d28b858a32cd0b1d0;hpb=e3f65ace22c6bcd371967302f8d01d0769e3a23f;p=pulseview.git

diff --git a/sigsession.h b/sigsession.h
index a08ba81..f7ec385 100644
--- a/sigsession.h
+++ b/sigsession.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -45,16 +45,21 @@ 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:
@@ -63,13 +68,13 @@ private:
 	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