Session: Clean up header a little

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 5a54d83aa047a0f245457eae0eb8832f67bc98ba..19fd993872edc04ba8bae3ca8ad11568dce9a894 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;
 
+       uint32_t get_segment_count() const;
+
        void register_view(shared_ptr<views::ViewBase> view);
 
        void deregister_view(shared_ptr<views::ViewBase> view);
@@ -169,8 +173,10 @@ public:
 
        const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
 
+       bool all_segments_complete(uint32_t segment_id) 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
@@ -187,11 +193,13 @@ private:
                vector<string> user_spec,
                map<string, shared_ptr<Option>> fmt_opts);
 
-private:
        void sample_thread_proc(function<void (const QString)> error_handler);
 
        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 +207,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);
 
@@ -207,6 +216,27 @@ private:
        void data_feed_in(shared_ptr<sigrok::Device> device,
                shared_ptr<sigrok::Packet> packet);
 
+Q_SIGNALS:
+       void capture_state_changed(int state);
+       void device_changed();
+
+       void signals_changed();
+
+       void name_changed();
+
+       void trigger_event(util::Timestamp location);
+
+       void new_segment(int new_segment_id);
+       void segment_completed(int segment_id);
+
+       void data_received();
+
+       void add_view(const QString &title, views::ViewType type,
+               Session *session);
+
+public Q_SLOTS:
+       void on_data_saved();
+
 private:
        DeviceManager &device_manager_;
        shared_ptr<devices::Device> device_;
@@ -229,33 +259,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_;
-
-Q_SIGNALS:
-       void capture_state_changed(int state);
-       void device_changed();
-
-       void signals_changed();
-
-       void name_changed();
-
-       void trigger_event(util::Timestamp location);
-
-       void frame_began();
-
-       void data_received();
-
-       void frame_ended();
-
-       void add_view(const QString &title, views::ViewType type,
-               Session *session);
-
-public Q_SLOTS:
-       void on_data_saved();
+       bool frame_began_;
 };
 
 } // namespace pv