X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=308b082730d13548f884b931e7bdc92cf46baf0f;hp=b4f07db4394397579e8d429bf9d9ca3d763e88b5;hb=238404062db14998f3b0ca93ae03a47543d219b8;hpb=6ac96c2e0ef986da9c9ebea50906cb717aa382ba

diff --git a/pv/sigsession.h b/pv/sigsession.h
index b4f07db4..308b0827 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -36,6 +36,8 @@ extern "C" {
 
 namespace pv {
 
+class AnalogData;
+class AnalogDataSnapshot;
 class LogicData;
 class LogicDataSnapshot;
 
@@ -76,18 +78,31 @@ private:
 	void set_capture_state(capture_state state);
 
 private:
+	void load_thread_proc(const std::string name);
+
 	void sample_thread_proc(struct sr_dev_inst *sdi,
-		uint64_t record_length, uint64_t sample_rate);
+		uint64_t record_length);
+
+	void feed_in_meta_logic(const struct sr_dev_inst *sdi,
+		const sr_datafeed_meta_logic &meta_logic);
+
+	void feed_in_meta_analog(const struct sr_dev_inst *sdi,
+		const sr_datafeed_meta_analog &meta_analog);
+
+	void feed_in_logic(const sr_datafeed_logic &logic);
+
+	void feed_in_analog(const sr_datafeed_analog &analog);
 
 	void data_feed_in(const struct sr_dev_inst *sdi,
-		struct sr_datafeed_packet *packet);
+		const struct sr_datafeed_packet *packet);
 
 	static void data_feed_in_proc(const struct sr_dev_inst *sdi,
-		struct sr_datafeed_packet *packet);
+		const struct sr_datafeed_packet *packet);
 
 private:
-	mutable boost::mutex _state_mutex;
+	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;
+	uint64_t _sample_rate;
 
 	mutable boost::mutex _signals_mutex;
 	std::vector< boost::shared_ptr<view::Signal> > _signals;
@@ -95,6 +110,8 @@ private:
 	mutable boost::mutex _data_mutex;
 	boost::shared_ptr<LogicData> _logic_data;
 	boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+	boost::shared_ptr<AnalogData> _analog_data;
+	boost::shared_ptr<AnalogDataSnapshot> _cur_analog_snapshot;
 
 	std::auto_ptr<boost::thread> _sampling_thread;