X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=1cb370a9eff216b2b4a541428e6d1c9b86bfc027;hb=4e86ec7042631d4b54876cba89c01a73abaf7213;hp=5a54d83aa047a0f245457eae0eb8832f67bc98ba;hpb=ad908057e13224eee9f983685e0ccc7db1ded0e9;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 5a54d83..1cb370a 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -100,6 +100,8 @@ public:
 		Running
 	};
 
+	static shared_ptr<sigrok::Context> sr_context;
+
 public:
 	Session(DeviceManager &device_manager, QString name);
 
@@ -161,6 +163,8 @@ public:
 
 	double get_samplerate() const;
 
+	int get_segment_count() const;
+
 	void register_view(shared_ptr<views::ViewBase> view);
 
 	void deregister_view(shared_ptr<views::ViewBase> view);
@@ -170,7 +174,7 @@ public:
 	const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
 
 #ifdef ENABLE_DECODE
-	bool add_decoder(srd_decoder *const dec);
+	shared_ptr<data::DecodeSignal> add_decode_signal();
 
 	void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
@@ -192,6 +196,8 @@ private:
 
 	void free_unused_memory();
 
+	void signal_new_segment();
+
 	void feed_in_header();
 
 	void feed_in_meta(shared_ptr<sigrok::Meta> meta);
@@ -199,6 +205,7 @@ private:
 	void feed_in_trigger();
 
 	void feed_in_frame_begin();
+	void feed_in_frame_end();
 
 	void feed_in_logic(shared_ptr<sigrok::Logic> logic);
 
@@ -229,11 +236,13 @@ private:
 	shared_ptr<data::LogicSegment> cur_logic_segment_;
 	map< shared_ptr<sigrok::Channel>, shared_ptr<data::AnalogSegment> >
 		cur_analog_segments_;
+	int32_t highest_segment_id_;
 
 	std::thread sampling_thread_;
 
 	bool out_of_memory_;
 	bool data_saved_;
+	bool frame_began_;
 
 Q_SIGNALS:
 	void capture_state_changed(int state);
@@ -245,12 +254,10 @@ Q_SIGNALS:
 
 	void trigger_event(util::Timestamp location);
 
-	void frame_began();
+	void new_segment(int new_frame_id);
 
 	void data_received();
 
-	void frame_ended();
-
 	void add_view(const QString &title, views::ViewType type,
 		Session *session);