X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=7805eec65085ee24d7d2f8917eb09f0eca774172;hp=68b14e11036f491d0acb6b19dad7717271566b4a;hb=488883133fefe0af41737cea9b2fc9eb114042b8;hpb=8a67bd9e5199279ac976412a66b5f6cbfdfc17ea;ds=sidebyside

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 68b14e11..7805eec6 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -30,14 +30,16 @@
 
 #include <QObject>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 namespace pv {
 
-class LogicData;
-class LogicDataSnapshot;
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+}
 
 namespace view {
 class Signal;
@@ -62,15 +64,15 @@ public:
 
 	capture_state get_capture_state() const;
 
-	void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
-		uint64_t sample_rate);
+	void start_capture(struct sr_dev_inst* sdi,
+		uint64_t record_length);
 
 	void stop_capture();
 
 	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);
@@ -79,24 +81,35 @@ 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_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,
-		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;
 
 	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;