Merge DecoderStack into DecodeSignal

[pulseview.git] / pv / data / signalbase.hpp

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 381716480371f6c5494a618e53aca196c7160787..f70c934fb0eacdc8374b1d341ac50c17a96bef87 100644 (file)
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -149,15 +149,11 @@ public:
 
 #ifdef ENABLE_DECODE
        bool is_decode_signal() const;
-
-       shared_ptr<pv::data::DecoderStack> decoder_stack() const;
-
-       void set_decoder_stack(shared_ptr<pv::data::DecoderStack> decoder_stack);
 #endif
 
-       void save_settings(QSettings &settings) const;
+       virtual void save_settings(QSettings &settings) const;
 
-       void restore_settings(QSettings &settings);
+       virtual void restore_settings(QSettings &settings);
 
 private:
        uint8_t convert_a2l_threshold(float threshold, float value);
@@ -176,6 +172,11 @@ Q_SIGNALS:
 
        void conversion_type_changed(const ConversionType t);
 
+       void samples_cleared();
+
+       void samples_added(QObject* segment, uint64_t start_sample,
+               uint64_t end_sample);
+
 private Q_SLOTS:
        void on_samples_cleared();
 
@@ -184,17 +185,13 @@ private Q_SLOTS:
 
        void on_capture_state_changed(int state);
 
-private:
+protected:
        shared_ptr<sigrok::Channel> channel_;
        ChannelType channel_type_;
        shared_ptr<pv::data::SignalData> data_;
        shared_ptr<pv::data::SignalData> converted_data_;
        int conversion_type_;
 
-#ifdef ENABLE_DECODE
-       shared_ptr<pv::data::DecoderStack> decoder_stack_;
-#endif
-
        std::thread conversion_thread_;
 
        QString internal_name_, name_;