Remove obsolete input module support.

[pulseview.git] / pv / sigsession.h

diff --git a/pv/sigsession.h b/pv/sigsession.h
index c7a81bfcd662de309ff9fa7dbbe65bec75fafafa..a4e14d9cd099e8a6755ace39ddd26fd9d3bd21b5 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -21,13 +21,12 @@
 #ifndef PULSEVIEW_PV_SIGSESSION_H
 #define PULSEVIEW_PV_SIGSESSION_H
 
-#include <boost/function.hpp>
-#include <boost/thread.hpp>
-
 #include <map>
 #include <memory>
+#include <mutex>
 #include <set>
 #include <string>
+#include <thread>
 #include <vector>
 
 #include <QObject>
@@ -93,7 +92,7 @@ public:
 
        capture_state get_capture_state() const;
 
-       void start_capture(boost::function<void (const QString)> error_handler);
+       void start_capture(std::function<void (const QString)> error_handler);
 
        void stop_capture();
 
@@ -122,23 +121,8 @@ private:
        void read_sample_rate(const sr_dev_inst *const sdi);
 
 private:
-       /**
-        * Attempts to autodetect the format. Failing that
-        * @param filename The filename of the input file.
-        * @return A pointer to the 'struct sr_input_format' that should be
-        *      used, or NULL if no input format was selected or
-        *      auto-detected.
-        */
-       static sr_input_format* determine_input_file_format(
-               const std::string &filename);
-
-       static sr_input* load_input_file_format(
-               const std::string &filename,
-               boost::function<void (const QString)> error_handler,
-               sr_input_format *format = NULL);
-
        void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
-               boost::function<void (const QString)> error_handler);
+               std::function<void (const QString)> error_handler);
 
        void feed_in_header(const sr_dev_inst *sdi);
 
@@ -167,21 +151,21 @@ private:
 
        std::vector< std::shared_ptr<view::DecodeTrace> > _decode_traces;
 
-       mutable boost::mutex _sampling_mutex;
+       mutable std::mutex _sampling_mutex;
        capture_state _capture_state;
 
-       mutable boost::mutex _signals_mutex;
+       mutable std::mutex _signals_mutex;
        std::vector< std::shared_ptr<view::Signal> > _signals;
 
-       mutable boost::mutex _data_mutex;
+       mutable std::mutex _data_mutex;
        std::shared_ptr<data::Logic> _logic_data;
        std::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
        std::map< const sr_channel*, std::shared_ptr<data::AnalogSnapshot> >
                _cur_analog_snapshots;
 
-       boost::thread _sampling_thread;
+       std::thread _sampling_thread;
 
-signals:
+Q_SIGNALS:
        void capture_state_changed(int state);
 
        void signals_changed();
@@ -197,6 +181,16 @@ private:
        // sessions should should be supported and it should be
        // possible to associate a pointer with a sr_session.
        static SigSession *_session;
+
+public:
+       // TODO: Even more of a hack. The libsigrok API now allows for
+       // multiple sessions. However sr_session_* calls are scattered
+       // around the PV architecture and a single SigSession object is
+       // being used across multiple sequential sessions, which are
+       // created and destroyed in other classes in pv::device. This
+       // is a mess. For now just keep a single sr_session pointer here
+       // which we can use for all those scattered calls.
+       static struct sr_session *_sr_session;
 };
 
 } // namespace pv