Make data_feed_in and data_feed_in_proc packet parameter a const pointer

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 29929a9dde63d1b1bbc4520885d28cc3e719370e..259356eef263b655a50c83ddb2da9604ac19cfa2 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -22,8 +22,10 @@
 #define PULSEVIEW_PV_SIGSESSION_H
 
 #include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -45,6 +47,12 @@ class SigSession : public QObject
 {
        Q_OBJECT
 
+public:
+       enum capture_state {
+               Stopped,
+               Running
+       };
+
 public:
        SigSession();
 
@@ -52,27 +60,51 @@ public:
 
        void load_file(const std::string &name);
 
+       capture_state get_capture_state() const;
+
        void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
                uint64_t sample_rate);
 
-       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();
 
 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);
+
        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 _state_mutex;
+       capture_state _capture_state;
+
+       mutable boost::mutex _signals_mutex;
        std::vector< boost::shared_ptr<view::Signal> > _signals;
+
+       mutable boost::mutex _data_mutex;
        boost::shared_ptr<LogicData> _logic_data;
        boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
 
+       std::auto_ptr<boost::thread> _sampling_thread;
+
 signals:
+       void capture_state_changed(int state);
+
+       void signals_changed();
+
        void data_updated();
 
 private: