MinGW: Drop hardcoded BOOST_ROOT.

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 68b14e11036f491d0acb6b19dad7717271566b4a..d5ec200a6498a9233e47be0fc4ac1d65389b2657 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -36,8 +36,12 @@ extern "C" {
 
 namespace pv {
 
-class LogicData;
-class LogicDataSnapshot;
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+}
 
 namespace view {
 class Signal;
@@ -70,7 +74,7 @@ public:
        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);
@@ -79,24 +83,37 @@ 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_meta_logic(const struct sr_dev_inst *sdi,
+               const sr_datafeed_meta_logic &meta_logic);
+
+       void feed_in_meta_analog(const struct sr_dev_inst *sdi,
+               const sr_datafeed_meta_analog &meta_analog);
+
+       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 _state_mutex;
+       mutable boost::mutex _sampling_mutex;
        capture_state _capture_state;
+       uint64_t _sample_rate;
 
        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;
+       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;