class AnalogSegment;
class Logic;
class LogicSegment;
+class SignalBase;
class SignalData;
}
namespace view {
class DecodeTrace;
-class LogicSignal;
-class Signal;
+class View;
}
class Session : public QObject
double get_samplerate() const;
- const std::unordered_set< std::shared_ptr<view::Signal> >
- signals() const;
+ void register_view(std::shared_ptr<pv::view::View> view);
+
+ void deregister_view(std::shared_ptr<pv::view::View> view);
+
+ const std::unordered_set< std::shared_ptr<data::SignalBase> >
+ signalbases() const;
#ifdef ENABLE_DECODE
bool add_decoder(srd_decoder *const dec);
void update_signals();
- std::shared_ptr<view::Signal> signal_from_channel(
+ std::shared_ptr<data::SignalBase> signalbase_from_channel(
std::shared_ptr<sigrok::Channel> channel) const;
private:
- void sample_thread_proc(std::shared_ptr<devices::Device> device,
- std::function<void (const QString)> error_handler);
+ void sample_thread_proc(std::function<void (const QString)> error_handler);
void feed_in_header();
DeviceManager &device_manager_;
std::shared_ptr<devices::Device> device_;
+ std::unordered_set< std::shared_ptr<pv::view::View> > views_;
+
std::vector< std::shared_ptr<view::DecodeTrace> > decode_traces_;
mutable std::mutex sampling_mutex_; //!< Protects access to capture_state_.
capture_state capture_state_;
- mutable boost::shared_mutex signals_mutex_;
- std::unordered_set< std::shared_ptr<view::Signal> > signals_;
- std::set< std::shared_ptr<data::SignalData> > all_signal_data_;
+
+ std::unordered_set< std::shared_ptr<data::SignalBase> > signalbases_;
+ std::unordered_set< std::shared_ptr<data::SignalData> > all_signal_data_;
mutable std::recursive_mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;