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

diff --git a/pv/sigsession.h b/pv/sigsession.h
index d5ec200a..af01ec40 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -30,9 +30,7 @@
 
 #include <QObject>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 namespace pv {
 
@@ -83,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);
 
@@ -104,7 +101,6 @@ 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;