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

diff --git a/pv/sigsession.h b/pv/sigsession.h
index d5ec200a..7805eec6 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -30,9 +30,7 @@
 
 #include <QObject>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 namespace pv {
 
@@ -66,8 +64,8 @@ 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();
 
@@ -85,11 +83,10 @@ private:
 	void sample_thread_proc(struct sr_dev_inst *sdi,
 		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_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;