projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #709 by deriving row/ann colors from the channel color
[pulseview.git]
/
pv
/
data
/
decodesignal.hpp
diff --git
a/pv/data/decodesignal.hpp
b/pv/data/decodesignal.hpp
index 21d14b810d558d757f919dbc68932fbcc5dc6d6f..2d41e5003e57c391d492e80430b380cb22df2fc7 100644
(file)
--- a/
pv/data/decodesignal.hpp
+++ b/
pv/data/decodesignal.hpp
@@
-99,7
+99,7
@@
public:
void remove_decoder(int index);
bool toggle_decoder_visibility(int index);
void remove_decoder(int index);
bool toggle_decoder_visibility(int index);
- void reset_decode();
+ void reset_decode(
bool shutting_down = false
);
void begin_decode();
QString error_message() const;
void begin_decode();
QString error_message() const;
@@
-113,8
+113,6
@@
public:
double samplerate() const;
const pv::util::Timestamp start_time() const;
double samplerate() const;
const pv::util::Timestamp start_time() const;
- uint32_t get_input_segment_count() const;
-
/**
* Returns the number of samples that can be worked on,
* i.e. the number of samples where samples are available
/**
* Returns the number of samples that can be worked on,
* i.e. the number of samples where samples are available
@@
-139,6
+137,12
@@
public:
virtual void restore_settings(QSettings &settings);
private:
virtual void restore_settings(QSettings &settings);
private:
+ void set_error_message(QString msg);
+
+ uint32_t get_input_segment_count() const;
+
+ uint32_t get_input_samplerate(uint32_t segment_id) const;
+
void update_channel_list();
void commit_decoder_channels();
void update_channel_list();
void commit_decoder_channels();
@@
-147,18
+151,18
@@
private:
void logic_mux_proc();
void logic_mux_proc();
- void query_input_metadata();
-
- void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count);
+ void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
+ const shared_ptr<LogicSegment> input_segment);
void decode_proc();
void start_srd_session();
void decode_proc();
void start_srd_session();
+ void terminate_srd_session();
void stop_srd_session();
void connect_input_notifiers();
void stop_srd_session();
void connect_input_notifiers();
- void create_
new
_segment();
+ void create_
decode
_segment();
static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
@@
-181,18
+185,15
@@
private:
struct srd_session *srd_session_;
shared_ptr<Logic> logic_mux_data_;
struct srd_session *srd_session_;
shared_ptr<Logic> logic_mux_data_;
- shared_ptr<LogicSegment> logic_mux_segment_;
uint32_t logic_mux_unit_size_;
bool logic_mux_data_invalid_;
uint32_t logic_mux_unit_size_;
bool logic_mux_data_invalid_;
- uint32_t currently_processed_segment_;
-
vector< shared_ptr<decode::Decoder> > stack_;
vector< shared_ptr<decode::Decoder> > stack_;
+ bool stack_config_changed_;
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
vector<DecodeSegment> segments_;
uint32_t current_segment_id_;
map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
vector<DecodeSegment> segments_;
uint32_t current_segment_id_;
- DecodeSegment *current_segment_;
mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;
mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
mutable condition_variable decode_input_cond_, logic_mux_cond_;