#ifndef PULSEVIEW_PV_SIGSESSION_H
#define PULSEVIEW_PV_SIGSESSION_H
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-
#include <map>
+#include <memory>
+#include <mutex>
#include <set>
#include <string>
+#include <thread>
#include <vector>
#include <QObject>
#include <libsigrok/libsigrok.h>
struct srd_decoder;
-struct srd_probe;
+struct srd_channel;
namespace pv {
~SigSession();
- boost::shared_ptr<device::DevInst> get_device() const;
+ std::shared_ptr<device::DevInst> get_device() const;
/**
* Sets device instance that will be used in the next capture session.
*/
- void set_device(boost::shared_ptr<device::DevInst> dev_inst);
+ void set_device(std::shared_ptr<device::DevInst> dev_inst)
+ throw(QString);
+
+ void set_file(const std::string &name)
+ throw(QString);
- void release_device(boost::shared_ptr<device::DevInst> dev_inst);
+ void set_default_device();
- void load_file(const std::string &name,
- boost::function<void (const QString)> error_handler);
+ void release_device(device::DevInst *dev_inst);
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();
- std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+ std::set< std::shared_ptr<data::SignalData> > get_data() const;
- std::vector< boost::shared_ptr<view::Signal> >
+ std::vector< std::shared_ptr<view::Signal> >
get_signals() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
- std::vector< boost::shared_ptr<view::DecodeTrace> >
+ std::vector< std::shared_ptr<view::DecodeTrace> >
get_decode_signals() const;
void remove_decode_signal(view::DecodeTrace *signal);
private:
void set_capture_state(capture_state state);
- void update_signals(boost::shared_ptr<device::DevInst> dev_inst);
+ void update_signals(std::shared_ptr<device::DevInst> dev_inst);
- bool is_trigger_enabled() const;
-
- boost::shared_ptr<view::Signal> signal_from_probe(
- const sr_probe *probe) const;
+ std::shared_ptr<view::Signal> signal_from_probe(
+ const sr_channel *probe) const;
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 load_session_thread_proc(
- boost::function<void (const QString)> error_handler);
-
- void load_input_thread_proc(const std::string name, sr_input *in,
- boost::function<void (const QString)> error_handler);
-
- void sample_thread_proc(boost::shared_ptr<device::DevInst> dev_inst,
- boost::function<void (const QString)> error_handler);
+ void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
+ std::function<void (const QString)> error_handler);
void feed_in_header(const sr_dev_inst *sdi);
void feed_in_meta(const sr_dev_inst *sdi,
const sr_datafeed_meta &meta);
+ void feed_in_frame_begin();
+
void feed_in_logic(const sr_datafeed_logic &logic);
void feed_in_analog(const sr_datafeed_analog &analog);
/**
* The device instance that will be used in the next capture session.
*/
- boost::shared_ptr<device::DevInst> _dev_inst;
+ std::shared_ptr<device::DevInst> _dev_inst;
- std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
+ 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;
- std::vector< boost::shared_ptr<view::Signal> > _signals;
+ mutable std::mutex _signals_mutex;
+ std::vector< std::shared_ptr<view::Signal> > _signals;
- mutable boost::mutex _data_mutex;
- boost::shared_ptr<data::Logic> _logic_data;
- boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
- std::map< const sr_probe*, boost::shared_ptr<data::AnalogSnapshot> >
+ 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();
- void data_updated();
+ void frame_began();
+
+ void data_received();
+
+ void frame_ended();
private:
// TODO: This should not be necessary. Multiple concurrent
// 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
projects / pulseview.git / blobdiff