namespace pv {
-class LogicData;
-class LogicDataSnapshot;
+namespace data {
+class Analog;
+class AnalogSnapshot;
+class Logic;
+class LogicSnapshot;
+}
namespace view {
class Signal;
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);
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_header(const sr_dev_inst *sdi);
+
+ void feed_in_meta(const sr_dev_inst *sdi,
+ const sr_datafeed_meta &meta);
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,
const 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;
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;