#include <unordered_set>
#include <vector>
-#include <boost/optional.hpp>
-
#include <QSettings>
#include <QString>
const vector<data::DecodeChannel> get_channels() const;
void auto_assign_signals();
void assign_signal(const uint16_t channel_id, const SignalBase *signal);
+ int get_assigned_signal_count() const;
void set_initial_pin_state(const uint16_t channel_id, const int init_state);
private:
void update_channel_list();
+ void commit_decoder_channels();
+
+ void mux_logic_samples(const int64_t start, const int64_t end);
+
void logic_mux_proc();
- boost::optional<int64_t> wait_for_data() const;
+ void query_input_metadata();
- void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
- srd_session *const session);
+ void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count);
void decode_proc();
+ void start_srd_session();
+ void stop_srd_session();
+
+ void connect_input_notifiers();
+
static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
Q_SIGNALS:
private Q_SLOTS:
void on_capture_state_changed(int state);
void on_data_received();
- void on_frame_ended();
private:
pv::Session &session_;
vector<data::DecodeChannel> channels_;
+ struct srd_session *srd_session_;
+
shared_ptr<Logic> logic_mux_data_;
shared_ptr<LogicSegment> segment_;
bool logic_mux_data_invalid_;
pv::util::Timestamp start_time_;
double samplerate_;
- int64_t sample_count_, annotation_count_, samples_decoded_;
+ int64_t annotation_count_, samples_decoded_;
vector< shared_ptr<decode::Decoder> > stack_;
map<const decode::Row, decode::RowData> rows_;
*/
static mutex global_srd_mutex_;
- mutable mutex input_mutex_, output_mutex_;
+ mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;
bool frame_complete_;