projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use getter for the conversion type instead of a local copy
[pulseview.git]
/
pv
/
data
/
signalbase.hpp
diff --git
a/pv/data/signalbase.hpp
b/pv/data/signalbase.hpp
index 635db6604bc0e314730375cda8456e2fdfb5b245..a2d23244f0e1d007aad79543f909fce796c8ab0c 100644
(file)
--- a/
pv/data/signalbase.hpp
+++ b/
pv/data/signalbase.hpp
@@
-157,6
+157,11
@@
public:
*/
shared_ptr<pv::data::Logic> logic_data() const;
*/
shared_ptr<pv::data::Logic> logic_data() const;
+ /**
+ * Queries the kind of conversion performed on this channel.
+ */
+ ConversionType get_conversion_type() const;
+
/**
* Changes the kind of conversion performed on this channel.
*/
/**
* Changes the kind of conversion performed on this channel.
*/
@@
-209,7
+214,7
@@
protected:
ChannelType channel_type_;
shared_ptr<pv::data::SignalData> data_;
shared_ptr<pv::data::SignalData> converted_data_;
ChannelType channel_type_;
shared_ptr<pv::data::SignalData> data_;
shared_ptr<pv::data::SignalData> converted_data_;
-
int
conversion_type_;
+
ConversionType
conversion_type_;
std::thread conversion_thread_;
atomic<bool> conversion_interrupt_;
std::thread conversion_thread_;
atomic<bool> conversion_interrupt_;