projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge DecoderStack into DecodeSignal
[pulseview.git]
/
pv
/
data
/
signalbase.hpp
diff --git
a/pv/data/signalbase.hpp
b/pv/data/signalbase.hpp
index 97dbd8477d58dea4537e117a25946338f48f64c3..f70c934fb0eacdc8374b1d341ac50c17a96bef87 100644
(file)
--- a/
pv/data/signalbase.hpp
+++ b/
pv/data/signalbase.hpp
@@
-148,14
+148,12
@@
public:
void set_conversion_type(ConversionType t);
#ifdef ENABLE_DECODE
void set_conversion_type(ConversionType t);
#ifdef ENABLE_DECODE
- virtual bool is_decode_signal() const;
-
- virtual shared_ptr<pv::data::DecoderStack> decoder_stack() const;
+ bool is_decode_signal() const;
#endif
#endif
- void save_settings(QSettings &settings) const;
+ v
irtual v
oid save_settings(QSettings &settings) const;
- void restore_settings(QSettings &settings);
+ v
irtual v
oid restore_settings(QSettings &settings);
private:
uint8_t convert_a2l_threshold(float threshold, float value);
private:
uint8_t convert_a2l_threshold(float threshold, float value);