X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=b8647db808f3ea7ea11f24456f22a6c196e98160;hb=7297c76e03140cc2a49214c242bf14214363bc53;hp=42cac0f61e1472fb056aef816b34399b2585932e;hpb=9c11267166672b9ef174ca9313c02987364f68aa;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 42cac0f..b8647db 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -36,8 +36,12 @@ extern "C" {
 
 namespace pv {
 
-class LogicData;
-class LogicDataSnapshot;
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+}
 
 namespace view {
 class Signal;
@@ -70,7 +74,7 @@ public:
 	std::vector< boost::shared_ptr<view::Signal> >
 		get_signals();
 
-	boost::shared_ptr<LogicData> get_data();
+	boost::shared_ptr<data::Logic> get_data();
 
 private:
 	void set_capture_state(capture_state state);
@@ -81,11 +85,15 @@ private:
 	void sample_thread_proc(struct sr_dev_inst *sdi,
 		uint64_t record_length, uint64_t sample_rate);
 
-	void feed_in_meta_logic(const struct sr_dev_inst *sdi,
-		const sr_datafeed_meta_logic &meta_logic);
+	void feed_in_header(const sr_dev_inst *sdi);
+
+	void feed_in_meta(const sr_dev_inst *sdi,
+		const sr_datafeed_meta &meta);
 
 	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,
 		const struct sr_datafeed_packet *packet);
 
@@ -93,15 +101,17 @@ private:
 		const struct sr_datafeed_packet *packet);
 
 private:
-	mutable boost::mutex _state_mutex;
+	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;
 
 	mutable boost::mutex _signals_mutex;
 	std::vector< boost::shared_ptr<view::Signal> > _signals;
 
 	mutable boost::mutex _data_mutex;
-	boost::shared_ptr<LogicData> _logic_data;
-	boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+	boost::shared_ptr<data::Logic> _logic_data;
+	boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
+	boost::shared_ptr<data::Analog> _analog_data;
+	boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
 
 	std::auto_ptr<boost::thread> _sampling_thread;