X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=af01ec40a0a59b695bf639bbff367422bc56e306;hb=9f6af8bd3a6bc12f9b32b91cd2a173a8a7763f5c;hp=308b082730d13548f884b931e7bdc92cf46baf0f;hpb=aba1dd166b90f3408cd9d2b23b906df081845563;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 308b0827..af01ec40 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -30,16 +30,16 @@
 
 #include <QObject>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 namespace pv {
 
-class AnalogData;
-class AnalogDataSnapshot;
-class LogicData;
-class LogicDataSnapshot;
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+}
 
 namespace view {
 class Signal;
@@ -72,7 +72,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,13 +81,12 @@ private:
 	void load_thread_proc(const std::string name);
 
 	void sample_thread_proc(struct sr_dev_inst *sdi,
-		uint64_t record_length);
+		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_analog(const struct sr_dev_inst *sdi,
-		const sr_datafeed_meta_analog &meta_analog);
+	void feed_in_meta(const sr_dev_inst *sdi,
+		const sr_datafeed_meta &meta);
 
 	void feed_in_logic(const sr_datafeed_logic &logic);
 
@@ -102,16 +101,15 @@ private:
 private:
 	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;
 
 	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;
+	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;