Add segment_id to all segment classes

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 424bf6375cd0d14850df3714ad0d1f41c87cc9b4..8ae6673872f3c5a4804672a9a6a2b976d6b57396 100644 (file)
--- 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);
@@ -192,6 +196,9 @@ private:
 
        void free_unused_memory();
 
+       void signal_new_segment();
+       void signal_segment_completed();
+
        void feed_in_header();
 
        void feed_in_meta(shared_ptr<sigrok::Meta> meta);
@@ -199,6 +206,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 +237,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 +255,11 @@ Q_SIGNALS:
 
        void trigger_event(util::Timestamp location);
 
-       void frame_began();
+       void new_segment(int new_segment_id);
+       void segment_completed(int segment_id);
 
        void data_received();
 
-       void frame_ended();
-
        void add_view(const QString &title, views::ViewType type,
                Session *session);