X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=4c6c73e37483e60f3b72ace3fd68b6a26befd8e0;hp=ac3d654c63f06a4d70cd82db368bf16383c41453;hb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;hpb=8f6b98ff56c68f59c177f4dd662160bc48e1693f

diff --git a/pv/session.hpp b/pv/session.hpp
index ac3d654..4c6c73e 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -64,6 +64,7 @@ class Analog;
 class AnalogSegment;
 class Logic;
 class LogicSegment;
+class SignalBase;
 class SignalData;
 }
 
@@ -114,8 +115,6 @@ public:
 
 	void stop_capture();
 
-	std::set< std::shared_ptr<data::SignalData> > get_data() const;
-
 	double get_samplerate() const;
 
 	const std::unordered_set< std::shared_ptr<view::Signal> >
@@ -135,12 +134,11 @@ private:
 
 	void update_signals();
 
-	std::shared_ptr<view::Signal> signal_from_channel(
+	std::shared_ptr<data::SignalBase> signal_from_channel(
 		std::shared_ptr<sigrok::Channel> channel) const;
 
 private:
-	void sample_thread_proc(std::shared_ptr<devices::Device> device,
-		std::function<void (const QString)> error_handler);
+	void sample_thread_proc(std::function<void (const QString)> error_handler);
 
 	void feed_in_header();
 
@@ -169,6 +167,9 @@ private:
 	mutable boost::shared_mutex signals_mutex_;
 	std::unordered_set< std::shared_ptr<view::Signal> > signals_;
 
+	std::set< std::shared_ptr<data::SignalBase> > signalbases_;
+	std::set< std::shared_ptr<data::SignalData> > all_signal_data_;
+
 	mutable std::recursive_mutex data_mutex_;
 	std::shared_ptr<data::Logic> logic_data_;
 	uint64_t cur_samplerate_;