X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=76019612a977eaff33fed75c6c5d932897863a2a;hp=fa96ce641bd418f4ca7448986d1d66cf10ecc538;hb=341d9a7975be53bb44af8d2deeba9b4a5e086929;hpb=419ec4e11ee29e27566d1c0c17741fcad85dbdf6

diff --git a/pv/session.hpp b/pv/session.hpp
index fa96ce6..7601961 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -163,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);
@@ -194,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);
@@ -201,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);
 
@@ -231,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);
@@ -247,12 +254,10 @@ Q_SIGNALS:
 
 	void trigger_event(util::Timestamp location);
 
-	void frame_began();
+	void new_segment(int new_segment_id);
 
 	void data_received();
 
-	void frame_ended();
-
 	void add_view(const QString &title, views::ViewType type,
 		Session *session);