Sampling bar now commits the sample rate into the device instance

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 763fc16903cc17372e07f5c08cb63d897b41b91f..7805eec65085ee24d7d2f8917eb09f0eca774172 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -30,14 +30,16 @@
 
 #include <QObject>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 namespace pv {
 
-class LogicData;
-class LogicDataSnapshot;
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+}
 
 namespace view {
 class Signal;
@@ -47,6 +49,12 @@ class SigSession : public QObject
 {
        Q_OBJECT
 
+public:
+       enum capture_state {
+               Stopped,
+               Running
+       };
+
 public:
        SigSession();
 
@@ -54,33 +62,60 @@ public:
 
        void load_file(const std::string &name);
 
-       void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
-               uint64_t sample_rate);
+       capture_state get_capture_state() const;
+
+       void start_capture(struct sr_dev_inst* sdi,
+               uint64_t record_length);
 
-       std::vector< boost::shared_ptr<view::Signal> >&
+       void stop_capture();
+
+       std::vector< boost::shared_ptr<view::Signal> >
                get_signals();
 
-       boost::shared_ptr<LogicData> get_data();
+       boost::shared_ptr<data::Logic> get_data();
+
+private:
+       void set_capture_state(capture_state state);
 
 private:
+       void load_thread_proc(const std::string name);
+
        void sample_thread_proc(struct sr_dev_inst *sdi,
-               uint64_t record_length, uint64_t sample_rate);
+               uint64_t record_length);
+
+       void feed_in_header(const sr_dev_inst *sdi);
+
+       void feed_in_meta(const sr_dev_inst *sdi,
+               const sr_datafeed_meta &meta);
+
+       void feed_in_logic(const sr_datafeed_logic &logic);
+
+       void feed_in_analog(const sr_datafeed_analog &analog);
 
        void data_feed_in(const struct sr_dev_inst *sdi,
-               struct sr_datafeed_packet *packet);
+               const struct sr_datafeed_packet *packet);
 
        static void data_feed_in_proc(const struct sr_dev_inst *sdi,
-               struct sr_datafeed_packet *packet);
+               const struct sr_datafeed_packet *packet);
 
 private:
-       mutable boost::mutex _data_mutex;
+       mutable boost::mutex _sampling_mutex;
+       capture_state _capture_state;
+
+       mutable boost::mutex _signals_mutex;
        std::vector< boost::shared_ptr<view::Signal> > _signals;
-       boost::shared_ptr<LogicData> _logic_data;
-       boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
+
+       mutable boost::mutex _data_mutex;
+       boost::shared_ptr<data::Logic> _logic_data;
+       boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
+       boost::shared_ptr<data::Analog> _analog_data;
+       boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
 
        std::auto_ptr<boost::thread> _sampling_thread;
 
 signals:
+       void capture_state_changed(int state);
+
        void signals_changed();
 
        void data_updated();