X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=a4fc352d1969fd527951820bbf75e37f8b2b991c;hp=f2f8c7c8e26549be7e6ba8a5e5977c3faf6b10f2;hb=a45b9b9ee6f15da272c2e743122097e6696fc7b5;hpb=48257a69ffad409c9893605d99cd6e15161dff4f

diff --git a/pv/session.hpp b/pv/session.hpp
index f2f8c7c8..a4fc352d 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;
 }
 
@@ -72,9 +73,7 @@ class Device;
 }
 
 namespace view {
-class DecodeTrace;
-class LogicSignal;
-class Signal;
+class View;
 }
 
 class Session : public QObject
@@ -114,20 +113,19 @@ 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> >
-		signals() const;
+	void register_view(std::shared_ptr<pv::view::View> view);
+
+	void deregister_view(std::shared_ptr<pv::view::View> view);
+
+	const std::unordered_set< std::shared_ptr<data::SignalBase> >
+		signalbases() const;
 
 #ifdef ENABLE_DECODE
 	bool add_decoder(srd_decoder *const dec);
 
-	std::vector< std::shared_ptr<view::DecodeTrace> >
-		get_decode_signals() const;
-
-	void remove_decode_signal(view::DecodeTrace *signal);
+	void remove_decode_signal(std::shared_ptr<data::SignalBase> signalbase);
 #endif
 
 private:
@@ -135,12 +133,11 @@ private:
 
 	void update_signals();
 
-	std::shared_ptr<view::Signal> signal_from_channel(
+	std::shared_ptr<data::SignalBase> signalbase_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();
 
@@ -161,13 +158,14 @@ private:
 	DeviceManager &device_manager_;
 	std::shared_ptr<devices::Device> device_;
 
-	std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
+	std::unordered_set< std::shared_ptr<pv::view::View> > views_;
 
-	mutable std::mutex sampling_mutex_;
+	mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
 	capture_state capture_state_;
 
-	mutable boost::shared_mutex signals_mutex_;
-	std::unordered_set< std::shared_ptr<view::Signal> > signals_;
+
+	std::unordered_set< std::shared_ptr<data::SignalBase> > signalbases_;
+	std::unordered_set< std::shared_ptr<data::SignalData> > all_signal_data_;
 
 	mutable std::recursive_mutex data_mutex_;
 	std::shared_ptr<data::Logic> logic_data_;