#include <map>
#include <string>
-#include <utility>
#include <vector>
#include <QObject>
}
namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
class Signal;
}
void stop_capture();
std::vector< boost::shared_ptr<view::Signal> >
- get_signals();
+ get_signals() const;
boost::shared_ptr<data::Logic> get_data();
- void add_decoder(srd_decoder *const dec,
- std::map<const srd_probe*,
- boost::shared_ptr<view::Signal> > probes);
+ bool add_decoder(srd_decoder *const dec);
+
+ std::vector< boost::shared_ptr<view::DecodeTrace> >
+ get_decode_signals() const;
+
+ void remove_decode_signal(view::DecodeTrace *signal);
private:
void set_capture_state(capture_state state);
*/
struct sr_dev_inst *_sdi;
- std::vector< boost::shared_ptr<view::DecodeSignal> > _decode_traces;
+ std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;
boost::shared_ptr<data::Analog> _analog_data;
boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
- std::auto_ptr<boost::thread> _sampling_thread;
+ boost::thread _sampling_thread;
signals:
void capture_state_changed(int state);