X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=927b2e7c3a5e41800b0669aff04997d267e18b7d;hp=c7a81bfcd662de309ff9fa7dbbe65bec75fafafa;hb=abad24e2d61c0c84ac8495c22d29a8a3a49ee9fa;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1 diff --git a/pv/sigsession.h b/pv/sigsession.h index c7a81bfc..927b2e7c 100644 --- a/pv/sigsession.h +++ b/pv/sigsession.h @@ -21,13 +21,12 @@ #ifndef PULSEVIEW_PV_SIGSESSION_H #define PULSEVIEW_PV_SIGSESSION_H -#include -#include - #include #include +#include #include #include +#include #include #include @@ -93,7 +92,7 @@ public: capture_state get_capture_state() const; - void start_capture(boost::function error_handler); + void start_capture(std::function error_handler); void stop_capture(); @@ -134,11 +133,11 @@ private: static sr_input* load_input_file_format( const std::string &filename, - boost::function error_handler, + std::function error_handler, sr_input_format *format = NULL); void sample_thread_proc(std::shared_ptr dev_inst, - boost::function error_handler); + std::function error_handler); void feed_in_header(const sr_dev_inst *sdi); @@ -167,19 +166,19 @@ private: std::vector< std::shared_ptr > _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 > _signals; - mutable boost::mutex _data_mutex; + mutable std::mutex _data_mutex; std::shared_ptr _logic_data; std::shared_ptr _cur_logic_snapshot; std::map< const sr_channel*, std::shared_ptr > _cur_analog_snapshots; - boost::thread _sampling_thread; + std::thread _sampling_thread; signals: void capture_state_changed(int state);