Renamed pv::SigSession::_state_mutex to pv::SigSession::_sampling_mutex

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 40fce89fdb7660bce2b276e1dd4bcac2f27148d7..deb95ed8b2cb8b18bf36235fbd453e9195ade31d 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -18,12 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef SIGSESSION_H
-#define SIGSESSION_H
+#ifndef PULSEVIEW_PV_SIGSESSION_H
+#define PULSEVIEW_PV_SIGSESSION_H
 
 #include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -36,12 +38,21 @@ namespace pv {
 
 class LogicData;
 class LogicDataSnapshot;
+
+namespace view {
 class Signal;
+}
 
 class SigSession : public QObject
 {
        Q_OBJECT
 
+public:
+       enum capture_state {
+               Stopped,
+               Running
+       };
+
 public:
        SigSession();
 
@@ -49,27 +60,56 @@ 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<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 feed_in_meta_logic(const struct sr_dev_inst *sdi,
+               const sr_datafeed_meta_logic &meta_logic);
+
+       void feed_in_logic(const sr_datafeed_logic &logic);
+
        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:
-       std::vector< boost::shared_ptr<Signal> > _signals;
+       mutable boost::mutex _sampling_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:
@@ -81,4 +121,4 @@ private:
 
 } // namespace pv
 
-#endif // SIGSESSION_H
+#endif // PULSEVIEW_PV_SIGSESSION_H